Tracker HUD fixes

Author: BonniePandora

code/_onclick/hud/screen_objects.dm

@@ -464,11 +464,6 @@
 	var/has_access = earpiece?.misc_tracking || (user.assigned_squad && user.assigned_squad.radio_freq == earpiece?.frequency)
 	if(istype(earpiece) && earpiece.has_hud && has_access)
 		tracker_object = earpiece
-
-	//visor is the 2nd pick
-	var/obj/item/device/helmet_visor/visor = locate() in user.head
-	if(visor?.has_tracker && !tracker_object)
-		tracker_object = visor
 /*
 	if(!tracker_object)
 		to_chat(user, SPAN_WARNING("Unauthorized access detected."))

code/game/objects/items.dm

@@ -1137,7 +1137,7 @@ cases. Override_icon_state should be a list.*/
 /obj/item/proc/add_hud_tracker(mob/living/carbon/human/user)
 	SIGNAL_HANDLER
 
-	if(squad_hud_on && user.mind && (user.assigned_squad || misc_tracking) && user.hud_used?.locate_leader)
+	if(tracker_hud_on && user.mind && (user.assigned_squad || misc_tracking) && user.hud_used?.locate_leader)
 		user.show_hud_tracker()
 
 /obj/item/proc/turn_on_map_tracking()

code/game/objects/items/devices/radio/headset.dm

@@ -265,9 +265,9 @@
 		if(squad_hud_on)
 			var/datum/mob_hud/H = GLOB.huds[hud_type]
 			H.add_hud_to(user, src)
-			//squad leader locator is invisible again unless a visor tracker is active
-			if(user.mind && (user.assigned_squad || misc_tracking) && user.hud_used && user.hud_used.locate_leader)
-				user.show_hud_tracker()
+		//squad leader locator is invisible again unless a visor tracker is active
+		if(user.mind && (user.assigned_squad || misc_tracking) && user.hud_used && user.hud_used.locate_leader)
+			user.show_hud_tracker()
 			if(misc_tracking)
 				SStracking.start_misc_tracking(user)
 			INVOKE_NEXT_TICK(src, PROC_REF(update_minimap_icon), wearer)