Merge branch 'master' into upstream-merge-8124

code/game/objects/effects/alien/aliens.dm

@@ -203,6 +203,7 @@
 	desc = "Weird glowing organic growth."
 	layer = ABOVE_TURF_LAYER+0.01
 	light_range = NODERANGE
+	light_on = TRUE
 
 	var/node_range = NODERANGE
 	var/set_color = "#321D37"

code/game/objects/effects/decals/Cleanable/humans.dm

@@ -87,10 +87,10 @@ var/global/list/image/splatter_cache=list()
 			if(!S.blood_DNA)
 				S.blood_DNA = list()
 				S.blood_overlay.color = basecolor
-				S.overlays += S.blood_overlay
+				S.add_overlay(S.blood_overlay)
 			if(S.blood_overlay && S.blood_overlay.color != basecolor)
 				S.blood_overlay.color = basecolor
-				S.overlays += S.blood_overlay
+				S.add_overlay(S.blood_overlay)
 			S.blood_DNA |= blood_DNA.Copy()
 			perp.update_inv_shoes()
 
@@ -191,8 +191,8 @@ var/global/list/image/splatter_cache=list()
 	blood.Blend(basecolor,ICON_MULTIPLY)
 
 	icon = blood
-	overlays.Cut()
-	overlays += giblets
+	cut_overlays()
+	add_overlay(giblets)
 
 /obj/effect/decal/cleanable/blood/gibs/up
 	random_icon_states = list("gib1", "gib2", "gib3", "gib5", "gib6","gibup1","gibup1","gibup1")

code/game/objects/effects/decals/Cleanable/tracks.dm

@@ -129,7 +129,7 @@ var/global/list/image/fluidtrack_cache=list()
 			update_icon()
 
 	update_icon()
-		overlays.Cut()
+		cut_overlays()
 		color = "#FFFFFF"
 		var/truedir=0
 
@@ -150,7 +150,7 @@ var/global/list/image/fluidtrack_cache=list()
 			track.fresh=0
 			track.overlay=I
 			stack[stack_idx]=track
-			overlays += I
+			add_overlay(I)
 		updatedtracks=0 // Clear our memory of updated tracks.
 
 /obj/effect/decal/cleanable/blood/tracks/footprints

code/game/objects/effects/decals/crayon.dm

@@ -24,7 +24,7 @@
 		mainOverlay.Blend(main,ICON_ADD)
 		shadeOverlay.Blend(shade,ICON_ADD)
 
-		overlays += mainOverlay
-		overlays += shadeOverlay
+		add_overlay(mainOverlay)
+		add_overlay(shadeOverlay)
 
 		add_hiddenprint(usr)

code/game/objects/effects/decals/warning_stripes.dm

@@ -6,5 +6,5 @@
 	var/turf/T=get_turf(src)
 	var/image/I=image(icon, icon_state = icon_state, dir = dir)
 	I.color=color
-	T.overlays += I
+	T.add_overlay(I)
 	return INITIALIZE_HINT_QDEL

code/game/objects/effects/effect_system.dm

@@ -4,7 +4,8 @@ defined, then set up when it is created with New(). Then this same system can ju
 it needs to create more trails.A beaker could have a steam_trail_follow system set up, then the steam
 would spawn and follow the beaker, even if it is carried or thrown.
 */
-
+/obj/effect
+	light_on = TRUE
 
 /obj/effect/effect
 	name = "effect"
@@ -12,6 +13,8 @@ would spawn and follow the beaker, even if it is carried or thrown.
 	mouse_opacity = 0
 	unacidable = 1//So effect are not targeted by alien acid.
 	pass_flags = PASSTABLE | PASSGRILLE
+	blocks_emissive = EMISSIVE_BLOCK_GENERIC
+	light_on = TRUE
 
 /datum/effect/effect/system
 	var/number = 3

code/game/objects/effects/map_effects/perma_light.dm

@@ -7,6 +7,7 @@
 	light_range = 3
 	light_power = 1
 	light_color = "#FFFFFF"
+	light_on = TRUE
 
 /obj/effect/map_effect/perma_light/brighter
 	name = "permanent light (bright)"
@@ -25,4 +26,14 @@
 /obj/effect/map_effect/perma_light/concentrated/incandescent
 	name = "permanent light (concentrated incandescent)"
 
-	light_color = LIGHT_COLOR_INCANDESCENT_TUBE
+	light_color = LIGHT_COLOR_INCANDESCENT_TUBE
+
+// VOREStation Addition Start
+/obj/effect/map_effect/perma_light/gateway
+	name = "permanent light (gateway)"
+	icon_state = "permalight"
+
+	light_range = 10
+	light_power = 5
+	light_color = "#b6cdff"
+// VOREStation Addition End

code/game/objects/effects/misc.dm

@@ -61,4 +61,42 @@
 /obj/effect/temporary_effect/lightning_strike/Initialize()
 	icon_state += "[rand(1,2)]" // To have two variants of lightning sprites.
 	animate(src, alpha = 0, time = time_to_die - 1)
-	. = ..()
+	. = ..()
+
+/obj/effect/dummy/lighting_obj
+	name = "lighting fx obj"
+	desc = "Tell a coder if you're seeing this."
+	icon_state = "nothing"
+	light_system = MOVABLE_LIGHT
+	light_range = MINIMUM_USEFUL_LIGHT_RANGE
+	light_color = COLOR_WHITE
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	light_on = TRUE
+	blocks_emissive = FALSE
+
+/obj/effect/dummy/lighting_obj/Initialize(mapload, _range, _power, _color, _duration)
+	. = ..()
+	if(!isnull(_range))
+		set_light_range(_range)
+	if(!isnull(_power))
+		set_light_power(_power)
+	if(!isnull(_color))
+		set_light_color(_color)
+	if(_duration)
+		QDEL_IN(src, _duration)
+
+/obj/effect/dummy/lighting_obj/moblight
+	name = "mob lighting fx"
+
+/obj/effect/dummy/lighting_obj/moblight/Initialize(mapload, _color, _range, _power, _duration)
+	. = ..()
+	if(!ismob(loc))
+		return INITIALIZE_HINT_QDEL
+
+/obj/effect/dummy/lighting_obj/moblight/fire
+	name = "fire"
+	light_color = LIGHT_COLOR_FIRE
+	light_range = LIGHT_RANGE_FIRE
+
+/obj/effect/abstract/directional_lighting
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT

code/game/objects/effects/overlays.dm

@@ -109,3 +109,48 @@
 	plane = PLANE_LIGHTING_ABOVE
 	pixel_x = -32
 	pixel_y = -32
+
+/obj/effect/overlay/vis
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	anchored = TRUE
+	vis_flags = VIS_INHERIT_DIR
+	///When detected to be unused it gets set to world.time, after a while it gets removed
+	var/unused = 0
+	///overlays which go unused for this amount of time get cleaned up
+	var/cache_expiration = 2 MINUTES
+
+/*
+/obj/effect/overlay/atmos_excited
+	name = "excited group"
+	icon = null
+	icon_state = null
+	anchored = TRUE  // should only appear in vis_contents, but to be safe
+	appearance_flags = RESET_TRANSFORM | TILE_BOUND
+	invisibility = INVISIBILITY_ABSTRACT
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+
+	plane = ATMOS_GROUP_PLANE
+*/
+
+/obj/effect/overlay/light_visible
+	name = ""
+	icon = 'icons/effects/light_overlays/light_32.dmi'
+	icon_state = "light"
+	plane = PLANE_O_LIGHTING_VISUAL
+	appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	alpha = 0
+	vis_flags = NONE
+	blocks_emissive = FALSE
+
+/obj/effect/overlay/light_cone
+	name = ""
+	icon = 'icons/effects/light_overlays/light_cone.dmi'
+	icon_state = "light"
+	plane = PLANE_O_LIGHTING_VISUAL
+	appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	vis_flags = NONE
+	alpha = 110
+	blocks_emissive = FALSE
+