Merge pull request #3969 from Citadel-Station-13/upstream-merge-32622

[MIRROR] Fix conflicts between helmet/mech HUDs and HUD glasses

code/modules/clothing/spacesuits/hardsuit.dm

@@ -444,7 +444,6 @@
 	icon_state = "hardsuit0-rd"
 	item_color = "rd"
 	resistance_flags = ACID_PROOF | FIRE_PROOF
-	var/onboard_hud_enabled = 0 //stops conflicts with another diag HUD
 	max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
 	armor = list(melee = 30, bullet = 5, laser = 10, energy = 5, bomb = 100, bio = 100, rad = 60, fire = 60, acid = 80)
 	var/obj/machinery/doppler_array/integrated/bomb_radar
@@ -457,16 +456,13 @@
 
 /obj/item/clothing/head/helmet/space/hardsuit/rd/equipped(mob/living/carbon/human/user, slot)
 	..()
-	if(user.glasses && istype(user.glasses, /obj/item/clothing/glasses/hud/diagnostic))
-		to_chat(user, ("<span class='warning'>Your [user.glasses] prevents you using [src]'s diagnostic visor HUD.</span>"))
-	else
-		onboard_hud_enabled = 1
+	if (slot == slot_head)
 		var/datum/atom_hud/DHUD = GLOB.huds[DATA_HUD_DIAGNOSTIC]
 		DHUD.add_hud_to(user)
 
 /obj/item/clothing/head/helmet/space/hardsuit/rd/dropped(mob/living/carbon/human/user)
 	..()
-	if(onboard_hud_enabled && !(user.glasses && istype(user.glasses, /obj/item/clothing/glasses/hud/diagnostic)))
+	if (user.head == src)
 		var/datum/atom_hud/DHUD = GLOB.huds[DATA_HUD_DIAGNOSTIC]
 		DHUD.remove_hud_from(user)
 

code/modules/mob/mob_defines.dm

@@ -135,8 +135,6 @@
 
 	var/turf/listed_turf = null	//the current turf being examined in the stat panel
 
-	var/list/permanent_huds = list()
-
 	var/resize = 1 //Badminnery resize
 
 	var/list/observers = null	//The list of people observing this mob.

code/modules/surgery/organs/augments_eyes.dm

@@ -19,12 +19,10 @@
 	if(HUD_type)
 		var/datum/atom_hud/H = GLOB.huds[HUD_type]
 		H.add_hud_to(M)
-		M.permanent_huds |= H
 
 /obj/item/organ/cyberimp/eyes/hud/Remove(var/mob/living/carbon/M, var/special = 0)
 	if(HUD_type)
 		var/datum/atom_hud/H = GLOB.huds[HUD_type]
-		M.permanent_huds ^= H
 		H.remove_hud_from(M)
 	..()