Merge pull request #10390 from mwerezak/night-vision

Fixes #10389

code/modules/clothing/clothing.dm

@@ -176,7 +176,7 @@ BLIND     // can't see anything
 	slot_flags = SLOT_EYES
 	var/vision_flags = 0
 	var/darkness_view = 0//Base human is 2
-	var/invisa_view = 0
+	var/see_invisible = -1
 	sprite_sheets = list("Vox" = 'icons/mob/species/vox/eyes.dmi')
 
 /obj/item/clothing/glasses/update_clothing_icon()

code/modules/clothing/glasses/glasses.dm

@@ -7,7 +7,6 @@
 	//slot_flags = SLOT_EYES
 	//var/vision_flags = 0
 	//var/darkness_view = 0//Base human is 2
-	//var/invisa_view = 0
 	var/prescription = 0
 	var/toggleable = 0
 	var/off_state = "degoggles"
@@ -75,6 +74,7 @@
 	origin_tech = "magnets=2"
 	darkness_view = 7
 	toggleable = 1
+	see_invisible = SEE_INVISIBLE_OBSERVER_NOLIGHTING
 	icon_action_button = "action_nvg"
 	off_state = "denight"
 
@@ -224,7 +224,6 @@
 	toggleable = 1
 	icon_action_button = "action_thermal"
 	vision_flags = SEE_MOBS
-	invisa_view = 2
 
 	emp_act(severity)
 		if(istype(src.loc, /mob/living/carbon/human))

code/modules/clothing/glasses/hud.dm

@@ -33,7 +33,7 @@
 	icon_state = "jensenshades"
 	item_state = "jensenshades"
 	vision_flags = SEE_MOBS
-	invisa_view = 2
+	see_invisible = SEE_INVISIBLE_OBSERVER_NOLIGHTING
 
 /obj/item/clothing/glasses/hud/security/process_hud(var/mob/M)
 	process_sec_hud(M, 1)

code/modules/mob/living/carbon/human/life.dm

@@ -1244,6 +1244,9 @@
 				else
 					seer = 0
 
+			if(!seer)
+				see_invisible = SEE_INVISIBLE_LIVING
+
 			var/equipped_glasses = glasses
 			var/obj/item/weapon/rig/rig = back
 			if(istype(rig) && rig.visor)
@@ -1253,9 +1256,6 @@
 			if(equipped_glasses)
 				process_glasses(equipped_glasses)
 
-			if(!seer)
-				see_invisible = SEE_INVISIBLE_LIVING
-
 			if(healths)
 				if (analgesic > 100)
 					healths.icon_state = "health_health_numb"
@@ -1403,8 +1403,8 @@
 				sight |= G.vision_flags
 				if(!druggy && !seer)
 					see_invisible = SEE_INVISIBLE_MINIMUM
-			if(istype(G,/obj/item/clothing/glasses/night) && !seer)
-				see_invisible = SEE_INVISIBLE_MINIMUM
+			if(G.see_invisible >= 0)
+				see_invisible = G.see_invisible
 	/* HUD shit goes here, as long as it doesn't modify sight flags */
 	// The purpose of this is to stop xray and w/e from preventing you from using huds -- Love, Doohl
 			var/obj/item/clothing/glasses/hud/O = G