Merge pull request #11357 from Markolie/lighting

Lighting system update

code/game/gamemodes/blob/blobs/blob_mobs.dm

@@ -178,7 +178,8 @@
 	environment_smash = ENVIRONMENT_SMASH_RWALLS
 	pressure_resistance = 100    //100 kPa difference required to push
 	throw_pressure_limit = 120  //120 kPa difference required to throw
-
+	see_in_dark = 8
+	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 
 /mob/living/simple_animal/hostile/blob/blobbernaut/blob_act()
 	return

code/game/gamemodes/blob/overmind.dm

@@ -5,8 +5,8 @@
 	icon_state = "marker"
 
 	see_in_dark = 8
-	see_invisible = SEE_INVISIBLE_MINIMUM
 	invisibility = INVISIBILITY_OBSERVER
+	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 
 	pass_flags = PASSBLOB
 	faction = list("blob")
@@ -20,7 +20,6 @@
 	var/is_offspring = FALSE
 	var/datum/reagent/blob/blob_reagent_datum = new/datum/reagent/blob()
 	var/list/blob_mobs = list()
-	var/ghostimage = null
 
 /mob/camera/blob/New()
 	var/new_name = "[initial(name)] ([rand(1, 999)])"
@@ -35,9 +34,6 @@
 		blob_core.adjustcolors(blob_reagent_datum.color)
 
 	color = blob_reagent_datum.complementary_color
-	ghostimage = image(src.icon,src,src.icon_state)
-	ghost_darkness_images |= ghostimage //so ghosts can see the blob cursor when they disable darkness
-	updateallghostimages()
 	..()
 
 /mob/camera/blob/Life(seconds, times_fired)
@@ -45,13 +41,6 @@
 		qdel(src)
 	..()
 
-/mob/camera/blob/Destroy()
-	if(ghostimage)
-		ghost_darkness_images -= ghostimage
-		QDEL_NULL(ghostimage)
-		updateallghostimages()
-	return ..()
-
 /mob/camera/blob/Login()
 	..()
 	sync_mind()

code/game/gamemodes/cult/cult_items.dm

@@ -218,7 +218,7 @@
 	name = "zealot's blindfold"
 	icon_state = "blindfold"
 	item_state = "blindfold"
-	darkness_view = 8
+	see_in_dark = 8
 	flash_protect = 1
 
 /obj/item/clothing/glasses/night/cultblind/equipped(mob/user, slot)

code/game/gamemodes/devil/imp/imp.dm

@@ -29,7 +29,7 @@
 	melee_damage_lower = 10
 	melee_damage_upper = 15
 	see_in_dark = 8
-	see_invisible = SEE_INVISIBLE_MINIMUM
+	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	var/boost
 	var/playstyle_string = "<B><font size=3 color='red'>You are an imp,</font> a mischevious creature from hell. You are the lowest rank on the hellish totem pole  \
 							Though you are not obligated to help, perhaps by aiding a higher ranking devil, you might just get a promotion.  However, you are incapable	\

code/game/gamemodes/devil/true_devil/_true_devil.dm

@@ -30,22 +30,6 @@
 	E.insert()
 	..()
 
-
-/mob/living/carbon/true_devil/update_sight()
-	if(stat == DEAD)
-		sight |= SEE_TURFS
-		sight |= SEE_MOBS
-		sight |= SEE_OBJS
-		see_in_dark = 8
-		see_invisible = SEE_INVISIBLE_LEVEL_TWO
-	else
-		sight = (SEE_TURFS | SEE_OBJS)
-		see_in_dark = 2
-		see_invisible = SEE_INVISIBLE_LIVING
-
-		if(see_override)
-			see_invisible = see_override
-
 // inventory system could use some love
 /mob/living/carbon/true_devil/put_in_hands(obj/item/W)
 	if(!W)

code/game/gamemodes/malfunction/Malf_Modules.dm

@@ -496,22 +496,22 @@
 		return
 
 	var/upgradedcams = 0
-	see_override = SEE_INVISIBLE_MINIMUM //Night-vision, without which X-ray would be very limited in power.
+	RegisterSignal(src, COMSIG_MOB_UPDATE_SIGHT, .proc/update_upgraded_cameras_sight) //Makes sure the AI has night vision, without which X-ray would be very limited in power.
 	update_sight()
 
 	for(var/obj/machinery/camera/C in cameranet.cameras)
 		if(C.assembly)
-			var/upgraded = 0
+			var/upgraded = FALSE
 
 			if(!C.isXRay())
 				C.upgradeXRay()
 				//Update what it can see.
 				cameranet.updateVisibility(C, 0)
-				upgraded = 1
+				upgraded = TRUE
 
 			if(!C.isEmpProof())
 				C.upgradeEmpProof()
-				upgraded = 1
+				upgraded = TRUE
 
 			if(upgraded)
 				upgradedcams++
@@ -519,6 +519,8 @@
 	to_chat(src, "<span class='notice'>OTA firmware distribution complete! Cameras upgraded: [upgradedcams]. Light amplification system online.</span>")
 	verbs -= /mob/living/silicon/ai/proc/upgrade_cameras
 
+/mob/living/silicon/ai/proc/update_upgraded_cameras_sight()
+	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 
 /datum/AI_Module/large/eavesdrop
 	module_name = "Enhanced Surveillance"

code/game/gamemodes/miniantags/guardian/types/ranged.dm

@@ -16,7 +16,7 @@
 	ranged = 1
 	rapid = 1
 	range = 13
-	see_invisible = SEE_INVISIBLE_MINIMUM
+	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	see_in_dark = 8
 	playstyle_string = "As a <b>Ranged</b> type, you have only light damage resistance, but are capable of spraying shards of crystal at incredibly high speed. You can also deploy surveillance snares to monitor enemy movement. Finally, you can switch to scout mode, in which you can't attack, but can move without limit."
 	magic_fluff_string = "..And draw the Sentinel, an alien master of ranged combat."
@@ -53,12 +53,24 @@
 		to_chat(src, "<span class='danger'>You have to be recalled to toggle modes!</span>")
 
 /mob/living/simple_animal/hostile/guardian/ranged/ToggleLight()
-	if(see_invisible == SEE_INVISIBLE_MINIMUM)
-		to_chat(src, "<span class='notice'>You deactivate your night vision.</span>")
-		see_invisible = SEE_INVISIBLE_LIVING
-	else
-		to_chat(src, "<span class='notice'>You activate your night vision.</span>")
-		see_invisible = SEE_INVISIBLE_MINIMUM
+	var/msg
+	switch(lighting_alpha)
+		if (LIGHTING_PLANE_ALPHA_VISIBLE)
+			lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
+			msg = "You activate your night vision."
+		if (LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE)
+			lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
+			msg = "You increase your night vision."
+		if (LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE)
+			lighting_alpha = LIGHTING_PLANE_ALPHA_INVISIBLE
+			msg = "You maximize your night vision."
+		else
+			lighting_alpha = LIGHTING_PLANE_ALPHA_VISIBLE
+			msg = "You deactivate your night vision."
+
+	update_sight()
+
+	to_chat(src, "<span class='notice'>[msg]</span>")
 
 /mob/living/simple_animal/hostile/guardian/ranged/verb/Snare()
 	set name = "Set Surveillance Trap"

code/game/gamemodes/miniantags/morph/morph.dm

@@ -27,7 +27,7 @@
 	melee_damage_lower = 20
 	melee_damage_upper = 20
 	see_in_dark = 8
-	see_invisible = SEE_INVISIBLE_MINIMUM
+	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	idle_vision_range = 1 // Only attack when target is close
 	wander = 0
 	attacktext = "glomps"

code/game/gamemodes/miniantags/revenant/revenant.dm

@@ -20,7 +20,7 @@
 	health =  INFINITY //Revenants don't use health, they use essence instead
 	maxHealth =  INFINITY
 	see_in_dark = 8
-	see_invisible = SEE_INVISIBLE_OBSERVER_NOLIGHTING
+	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	universal_understand = 1
 	response_help   = "passes through"
 	response_disarm = "swings at"
@@ -53,7 +53,6 @@
 	var/draining = 0 //If the revenant is draining someone.
 	var/list/drained_mobs = list() //Cannot harvest the same mob twice
 	var/perfectsouls = 0 //How many perfect, regen-cap increasing souls the revenant has.
-	var/image/ghostimage = null //Visible to ghost with darkness off
 
 
 /mob/living/simple_animal/revenant/Life(seconds, times_fired)
@@ -93,13 +92,6 @@
 	if(essence == 0)
 		to_chat(src, "<span class='revendanger'>You feel your essence fraying!</span>")
 
-/mob/living/simple_animal/revenant/update_sight()
-	if(!client)
-		return
-	if(stat == DEAD)
-		grant_death_vision()
-		return
-
 /mob/living/simple_animal/revenant/say(message)
 	if(!message)
 		return
@@ -122,9 +114,6 @@
 /mob/living/simple_animal/revenant/New()
 	..()
 
-	ghostimage = image(src.icon,src,src.icon_state)
-	ghost_darkness_images |= ghostimage
-	updateallghostimages()
 	remove_from_all_data_huds()
 	random_revenant_name()
 
@@ -206,8 +195,6 @@
 	. = ..()
 	if(!.)
 		return FALSE
-	ghost_darkness_images -= ghostimage
-	updateallghostimages()
 
 	to_chat(src, "<span class='revendanger'>NO! No... it's too late, you can feel your essence breaking apart...</span>")
 	notransform = 1

code/game/gamemodes/miniantags/revenant/revenant_abilities.dm

@@ -110,8 +110,6 @@
 	message = "<span class='revennotice'>You toggle your night vision.</span>"
 	action_icon_state = "r_nightvision"
 	action_background_icon_state = "bg_revenant"
-	non_night_vision = INVISIBILITY_REVENANT
-	night_vision = SEE_INVISIBLE_OBSERVER_NOLIGHTING
 
 //Transmit: the revemant's only direct way to communicate. Sends a single message silently to a single mob
 /obj/effect/proc_holder/spell/targeted/revenant_transmit

code/game/gamemodes/miniantags/slaughter/slaughter.dm

@@ -33,7 +33,7 @@
 	melee_damage_lower = 30
 	melee_damage_upper = 30
 	see_in_dark = 8
-	see_invisible = SEE_INVISIBLE_MINIMUM
+	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	var/boost = 0
 	bloodcrawl = BLOODCRAWL_EAT
 

code/game/gamemodes/nuclear/nuclear.dm

@@ -457,7 +457,7 @@ proc/issyndicate(mob/living/M as mob)
 		var/turf/T = get_turf(nuke)
 		var/area/A = T.loc
 
-		var/list/thousand_penalty = list(/area/syndicate_station, /area/wizard_station, /area/solar, /area)
+		var/list/thousand_penalty = list(/area/wizard_station, /area/solar, /area)
 		var/list/fiftythousand_penalty = list(/area/security/main, /area/security/brig, /area/security/armoury, /area/security/checkpoint2)
 
 		if(is_type_in_list(A, thousand_penalty))

code/game/gamemodes/sandbox/h_sandbox.dm

@@ -67,32 +67,32 @@ datum/hSB
 						P.wear_suit.plane = initial(P.wear_suit.plane)
 						P.wear_suit = null
 					P.wear_suit = new/obj/item/clothing/suit/space(P)
-					P.wear_suit.layer = 20
-					P.wear_suit.plane = HUD_PLANE
+					P.wear_suit.layer = ABOVE_HUD_LAYER
+					P.wear_suit.plane = ABOVE_HUD_PLANE
 					if(P.head)
 						P.head.loc = P.loc
 						P.head.layer = initial(P.head.layer)
 						P.head.plane = initial(P.head.plane)
 						P.head = null
 					P.head = new/obj/item/clothing/head/helmet/space(P)
-					P.head.layer = 20
-					P.head.plane = HUD_PLANE
+					P.head.layer = ABOVE_HUD_LAYER
+					P.head.plane = ABOVE_HUD_PLANE
 					if(P.wear_mask)
 						P.wear_mask.loc = P.loc
 						P.wear_mask.layer = initial(P.wear_mask.layer)
 						P.wear_mask.plane = initial(P.wear_mask.plane)
 						P.wear_mask = null
 					P.wear_mask = new/obj/item/clothing/mask/gas(P)
-					P.wear_mask.layer = 20
-					P.wear_mask.plane = HUD_PLANE
+					P.wear_mask.layer = ABOVE_HUD_LAYER
+					P.wear_mask.plane = ABOVE_HUD_PLANE
 					if(P.back)
 						P.back.loc = P.loc
 						P.back.layer = initial(P.back.layer)
 						P.back.plane = initial(P.back.plane)
 						P.back = null
 					P.back = new/obj/item/tank/jetpack(P)
-					P.back.layer = 20
-					P.back.plane = HUD_PLANE
+					P.back.layer = ABOVE_HUD_LAYER
+					P.back.plane = ABOVE_HUD_PLANE
 					P.internal = P.back
 				if("hsbmetal")
 					var/obj/item/stack/sheet/hsb = new/obj/item/stack/sheet/metal

code/game/gamemodes/shadowling/ascendant_shadowling.dm

@@ -12,7 +12,7 @@
 	speed = 0
 	var/phasing = 0
 	see_in_dark = 8
-	see_invisible = SEE_INVISIBLE_MINIMUM
+	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 
 	universal_speak = 1
 

code/game/gamemodes/shadowling/shadowling_items.dm

@@ -81,4 +81,5 @@
 	unacidable = 1
 	flash_protect = -1
 	vision_flags = SEE_MOBS
+	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	flags = ABSTRACT | NODROP

code/game/gamemodes/shadowling/special_shadowling_abilities.dm

@@ -107,6 +107,8 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N
 				H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/collective_mind(null))
 				H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadowling_regenarmor(null))
 				H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadowling_extend_shuttle(null))
+
+				QDEL_NULL(H.hud_used)
 				H.hud_used = new /datum/hud/human(H, ui_style2icon(H.client.prefs.UI_style), H.client.prefs.UI_style_color, H.client.prefs.UI_style_alpha)
 				H.hud_used.show_hud(H.hud_used.hud_version)
 

code/game/gamemodes/vampire/vampire_powers.dm

@@ -438,9 +438,6 @@
 		steam.start()
 		sleep(jaunt_duration)
 		var/mobloc = get_turf(user.loc)
-		if(get_area(mobloc) == /area/security/armoury/gamma)
-			to_chat(user, "A strange energy repels you!")
-			mobloc = originalloc
 		animation.loc = mobloc
 		steam.location = mobloc
 		steam.start()

code/game/gamemodes/wizard/rightandwrong.dm

@@ -146,7 +146,8 @@
 						H.mutations.Add(XRAY)
 						H.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
 						H.see_in_dark = 8
-						H.see_invisible = SEE_INVISIBLE_LEVEL_TWO
+						H.lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
+						H.update_sight()
 						to_chat(H, "<span class='notice'>The walls suddenly disappear.</span>")
 				if("voodoo")
 					new /obj/item/voodoo(get_turf(H))

code/game/gamemodes/wizard/spellbook.dm

@@ -333,7 +333,7 @@
 			user.mutations.Add(XRAY)
 			user.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
 			user.see_in_dark = 8
-			user.see_invisible = SEE_INVISIBLE_LEVEL_TWO
+			user.lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 			to_chat(user, "<span class='notice'>The walls suddenly disappear.</span>")
 	return 1