Rewrites HUD Handling for Glasses

code/modules/clothing/glasses/glasses.dm

@@ -9,6 +9,7 @@
 	//var/invisa_view = 0
 	var/prescription = 0
 	var/see_darkness = 1
+	var/HUDType = 0
 
 /obj/item/clothing/glasses/meson
 	name = "Optical Meson Scanner"
@@ -258,17 +259,12 @@
 	darkness_view = 1
 	flash_protect = 1
 	tint = 1
-	var/obj/item/clothing/glasses/hud/security/hud = null
+	HUDType = SECHUD
 	species_fit = list("Vox")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/eyes.dmi'
 		)
 
-	New()
-		..()
-		src.hud = new/obj/item/clothing/glasses/hud/security(src)
-		return
-
 /obj/item/clothing/glasses/thermal
 	name = "Optical Thermal Scanner"
 	desc = "Thermals in the shape of glasses."

code/modules/clothing/glasses/hud.dm

@@ -3,23 +3,22 @@
 	desc = "A heads-up display that provides important info in (almost) real time."
 	flags = null //doesn't protect eyes because it's a monocle, duh
 	origin_tech = "magnets=3;biotech=2"
+	HUDType = SECHUD
 	var/list/icon/current = list() //the current hud icons
 
-	proc
-		process_hud(var/mob/M)	return
-
-
 
 /obj/item/clothing/glasses/hud/health
 	name = "Health Scanner HUD"
 	desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."
 	icon_state = "healthhud"
+	HUDType = MEDHUD
 
 /obj/item/clothing/glasses/hud/health_advanced
 	name = "Advanced Health Scanner HUD"
 	desc = "A heads-up display that scans the humans in view and provides accurate data about their health status.  Includes anti-flash filter."
 	icon_state = "advmedhud"
 	flash_protect = 1
+	HUDType = MEDHUD
 
 /obj/item/clothing/glasses/hud/health/night
 	name = "Night Vision Health Scanner HUD"
@@ -29,12 +28,6 @@
 	darkness_view = 8
 	see_darkness = 0
 
-/obj/item/clothing/glasses/hud/health/process_hud(var/mob/M)
-	process_med_hud(M,1)
-
-/obj/item/clothing/glasses/hud/health_advanced/process_hud(var/mob/M)
-	process_med_hud(M,1)
-
 
 /obj/item/clothing/glasses/hud/security
 	name = "Security HUD"
@@ -57,18 +50,3 @@
 	icon_state = "securityhudnight"
 	darkness_view = 8
 	see_darkness = 0
-
-/obj/item/clothing/glasses/hud/security/process_hud(var/mob/M)
-
-	if(!M)	return
-	if(!M.client)	return
-	var/client/C = M.client
-	for(var/mob/living/carbon/human/perp in view(get_turf(M)))
-		if(M.see_invisible < perp.invisibility)
-			continue
-		if(!C) continue
-		C.images += perp.hud_list[ID_HUD]
-		C.images += perp.hud_list[WANTED_HUD]
-		C.images += perp.hud_list[IMPTRACK_HUD]
-		C.images += perp.hud_list[IMPLOYAL_HUD]
-		C.images += perp.hud_list[IMPCHEM_HUD]