Dev merge.

code/game/objects/effects/aliens.dm

@@ -164,7 +164,7 @@
 	name = "purple sac"
 	desc = "Weird purple octopus-like thing."
 	layer = 3
-	luminosity = NODERANGE
+	light_range = NODERANGE
 	var/node_range = NODERANGE
 
 /obj/effect/alien/weeds/node/New()

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

@@ -58,7 +58,7 @@
 	density = 0
 	anchored = 1
 	layer = 2
-	luminosity = 1
+	light_range = 1
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "greenglow"
 
@@ -142,4 +142,4 @@
 	layer = 2
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "mfloor1"
-	random_icon_states = list("mfloor1", "mfloor2", "mfloor3", "mfloor4", "mfloor5", "mfloor6", "mfloor7")
+	random_icon_states = list("mfloor1", "mfloor2", "mfloor3", "mfloor4", "mfloor5", "mfloor6", "mfloor7")

code/game/objects/effects/effect_system.dm

@@ -244,7 +244,7 @@ steam.start() -- spawns the effect
 /obj/effect/effect/smoke/illumination/New(var/newloc, var/brightness=15, var/lifetime=10)
 	time_to_live=lifetime
 	..()
-	SetLuminosity(brightness)
+	set_light(brightness)
 
 /////////////////////////////////////////////
 // Bad smoke

code/game/objects/effects/overlays.dm

@@ -37,7 +37,7 @@
 	name = "Bluespace"
 	icon = 'icons/turf/space.dmi'
 	icon_state = "bluespacify"
-	layer = LIGHTING_LAYER
+	layer = 10
 
 /obj/effect/overlay/wallrot
 	name = "wallrot"
@@ -51,4 +51,4 @@
 /obj/effect/overlay/wallrot/New()
 	..()
 	pixel_x += rand(-10, 10)
-	pixel_y += rand(-10, 10)
+	pixel_y += rand(-10, 10)