Darkness handling update

code/modules/mob/dead/observer/observer.dm

@@ -666,14 +666,32 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	set desc = "Toggles your ability to see things only ghosts can see, like other ghosts"
 	set category = "Ghost"
 	ghostvision = !(ghostvision)
-	updateghostsight()
+	update_sight()
 	to_chat(usr, "You [(ghostvision?"now":"no longer")] have ghost vision.")
 
 /mob/dead/observer/verb/toggle_darkness()
 	set name = "Toggle Darkness"
 	set category = "Ghost"
-	seedarkness = !(seedarkness)
-	updateghostsight()
+	switch(lighting_alpha)
+		if (LIGHTING_PLANE_ALPHA_VISIBLE)
+			lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
+		if (LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE)
+			lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
+		if (LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE)
+			lighting_alpha = LIGHTING_PLANE_ALPHA_INVISIBLE
+		else
+			lighting_alpha = LIGHTING_PLANE_ALPHA_VISIBLE
+
+	update_sight()
+
+/mob/dead/observer/update_sight()
+	if (!ghostvision)
+		see_invisible = SEE_INVISIBLE_LIVING
+	else
+		see_invisible = SEE_INVISIBLE_OBSERVER
+
+	updateghostimages()
+	..()
 
 /mob/dead/observer/proc/updateghostsight()
 	if(!seedarkness)
@@ -681,7 +699,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	else
 		see_invisible = SEE_INVISIBLE_OBSERVER
 		if(!ghostvision)
-			see_invisible = SEE_INVISIBLE_LIVING;
+			see_invisible = SEE_INVISIBLE_LIVING
+
 	updateghostimages()
 
 /proc/updateallghostimages()

code/modules/mob/living/carbon/alien/alien.dm

@@ -6,7 +6,7 @@
 	gender = NEUTER
 	dna = null
 	alien_talk_understand = 1
-	nightvision = 1
+	var/nightvision = 1
 	var/obj/item/card/id/wear_id = null // Fix for station bounced radios -- Skie
 	var/has_fine_manipulation = 0
 	var/move_delay_add = 0 // movement delay to add
@@ -149,15 +149,17 @@
 
 	if(!nightvision)
 		see_in_dark = 8
-		see_invisible = SEE_INVISIBLE_MINIMUM
-		nightvision = 1
+		lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
+		nightvision = TRUE
 		usr.hud_used.nightvisionicon.icon_state = "nightvision1"
-	else if(nightvision == 1)
+	else if(nightvision)
 		see_in_dark = 4
-		see_invisible = 45
-		nightvision = 0
+		lighting_alpha = initial(lighting_alpha)
+		nightvision = FALSE
 		usr.hud_used.nightvisionicon.icon_state = "nightvision0"
 
+	update_sight()
+
 
 /mob/living/carbon/alien/assess_threat(var/mob/living/simple_animal/bot/secbot/judgebot, var/lasercolor)
 	if(judgebot.emagged == 2)
@@ -264,3 +266,35 @@ Des: Removes all infected images from the alien.
 		return pick("xltrails_1", "xltrails_2")
 	else
 		return pick("xttrails_1", "xttrails_2")
+
+/mob/living/carbon/alien/update_sight()
+	if(!client)
+		return
+	if(stat == DEAD)
+		grant_death_vision()
+		return
+
+	sight = SEE_MOBS
+	if(nightvision)
+		see_in_dark = 8
+		lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
+	else
+		see_in_dark = initial(see_in_dark)
+		lighting_alpha = initial(lighting_alpha)
+
+	if(client.eye != src)
+		var/atom/A = client.eye
+		if(A.update_remote_sight(src)) //returns 1 if we override all other sight updates.
+			return
+
+	for(var/obj/item/organ/internal/cyberimp/eyes/E in internal_organs)
+		sight |= E.vision_flags
+		if(E.see_in_dark)
+			see_in_dark = max(see_in_dark, E.see_in_dark)
+		if(E.see_invisible)
+			see_invisible = min(see_invisible, E.see_invisible)
+		if(!isnull(E.lighting_alpha))
+			lighting_alpha = min(lighting_alpha, E.lighting_alpha)		
+
+	if(see_override)
+		see_invisible = see_override

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

@@ -28,33 +28,3 @@
 
 	//BREATH TEMPERATURE
 	handle_breath_temperature(breath)
-
-/mob/living/carbon/alien/update_sight()
-	if(!client)
-		return
-	if(stat == DEAD)
-		grant_death_vision()
-		return
-
-	sight = SEE_MOBS
-	if(nightvision)
-		see_in_dark = 8
-		see_invisible = SEE_INVISIBLE_MINIMUM
-	else
-		see_in_dark = 4
-		see_invisible = SEE_INVISIBLE_LEVEL_TWO
-
-	if(client.eye != src)
-		var/atom/A = client.eye
-		if(A.update_remote_sight(src)) //returns 1 if we override all other sight updates.
-			return
-
-	for(var/obj/item/organ/internal/cyberimp/eyes/E in internal_organs)
-		sight |= E.vision_flags
-		if(E.dark_view)
-			see_in_dark = max(see_in_dark, E.dark_view)
-		if(E.see_invisible)
-			see_invisible = min(see_invisible, E.see_invisible)
-
-	if(see_override)
-		see_invisible = see_override

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

@@ -323,8 +323,8 @@
 			return
 
 		var/extra_darkview = 0
-		if(E.dark_view)
-			extra_darkview = max(E.dark_view - 2, 0)
+		if(E.see_in_dark)
+			extra_darkview = max(E.see_in_dark - 2, 0)
 			extra_damage = extra_darkview
 
 		var/light_amount = 10 // assume full brightness
@@ -1129,4 +1129,37 @@ so that different stomachs can handle things in different ways VB*/
 
 /mob/living/carbon/proc/shock_internal_organs(intensity)
 	for(var/obj/item/organ/O in internal_organs)
-		O.shock_organ(intensity)
+		O.shock_organ(intensity)
+
+/mob/living/carbon/update_sight()
+	if(!client)
+		return
+
+	if(stat == DEAD)
+		grant_death_vision()
+		return
+
+	sight = initial(sight)
+	lighting_alpha = initial(lighting_alpha)
+	
+	for(var/obj/item/organ/internal/cyberimp/eyes/E in internal_organs)
+		sight |= E.vision_flags
+		if(E.see_in_dark)
+			see_in_dark = max(see_in_dark, E.see_in_dark)
+		if(E.see_invisible)
+			see_invisible = min(see_invisible, E.see_invisible)
+		if(!isnull(E.lighting_alpha))
+			lighting_alpha = min(lighting_alpha, E.lighting_alpha)
+
+	if(client.eye != src)
+		var/atom/A = client.eye
+		if(A.update_remote_sight(src)) //returns 1 if we override all other sight updates.
+			return
+
+	if(XRAY in mutations)
+		sight |= (SEE_TURFS|SEE_MOBS|SEE_OBJS)
+		see_in_dark = 8
+		lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
+
+	if(see_override)
+		see_invisible = see_override

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

@@ -545,6 +545,7 @@
 /mob/living/carbon/human/update_sight()
 	if(!client)
 		return
+
 	if(stat == DEAD)
 		grant_death_vision()
 		return
@@ -1427,11 +1428,7 @@
 
 	dna.species.on_species_gain(src)
 
-	see_in_dark = dna.species.get_resultant_darksight(src)
-	if(see_in_dark > 2)
-		see_invisible = SEE_INVISIBLE_LEVEL_ONE
-	else
-		see_invisible = SEE_INVISIBLE_LIVING
+	update_sight()
 
 	dna.species.handle_dna(src) //Give them whatever special dna business they got.
 

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

@@ -115,7 +115,7 @@
 			update_tint()
 		if(G.prescription)
 			update_nearsighted_effects()
-		if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view)
+		if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view || !isnull(G.lighting_alpha))
 			update_sight()
 		update_inv_glasses()
 		update_client_colour()
@@ -128,7 +128,7 @@
 		// Bandanas and paper hats go on the head but are not head clothing
 		if(istype(I,/obj/item/clothing/head))
 			var/obj/item/clothing/head/hat = I
-			if(hat.vision_flags || hat.darkness_view || hat.helmet_goggles_invis_view)
+			if(hat.vision_flags || hat.darkness_view || !isnull(hat.lighting_alpha))
 				update_sight()
 		head_update(I)
 		update_inv_head()
@@ -267,7 +267,7 @@
 				update_tint()
 			if(G.prescription)
 				update_nearsighted_effects()
-			if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view)
+			if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view || !isnull(G.lighting_alpha))
 				update_sight()
 			update_inv_glasses(redraw_mob)
 			update_client_colour()
@@ -283,7 +283,7 @@
 			// paper + bandanas
 			if(istype(W, /obj/item/clothing/head))
 				var/obj/item/clothing/head/hat = W
-				if(hat.vision_flags || hat.darkness_view || hat.helmet_goggles_invis_view)
+				if(hat.vision_flags || hat.darkness_view || !isnull(hat.lighting_alpha))
 					update_sight()
 			head_update(W)
 			update_inv_head(redraw_mob)

code/modules/mob/living/carbon/human/species/_species.dm

@@ -39,8 +39,6 @@
 
 	var/siemens_coeff = 1 //base electrocution coefficient
 
-	var/invis_sight = SEE_INVISIBLE_LIVING
-
 	var/hazard_high_pressure = HAZARD_HIGH_PRESSURE   // Dangerously high pressure.
 	var/warning_high_pressure = WARNING_HIGH_PRESSURE // High pressure warning.
 	var/warning_low_pressure = WARNING_LOW_PRESSURE   // Low pressure warning.
@@ -630,22 +628,21 @@ It'll return null if the organ doesn't correspond, so include null checks when u
 		return null
 	return has_organ[organ_slot]
 
-/datum/species/proc/get_resultant_darksight(mob/living/carbon/human/H) //Returns default value of 2 if the mob doesn't have eyes, otherwise it grabs the eyes darksight.
-	var/resultant_darksight = 2
+/datum/species/proc/update_sight(mob/living/carbon/human/H)
 	var/obj/item/organ/internal/eyes/eyes = H.get_int_organ(/obj/item/organ/internal/eyes)
 	if(eyes)
-		resultant_darksight = eyes.get_dark_view()
-	return resultant_darksight
-
-/datum/species/proc/update_sight(mob/living/carbon/human/H)
-	H.sight = initial(H.sight)
-	H.see_in_dark = get_resultant_darksight(H)
-	H.see_invisible = invis_sight
+		H.sight |= eyes.vision_flags
+		H.see_in_dark = eyes.see_in_dark
+		H.see_invisible = eyes.see_invisible
+		H.lighting_alpha = eyes.lighting_alpha
+	else
+		H.sight = initial(H.sight)
+		H.see_in_dark = initial(H.see_in_dark)
+		H.see_invisible = initial(H.see_invisible)
+		H.lighting_alpha = initial(H.lighting_alpha)
 
 	if(H.see_in_dark > 2) //Preliminary see_invisible handling as per set_species() in code\modules\mob\living\carbon\human\human.dm.
-		H.see_invisible = SEE_INVISIBLE_LEVEL_ONE
-	else
-		H.see_invisible = SEE_INVISIBLE_LIVING
+		H.lighting_alpha = min(H.lighting_alpha, LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE)
 
 	if(H.client && H.client.eye != H)
 		var/atom/A = H.client.eye
@@ -656,39 +653,43 @@ It'll return null if the organ doesn't correspond, so include null checks when u
 		if(H.mind.vampire.get_ability(/datum/vampire_passive/full))
 			H.sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
 			H.see_in_dark = 8
-			H.see_invisible = SEE_INVISIBLE_MINIMUM
+			H.lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 		else if(H.mind.vampire.get_ability(/datum/vampire_passive/vision))
 			H.sight |= SEE_MOBS
+			H.lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
 
 	for(var/obj/item/organ/internal/cyberimp/eyes/E in H.internal_organs)
 		H.sight |= E.vision_flags
-		if(E.dark_view)
-			H.see_in_dark = E.dark_view
+		if(E.see_in_dark)
+			H.see_in_dark = max(H.see_in_dark, E.see_in_dark)
 		if(E.see_invisible)
 			H.see_invisible = min(H.see_invisible, E.see_invisible)
+		if(E.lighting_alpha)
+			H.lighting_alpha = min(H.lighting_alpha, E.lighting_alpha)
 
-	var/lesser_darkview_bonus = INFINITY
 	// my glasses, I can't see without my glasses
 	if(H.glasses)
 		var/obj/item/clothing/glasses/G = H.glasses
 		H.sight |= G.vision_flags
-		lesser_darkview_bonus = G.darkness_view
+		H.see_in_dark = max(G.darkness_view, H.see_in_dark)
+
 		if(G.invis_override)
 			H.see_invisible = G.invis_override
 		else
 			H.see_invisible = min(G.invis_view, H.see_invisible)
+		
+		if(!isnull(G.lighting_alpha))
+			H.lighting_alpha = min(G.lighting_alpha, H.lighting_alpha)
 
 	// better living through hat trading
 	if(H.head)
 		if(istype(H.head, /obj/item/clothing/head))
 			var/obj/item/clothing/head/hat = H.head
 			H.sight |= hat.vision_flags
+			H.see_in_dark = max(hat.darkness_view, H.see_in_dark)
 
-			if(hat.darkness_view) // Pick the lowest of the two darkness_views between the glasses and helmet.
-				lesser_darkview_bonus = min(hat.darkness_view,lesser_darkview_bonus)
-
-			if(hat.helmet_goggles_invis_view)
-				H.see_invisible = min(hat.helmet_goggles_invis_view, H.see_invisible)
+			if(!isnull(hat.lighting_alpha))
+				H.lighting_alpha = min(hat.lighting_alpha, H.lighting_alpha)
 
 	if(istype(H.back, /obj/item/rig)) ///aghhh so snowflakey
 		var/obj/item/rig/rig = H.back
@@ -697,28 +698,33 @@ It'll return null if the organ doesn't correspond, so include null checks when u
 				if(rig.visor && rig.visor.vision && rig.visor.active && rig.visor.vision.glasses)
 					var/obj/item/clothing/glasses/G = rig.visor.vision.glasses
 					if(istype(G))
-						H.see_in_dark = (G.darkness_view ? G.darkness_view : get_resultant_darksight(H)) // Otherwise we keep our darkness view with togglable nightvision.
-						if(G.vision_flags)		// MESONS
-							H.sight |= G.vision_flags
-
+						H.sight |= G.vision_flags
+						H.see_in_dark = max(G.darkness_view, H.see_in_dark)
 						H.see_invisible = min(G.invis_view, H.see_invisible)
 
-	if(lesser_darkview_bonus != INFINITY)
-		H.see_in_dark = max(lesser_darkview_bonus, H.see_in_dark)
+						if(!isnull(G.lighting_alpha))
+							H.lighting_alpha = min(G.lighting_alpha, H.lighting_alpha)
 
 	if(H.vision_type)
-		H.see_in_dark = max(H.see_in_dark, H.vision_type.see_in_dark, get_resultant_darksight(H))
-		H.see_invisible = H.vision_type.see_invisible
-		if(H.vision_type.light_sensitive)
-			H.weakeyes = 1
 		H.sight |= H.vision_type.sight_flags
+		H.see_in_dark = max(H.see_in_dark, H.vision_type.see_in_dark)
+
+		if(!isnull(H.vision_type.lighting_alpha))
+			H.lighting_alpha = min(H.vision_type.lighting_alpha, H.lighting_alpha)
+
+		if(H.vision_type.light_sensitive)
+			H.weakeyes = TRUE
 
 	if(XRAY in H.mutations)
 		H.sight |= (SEE_TURFS|SEE_MOBS|SEE_OBJS)
+		H.see_in_dark = 8
+		H.lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 
 	if(H.see_override)	//Override all
 		H.see_invisible = H.see_override
 
+	H.sync_lighting_plane_alpha()
+
 /datum/species/proc/water_act(mob/living/carbon/human/M, volume, temperature, source)
 	if(abs(temperature - M.bodytemperature) > 10) //If our water and mob temperature varies by more than 10K, cool or/ heat them appropriately
 		M.bodytemperature = (temperature + M.bodytemperature) * 0.5 //Approximation for gradual heating or cooling

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

@@ -343,36 +343,6 @@
 		Sleeping(2)
 	return sleeping
 
-/mob/living/carbon/update_sight()
-	if(!client)
-		return
-	if(stat == DEAD)
-		grant_death_vision()
-		return
-
-	see_invisible = initial(see_invisible)
-	see_in_dark = initial(see_in_dark)
-	sight = initial(sight)
-
-	if(XRAY in mutations)
-		grant_xray_vision()
-
-	if(client.eye != src)
-		var/atom/A = client.eye
-		if(A.update_remote_sight(src)) //returns 1 if we override all other sight updates.
-			return
-
-	for(var/obj/item/organ/internal/cyberimp/eyes/E in internal_organs)
-		sight |= E.vision_flags
-		if(E.dark_view)
-			see_in_dark = max(see_in_dark,E.dark_view)
-		if(E.see_invisible)
-			see_invisible = min(see_invisible, E.see_invisible)
-
-	if(see_override)
-		see_invisible = see_override
-
-
 /mob/living/carbon/handle_hud_icons()
 	return
 

code/modules/mob/living/life.dm

@@ -197,28 +197,15 @@
 		if(!remote_view && !client.adminobs)
 			reset_perspective(null)
 
-/mob/living/proc/update_sight()
-	if(stat == DEAD)
-		grant_death_vision()
-	return
-
 // Gives a mob the vision of being dead
 /mob/living/proc/grant_death_vision()
 	sight |= SEE_TURFS
 	sight |= SEE_MOBS
 	sight |= SEE_OBJS
+	lighting_alpha = LIGHTING_PLANE_ALPHA_INVISIBLE
 	see_in_dark = 8
 	see_invisible = SEE_INVISIBLE_OBSERVER
-
-// See through walls, dark, etc.
-// basically the same as death vision except you can't
-// see ghosts
-/mob/living/proc/grant_xray_vision()
-	sight |= SEE_TURFS
-	sight |= SEE_MOBS
-	sight |= SEE_OBJS
-	see_in_dark = 8
-	see_invisible = SEE_INVISIBLE_LEVEL_TWO
+	sync_lighting_plane_alpha()
 
 /mob/living/proc/handle_hud_icons()
 	handle_hud_icons_health()

code/modules/mob/living/living.dm

@@ -992,3 +992,37 @@
 	for(var/atom/A in src)
 		if(A.light_range > 0)
 			A.extinguish_light()
+
+/mob/living/vv_edit_var(var_name, var_value)
+	switch(var_name)
+		if("stat")
+			if((stat == DEAD) && (var_value < DEAD))//Bringing the dead back to life
+				GLOB.dead_mob_list -= src
+				GLOB.living_mob_list += src
+			if((stat < DEAD) && (var_value == DEAD))//Kill he
+				GLOB.living_mob_list -= src
+				GLOB.dead_mob_list += src
+	. = ..()
+	switch(var_name)
+		if("weakened")
+			SetWeakened(var_value)
+		if("stunned")
+			SetStunned(var_value)
+		if("paralysis")
+			SetParalysis(var_value)
+		if("sleeping")
+			SetSleeping(var_value)
+		if("maxHealth")
+			updatehealth()
+		if("resize")
+			update_transform()
+		if("lighting_alpha")
+			sync_lighting_plane_alpha()
+
+/mob/living/update_sight()
+	if(!client)
+		return
+
+	if(stat == DEAD)
+		grant_death_vision()
+		return

code/modules/mob/living/living_defines.dm

@@ -33,7 +33,6 @@
 	var/mob_size = MOB_SIZE_HUMAN
 	var/metabolism_efficiency = 1 //more or less efficiency to metabolize helpful/harmful reagents and regulate body temperature..
 	var/digestion_ratio = 1 //controls how quickly reagents metabolize; largely governered by species attributes.
-	var/nightvision = 0
 
 	var/bloodcrawl = 0 //0 No blood crawling, 1 blood crawling, 2 blood crawling+mob devour
 	var/holder = null //The holder for blood crawling

code/modules/mob/living/silicon/ai/ai.dm

@@ -1290,4 +1290,29 @@ var/list/ai_verbs_default = list(
 	return FALSE
 
 /mob/living/silicon/ai/ExtinguishMob()
-	return
+	return
+
+
+/mob/living/silicon/ai/update_sight()
+	if(!client)
+		return
+
+	if(stat == DEAD)
+		grant_death_vision()
+		return
+
+	see_invisible = initial(see_invisible)
+	see_in_dark = initial(see_in_dark)
+	lighting_alpha = initial(lighting_alpha)
+	sight = initial(sight)
+
+	if(aiRestorePowerRoutine)
+		sight = sight &~ SEE_TURFS
+		sight = sight &~ SEE_MOBS
+		sight = sight &~ SEE_OBJS
+		see_in_dark = 0
+
+	if(see_override)
+		see_invisible = see_override
+
+	sync_lighting_plane_alpha()

code/modules/mob/living/silicon/ai/life.dm

@@ -152,16 +152,3 @@
 /mob/living/silicon/ai/rejuvenate()
 	..()
 	add_ai_verbs(src)
-
-/mob/living/silicon/ai/update_sight()
-	see_invisible = initial(see_invisible)
-	see_in_dark = initial(see_in_dark)
-	sight = initial(sight)
-	if(aiRestorePowerRoutine)
-		sight = sight&~SEE_TURFS
-		sight = sight&~SEE_MOBS
-		sight = sight&~SEE_OBJS
-		see_in_dark = 0
-
-	if(see_override)
-		see_invisible = see_override

code/modules/mob/living/silicon/robot/life.dm

@@ -88,40 +88,6 @@
 
 	return 1
 
-/mob/living/silicon/robot/update_sight()
-	if(!client)
-		return
-	if(stat == DEAD)
-		grant_death_vision()
-		return
-
-	see_invisible = initial(see_invisible)
-	see_in_dark = initial(see_in_dark)
-	sight = initial(sight)
-
-	if(client.eye != src)
-		var/atom/A = client.eye
-		if(A.update_remote_sight(src)) //returns 1 if we override all other sight updates.
-			return
-
-	if(sight_mode & BORGMESON)
-		sight |= SEE_TURFS
-		see_invisible = min(see_invisible, SEE_INVISIBLE_MINIMUM)
-		see_in_dark = 1
-
-	if(sight_mode & BORGXRAY)
-		sight |= (SEE_TURFS|SEE_MOBS|SEE_OBJS)
-		see_invisible = SEE_INVISIBLE_LIVING
-		see_in_dark = 8
-
-	if(sight_mode & BORGTHERM)
-		sight |= SEE_MOBS
-		see_invisible = min(see_invisible, SEE_INVISIBLE_LIVING)
-		see_in_dark = 8
-
-	if(see_override)
-		see_invisible = see_override
-
 /mob/living/silicon/robot/handle_hud_icons()
 	update_items()
 	update_cell()

code/modules/mob/living/silicon/robot/robot.dm

@@ -1385,3 +1385,43 @@ var/list/robot_verbs_default = list(
 
 /mob/living/silicon/robot/check_ear_prot()
 	return ear_protection
+
+/mob/living/silicon/robot/update_sight()
+	if(!client)
+		return
+
+	if(stat == DEAD)
+		grant_death_vision()
+		return
+
+	see_invisible = initial(see_invisible)
+	see_in_dark = initial(see_in_dark)
+	sight = initial(sight)
+	lighting_alpha = initial(lighting_alpha)
+
+	if(client.eye != src)
+		var/atom/A = client.eye
+		if(A.update_remote_sight(src)) //returns 1 if we override all other sight updates.
+			return
+
+	if(sight_mode & BORGMESON)
+		sight |= SEE_TURFS
+		lighting_alpha = LIGHTING_PLANE_ALPHA_INVISIBLE
+		see_in_dark = 1
+
+	if(sight_mode & BORGXRAY)
+		sight |= (SEE_TURFS|SEE_MOBS|SEE_OBJS)
+		see_invisible = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
+		see_invisible = SEE_INVISIBLE_LIVING
+		see_in_dark = 8
+
+	if(sight_mode & BORGTHERM)
+		sight |= SEE_MOBS
+		lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
+		see_invisible = min(see_invisible, SEE_INVISIBLE_LIVING)
+		see_in_dark = 8
+
+	if(see_override)
+		see_invisible = see_override
+
+	sync_lighting_plane_alpha()

code/modules/mob/living/simple_animal/hostile/alien.dm

@@ -30,7 +30,7 @@
 	status_flags = CANPUSH
 	minbodytemp = 0
 	see_in_dark = 8
-	see_invisible = SEE_INVISIBLE_MINIMUM
+	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE
 	death_sound = 'sound/voice/hiss6.ogg'
 	deathmessage = "lets out a waning guttural screech, green blood bubbling from its maw..."

code/modules/mob/living/simple_animal/hostile/giant_spider.dm

@@ -17,6 +17,7 @@
 	speak_chance = 5
 	turns_per_move = 5
 	see_in_dark = 10
+	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
 	butcher_results = list(/obj/item/reagent_containers/food/snacks/spidermeat = 2, /obj/item/reagent_containers/food/snacks/spiderleg = 8)
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"

code/modules/mob/living/simple_animal/hostile/mining_mobs.dm

@@ -16,7 +16,7 @@
 	var/throw_message = "bounces off of"
 	var/icon_aggro = null // for swapping to when we get aggressive
 	see_in_dark = 8
-	see_invisible = SEE_INVISIBLE_MINIMUM
+	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	mob_size = MOB_SIZE_LARGE
 
 /mob/living/simple_animal/hostile/asteroid/Aggro()

code/modules/mob/living/simple_animal/hostile/statue.dm

@@ -40,7 +40,7 @@
 
 	search_objects = 1 // So that it can see through walls
 
-	see_invisible = SEE_INVISIBLE_OBSERVER_NOLIGHTING
+	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
 	sight = SEE_SELF|SEE_MOBS|SEE_OBJS|SEE_TURFS
 	move_force = MOVE_FORCE_EXTREMELY_STRONG
 	move_resist = MOVE_FORCE_EXTREMELY_STRONG
@@ -189,13 +189,6 @@
 			L.EyeBlind(4)
 	return
 
-/mob/living/simple_animal/hostile/statue/update_sight()
-	if(!client)
-		return
-	if(stat == DEAD)
-		grant_death_vision()
-		return
-
 //Toggle Night Vision
 /obj/effect/proc_holder/spell/targeted/night_vision
 	name = "Toggle Nightvision"
@@ -207,15 +200,23 @@
 	message = "<span class='notice'>You toggle your night vision!</span>"
 	range = -1
 	include_user = 1
-	var/non_night_vision = SEE_INVISIBLE_LIVING
-	var/night_vision = SEE_INVISIBLE_OBSERVER_NOLIGHTING
 
 /obj/effect/proc_holder/spell/targeted/night_vision/cast(list/targets, mob/user = usr)
 	for(var/mob/living/target in targets)
-		if(target.see_invisible == non_night_vision)
-			target.see_invisible = night_vision
-		else
-			target.see_invisible = non_night_vision
+		switch(target.lighting_alpha)
+			if (LIGHTING_PLANE_ALPHA_VISIBLE)
+				target.lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
+				name = "Toggle Nightvision \[More]"
+			if (LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE)
+				target.lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
+				name = "Toggle Nightvision \[Full]"
+			if (LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE)
+				target.lighting_alpha = LIGHTING_PLANE_ALPHA_INVISIBLE
+				name = "Toggle Nightvision \[OFF]"
+			else
+				target.lighting_alpha = LIGHTING_PLANE_ALPHA_VISIBLE
+				name = "Toggle Nightvision \[ON]"
+		target.update_sight()
 
 /mob/living/simple_animal/hostile/statue/sentience_act()
 	faction -= "neutral"

code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm

@@ -95,8 +95,7 @@ var/global/list/ts_spiderling_list = list()
 	idle_vision_range = 10
 	aggro_vision_range = 10
 	see_in_dark = 10
-	nightvision = 1
-	see_invisible = 5
+	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	sight = SEE_MOBS
 
 	// AI aggression settings

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -564,21 +564,5 @@
 /mob/living/simple_animal/proc/sentience_act() //Called when a simple animal gains sentience via gold slime potion
 	return
 
-/mob/living/simple_animal/update_sight()
-	if(!client)
-		return
-	if(stat == DEAD)
-		grant_death_vision()
-		return
-
-	see_invisible = initial(see_invisible)
-	see_in_dark = initial(see_in_dark)
-	sight = initial(sight)
-
-	if(client.eye != src)
-		var/atom/A = client.eye
-		if(A.update_remote_sight(src)) //returns 1 if we override all other sight updates.
-			return
-
 /mob/living/simple_animal/can_hear()
 	. = TRUE

code/modules/mob/mob.dm

@@ -1341,3 +1341,12 @@ var/list/slot_equipment_priority = list( \
 
 /mob/proc/is_literate()
 	return FALSE
+
+/mob/proc/update_sight()
+	sync_lighting_plane_alpha()
+
+/mob/proc/sync_lighting_plane_alpha()
+	if(hud_used)
+		var/obj/screen/plane_master/lighting/L = hud_used.plane_masters["[LIGHTING_PLANE]"]
+		if (L)
+			L.alpha = lighting_alpha

code/modules/mob/mob_defines.dm

@@ -1,6 +1,6 @@
 /mob
 	density = 1
-	layer = 4.0
+	layer = MOB_LAYER
 	animate_movement = 2
 	pressure_resistance = 8
 	dont_save = TRUE //to avoid it messing up in buildmode saving
@@ -93,7 +93,7 @@
 
 	var/list/grabbed_by = list()
 	var/list/requests = list()
-
+	var/lighting_alpha = LIGHTING_PLANE_ALPHA_VISIBLE
 	var/list/mapobjs = list()
 
 	var/in_throw_mode = 0