Dev merge.

2025-12-10 10:12:45 +00:00 · 2015-05-11 18:35:02 +09:30
parent bc50ba5166 dcdc0a4862
commit e28acd5045
182 changed files with 2647 additions and 2741 deletions
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -85,15 +85,12 @@
 #include "code\ATMOSPHERICS\components\unary\unary_base.dm"
 #include "code\ATMOSPHERICS\components\unary\vent_pump.dm"
 #include "code\ATMOSPHERICS\components\unary\vent_scrubber.dm"
-#include "code\controllers\_DynamicAreaLighting_TG.dm"
 #include "code\controllers\autotransfer.dm"
 #include "code\controllers\communications.dm"
 #include "code\controllers\configuration.dm"
 #include "code\controllers\emergency_shuttle_controller.dm"
-#include "code\controllers\failsafe.dm"
 #include "code\controllers\hooks-defs.dm"
 #include "code\controllers\hooks.dm"
-#include "code\controllers\lighting_controller.dm"
 #include "code\controllers\master_controller.dm"
 #include "code\controllers\shuttle_controller.dm"
 #include "code\controllers\subsystems.dm"
@@ -106,7 +103,6 @@
 #include "code\controllers\Processes\event.dm"
 #include "code\controllers\Processes\garbage.dm"
 #include "code\controllers\Processes\inactivity.dm"
-#include "code\controllers\Processes\lighting.dm"
 #include "code\controllers\Processes\machinery.dm"
 #include "code\controllers\Processes\mob.dm"
 #include "code\controllers\Processes\nanoui.dm"
@@ -1029,6 +1025,14 @@
 #include "code\modules\library\lib_items.dm"
 #include "code\modules\library\lib_machines.dm"
 #include "code\modules\library\lib_readme.dm"
+#include "code\modules\lighting\_lighting_defs.dm"
+#include "code\modules\lighting\light_source.dm"
+#include "code\modules\lighting\lighting_atom.dm"
+#include "code\modules\lighting\lighting_overlay.dm"
+#include "code\modules\lighting\lighting_process.dm"
+#include "code\modules\lighting\lighting_system.dm"
+#include "code\modules\lighting\lighting_turf.dm"
+#include "code\modules\lighting\~lighting_undefs.dm"
 #include "code\modules\liquid\splash_simulation.dm"
 #include "code\modules\maps\dmm_suite.dm"
 #include "code\modules\maps\reader.dm"
--- a/code/ATMOSPHERICS/components/unary/vent_pump.dm
+++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm
@@ -67,8 +67,6 @@

 	icon = null
 	initial_loc = get_area(loc)
-	if (initial_loc.master)
-		initial_loc = initial_loc.master
 	area_uid = initial_loc.uid
 	if (!id_tag)
 		assign_uid()
--- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
+++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
@@ -36,8 +36,6 @@

 	icon = null
 	initial_loc = get_area(loc)
-	if (initial_loc.master)
-		initial_loc = initial_loc.master
 	area_uid = initial_loc.uid
 	if (!id_tag)
 		assign_uid()
--- a/code/ZAS/Fire.dm
+++ b/code/ZAS/Fire.dm
@@ -91,11 +91,11 @@ turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)
 	anchored = 1
 	mouse_opacity = 0

-	//luminosity = 3
+	blend_mode = BLEND_ADD

 	icon = 'icons/effects/fire.dmi'
 	icon_state = "1"
-	l_color = "#ED9200"
+	light_color = "#ED9200"
 	layer = TURF_LAYER

 	var/firelevel = 10000 //Calculated by gas_mixture.calculate_firelevel()
@@ -114,13 +114,13 @@ turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)

 	if(firelevel > 6)
 		icon_state = "3"
-		SetLuminosity(7)
+		set_light(7, 3)
 	else if(firelevel > 2.5)
 		icon_state = "2"
-		SetLuminosity(5)
+		set_light(5, 2)
 	else
 		icon_state = "1"
-		SetLuminosity(3)
+		set_light(3, 1)

 	//im not sure how to implement a version that works for every creature so for now monkeys are firesafe
 	for(var/mob/living/L in loc)
@@ -158,6 +158,9 @@ turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)
 			else
 				enemy_tile.adjacent_fire_act(loc, air_contents, air_contents.temperature, air_contents.volume)

+	animate(src, color = heat2color(air_contents.temperature), 5)
+	set_light(l_color = color)
+
 /obj/fire/New(newLoc,fl)
 	..()

@@ -165,7 +168,11 @@ turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)
 		qdel(src)

 	set_dir(pick(cardinal))
-	SetLuminosity(3)
+	
+	var/datum/gas_mixture/air_contents = loc.return_air()
+	color = heat2color(air_contents.temperature)
+	set_light(3, 1, color)
+
 	firelevel = fl
 	air_master.active_hotspots.Add(src)

@@ -178,7 +185,7 @@ turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)

 /obj/fire/proc/RemoveFire()
 	if (istype(loc, /turf))
-		SetLuminosity(0)
+		set_light(0)

 		loc = null
 	air_master.active_hotspots.Remove(src)
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -23,7 +23,7 @@
 	var/turf/loc = get_turf(O)
 	if(loc)
 		var/area/res = loc.loc
-		.= res.master
+		.= res

 /proc/get_area_name(N) //get area by its name
 	for(var/area/A in world)
@@ -34,7 +34,7 @@
 /proc/get_area_master(const/O)
 	var/area/A = get_area(O)
 	if (isarea(A))
-		return A.master
+		return A

 /proc/in_range(source, user)
 	if(get_dist(source, user) <= 1)
@@ -69,18 +69,6 @@
 /proc/isNotAdminLevel(var/level)
 	return !isAdminLevel(level)

-//Magic constants obtained by using linear regression on right-angled triangles of sides 0<x<1, 0<y<1
-//They should approximate pythagoras theorem well enough for our needs.
-#define k1 0.934
-#define k2 0.427
-/proc/cheap_hypotenuse(Ax,Ay,Bx,By) // T is just the second atom to check distance to center with
-	var/dx = abs(Ax - Bx)	//sides of right-angled triangle
-	var/dy = abs(Ay - By)
-	if(dx>=dy)	return (k1*dx) + (k2*dy)	//No sqrt or powers :)
-	else		return (k2*dx) + (k1*dy)
-#undef k1
-#undef k2
-
 /proc/circlerange(center=usr,radius=3)

 	var/turf/centerturf = get_turf(center)
--- a/code/__HELPERS/lists.dm
+++ b/code/__HELPERS/lists.dm
@@ -182,11 +182,9 @@ proc/listclearnulls(list/list)

 //Return a list with no duplicate entries
 /proc/uniquelist(var/list/L)
-	var/list/K = list()
-	for(var/item in L)
-		if(!(item in K))
-			K += item
-	return K
+	. = list()
+	for(var/i in L)
+		. |= i

 //Mergesort: divides up the list into halves to begin the sort
 /proc/sortKey(var/list/client/L, var/order = 1)
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -125,3 +125,10 @@ Proc for attack log creation, because really why not
 		target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been [what_done] by [user ? "[user.name][(ismob(user) && user.ckey) ? "([user.ckey])" : ""]" : "NON-EXISTANT SUBJECT"][object ? " with [object]" : " "][addition]</font>")
 	if(admin)
 		log_attack("<font color='red'>[user ? "[user.name][(ismob(user) && user.ckey) ? "([user.ckey])" : ""]" : "NON-EXISTANT SUBJECT"] [what_done] [target ? "[target.name][(ismob(target) && target.ckey)? "([target.ckey])" : ""]" : "NON-EXISTANT SUBJECT"][object ? " with [object]" : " "][addition]</font>")
+
+//checks whether this item is a module of the robot it is located in.
+/proc/is_robot_module(var/obj/item/thing)
+	if (!thing || !istype(thing.loc, /mob/living/silicon/robot))
+		return 0
+	var/mob/living/silicon/robot/R = thing.loc
+	return (thing in R.module.modules)
--- a/code/controllers/_DynamicAreaLighting_TG.dm
+++ b/code/controllers/_DynamicAreaLighting_TG.dm
@@ -1,450 +0,0 @@
-/*
-	Modified DynamicAreaLighting for TGstation - Coded by Carnwennan
-
-	This is TG's 'new' lighting system. It's basically a heavily modified combination of Forum_Account's and
-	ShadowDarke's respective lighting libraries. Credits, where due, to them.
-
-	Like sd_DAL (what we used to use), it changes the shading overlays of areas by splitting each type of area into sub-areas
-	by using the var/tag variable and moving turfs into the contents list of the correct sub-area. This method is
-	much less costly than using overlays or objects.
-
-	Unlike sd_DAL however it uses a queueing system. Everytime we call a change to opacity or luminosity
-	(through SetOpacity() or SetLuminosity()) we are  simply updating variables and scheduling certain lights/turfs for an
-	update. Actual updates are handled periodically by the lighting_controller. This carries additional overheads, however it
-	means that each thing is changed only once per lighting_controller.processing_interval ticks. Allowing for greater control
-	over how much priority we'd like lighting updates to have. It also makes it possible for us to simply delay updates by
-	setting lighting_controller.processing = 0 at say, the start of a large explosion, waiting for it to finish, and then
-	turning it back on with lighting_controller.processing = 1.
-
-	Unlike our old system there are hardcoded maximum luminositys (different for certain atoms).
-	This is to cap the cost of creating lighting effects.
-	(without this, an atom with luminosity of 20 would have to update 41^2 turfs!) :s
-
-	Also, in order for the queueing system to work, each light remembers the effect it casts on each turf. This is going to
-	have larger memory requirements than our previous system but it's easily worth the hassle for the greater control we
-	gain. It also reduces cost of removing lighting effects by a lot!
-
-	Known Issues/TODO:
-		Shuttles still do not have support for dynamic lighting (I hope to fix this at some point)
-		No directional lighting support. (prototype looked ugly)
-*/
-
-#define LIGHTING_CIRCULAR 1									//comment this out to use old square lighting effects.
-#define LIGHTING_LAYER 10									//Drawing layer for lighting overlays
-#define LIGHTING_ICON 'icons/effects/ss13_dark_alpha6.dmi'	//Icon used for lighting shading effects
-
-datum/light_source
-	var/atom/owner
-	var/changed = 1
-	var/list/effect = list()
-	var/__x = 0		//x coordinate at last update
-	var/__y = 0		//y coordinate at last update
-	var/__z = 0		//z coordinate at last update
-
-	var/_l_color //do not use directly, only used as reference for updating
-	var/col_r
-	var/col_g
-	var/col_b
-
-
-	New(atom/A)
-		if(!istype(A))
-			CRASH("The first argument to the light object's constructor must be the atom that is the light source. Expected atom, received '[A]' instead.")
-		..()
-		owner = A
-		readrgb(owner.l_color)
-		__x = owner.x
-		__y = owner.y
-		__z = owner.z
-		// the lighting object maintains a list of all light sources
-		lighting_controller.lights += src
-
-
-	//Check a light to see if its effect needs reprocessing. If it does, remove any old effect and create a new one
-	proc/check()
-		if(!owner)
-			remove_effect()
-			return 1	//causes it to be removed from our list of lights. The garbage collector will then destroy it.
-
-		// check to see if we've moved since last update
-		if(owner.x != __x || owner.y != __y || owner.z != __z)
-			__x = owner.x
-			__y = owner.y
-			__z = owner.z
-			changed = 1
-
-		if (owner.l_color != _l_color)
-			readrgb(owner.l_color)
-			changed = 1
-
-		if(changed)
-			changed = 0
-			remove_effect()
-			return add_effect()
-		return 0
-
-
-	proc/remove_effect()
-		// before we apply the effect we remove the light's current effect.
-		for(var/turf/T in effect)	// negate the effect of this light source
-			T.update_lumcount(-effect[T], col_r, col_g, col_b, 1)
-		effect.Cut()					// clear the effect list
-
-	proc/add_effect()
-		// only do this if the light is turned on and is on the map
-		if(owner.loc && owner.luminosity > 0)
-			readrgb(owner.l_color)
-			effect = list()
-			for(var/turf/T in view(owner.get_light_range(),get_turf(owner)))
-				var/delta_lumen = lum(T)
-				if(delta_lumen > 0)
-					effect[T] = delta_lumen
-					T.update_lumcount(delta_lumen, col_r, col_g, col_b, 0)
-
-			return 0
-		else
-			owner.light = null
-			return 1	//cause the light to be removed from the lights list and garbage collected once it's no
-						//longer referenced by the queue
-
-	proc/lum(turf/A)
-		if (owner.trueLuminosity < 1)
-			return 0
-		var/dist
-		if(!A)
-			dist = 0
-		else
-#ifdef LIGHTING_CIRCULAR
-			dist = cheap_hypotenuse(A.x, A.y, __x, __y)
-#else
-			dist = max(abs(A.x - __x), abs(A.y - __y))
-#endif
-		if (owner.trueLuminosity > 100) // This will never happen... right?
-			return sqrt(owner.trueLuminosity) - dist
-		else
-			return sqrtTable[owner.trueLuminosity] - dist
-
-	proc/readrgb(col)
-		_l_color = col
-		if(col)
-			col_r = GetRedPart(col)
-			col_g = GetGreenPart(col)
-			col_b = GetBluePart(col)
-		else
-			col_r = null
-
-atom
-	var/datum/light_source/light
-	var/trueLuminosity = 0  // Typically 'luminosity' squared.  The builtin luminosity must remain linear.
-	                        // We may read it, but NEVER set it directly.
-	var/l_color
-
-//Turfs with opacity when they are constructed will trigger nearby lights to update
-//Turfs and atoms with luminosity when they are constructed will create a light_source automatically
-turf/New()
-	..()
-	if(luminosity)
-		if(light)	WARNING("[type] - Don't set lights up manually during New(), We do it automatically.")
-		trueLuminosity = luminosity * luminosity
-		light = new(src)
-
-//Movable atoms with opacity when they are constructed will trigger nearby lights to update
-//Movable atoms with luminosity when they are constructed will create a light_source automatically
-atom/movable/New()
-	..()
-	if(opacity)
-		if(isturf(loc))
-			if(loc:lighting_lumcount > 1)
-				UpdateAffectingLights()
-	if(luminosity)
-		if(light)	WARNING("[type] - Don't set lights up manually during New(), We do it automatically.")
-		trueLuminosity = luminosity * luminosity
-		light = new(src)
-
-//Sets our luminosity.
-//If we have no light it will create one.
-//If we are setting luminosity to 0 the light will be cleaned up by the controller and garbage collected once all its
-//queues are complete.
-//if we have a light already it is merely updated, rather than making a new one.
-atom/proc/SetLuminosity(new_luminosity, trueLum = FALSE)
-	if(new_luminosity < 0)
-		new_luminosity = 0
-	if(!trueLum)
-		new_luminosity *= new_luminosity
-	if(light)
-		if(trueLuminosity != new_luminosity)	//non-luminous lights are removed from the lights list in add_effect()
-			light.changed = 1
-	else
-		if(new_luminosity)
-			light = new(src)
-	trueLuminosity = new_luminosity
-	if (trueLuminosity < 1)
-		luminosity = 0
-	else if (trueLuminosity <= 100)
-		luminosity = sqrtTable[trueLuminosity]
-	else
-		luminosity = sqrt(trueLuminosity)
-
-atom/proc/AddLuminosity(delta_luminosity)
-	if(delta_luminosity > 0)
-		SetLuminosity(trueLuminosity + delta_luminosity*delta_luminosity, TRUE)
-	else if(delta_luminosity < 0)
-		SetLuminosity(trueLuminosity - delta_luminosity*delta_luminosity, TRUE)
-
-area/SetLuminosity(new_luminosity)			//we don't want dynamic lighting for areas
-	luminosity = !!new_luminosity
-	trueLuminosity = luminosity
-
-
-//change our opacity (defaults to toggle), and then update all lights that affect us.
-atom/proc/SetOpacity(new_opacity)
-	if(new_opacity == null)
-		new_opacity = !opacity			//default = toggle opacity
-	else if(opacity == new_opacity)
-		return 0						//opacity hasn't changed! don't bother doing anything
-	opacity = new_opacity				//update opacity, the below procs now call light updates.
-	return 1
-
-turf/SetOpacity(new_opacity)
-	if(..()==1)							//only bother if opacity changed
-		if(lighting_lumcount)			//only bother with an update if our turf is currently affected by a light
-			UpdateAffectingLights()
-
-/atom/movable/SetOpacity(new_opacity)
-	if(..()==1)							//only bother if opacity changed
-		if(isturf(loc))					//only bother with an update if we're on a turf
-			var/turf/T = loc
-			if(T.lighting_lumcount)		//only bother with an update if our turf is currently affected by a light
-				UpdateAffectingLights()
-
-
-turf
-	var/lighting_lumcount = 0
-	var/lighting_changed = 0
-	var/color_lighting_lumcount = 0
-
-	var/lumcount_r = 0
-	var/lumcount_g = 0
-	var/lumcount_b = 0
-	var/light_col_sources = 0
-
-turf/space
-	lighting_lumcount = 4		//starlight
-
-turf/proc/update_lumcount(amount, col_r, col_g, col_b, removing = 0)
-	lighting_lumcount += amount
-
-	if(!isnull(col_r)) //col_r is the "key" var, if it's null so will the rest
-		if(removing)
-			light_col_sources--
-			lumcount_r -= col_r
-			lumcount_g -= col_g
-			lumcount_b -= col_b
-		else
-			light_col_sources++
-			lumcount_r += col_r
-			lumcount_g += col_g
-			lumcount_b += col_b
-
-		if(light_col_sources)
-			var/r_avg = max(0, min(255, round(lumcount_r / light_col_sources, 16) + 15))
-			var/g_avg = max(0, min(255, round(lumcount_g / light_col_sources, 16) + 15))
-			var/b_avg = max(0, min(255, round(lumcount_b / light_col_sources, 16) + 15))
-			l_color = rgb(r_avg, g_avg, b_avg)
-		else
-			l_color = null
-
-		color_lighting_lumcount = max(color_lighting_lumcount + amount, 0) // Minimum of 0.
-
-	if(!lighting_changed)
-		lighting_controller.changed_turfs += src
-		lighting_changed = 1
-
-turf/proc/lighting_tag(const/level)
-	var/area/A = loc
-	return A.tagbase + "sd_L[level]"
-
-turf/proc/build_lighting_area(const/tag, const/level, const/color_light)
-	var/area/Area = loc
-	var/area/A = new Area.type()    // create area if it wasn't found
-	// replicate vars
-	for(var/V in Area.vars)
-		switch(V)
-			if ("contents","lighting_overlay", "color_overlay", "overlays")
-				continue
-			else
-				if(issaved(Area.vars[V])) A.vars[V] = Area.vars[V]
-
-	A.tag = tag
-	A.lighting_subarea = 1
-	A.lighting_space = 0 // in case it was copied from a space subarea
-
-	if (l_color != A.l_color)
-		A.l_color = l_color
-		//color_light = min(max(round(color_lighting_lumcount, 1), 0), lighting_controller.lighting_states)
-		//world << "[color_light] [color_lighting_lumcount]"
-
-	A.SetLightLevel(level, color_light)
-	Area.related += A
-	return A
-
-turf/proc/shift_to_subarea()
-	lighting_changed = 0
-	var/area/Area = loc
-
-	if(!istype(Area) || !Area.lighting_use_dynamic) return
-
-	var/level = min(max(round(lighting_lumcount,1),0),lighting_controller.lighting_states)
-	var/new_tag = lighting_tag(level)
-
-	// pomf - If we have a lighting color that is not null, apply the new tag to seperate the areas.
-	if (l_color)
-		// pomf - We append the (rounded!) color lighting lumcount so we can have colored lights.
-		new_tag += "[l_color][min(max(round(color_lighting_lumcount,1),0),lighting_controller.lighting_states)]"
-
-	if(Area.tag!=new_tag)	//skip if already in this area
-		var/area/A = locate(new_tag)	// find an appropriate area
-		var/color_light = min(max(round(color_lighting_lumcount,1),0),lighting_controller.lighting_states)
-
-		if (!A)
-			A = build_lighting_area(new_tag, level, color_light)
-		else if (l_color != A.l_color)
-			A.l_color = l_color
-			//color_light = min(max(round(color_lighting_lumcount, 1), 0), lighting_controller.lighting_states)
-			A.SetLightLevel(level, color_light)
-
-		A.contents += src	// move the turf into the area
-	universe.OnTurfTick(src)
-
-// Dedicated lighting sublevel for space turfs
-// helps us depower things in space, remove space fire alarms,
-// and evens out space lighting
-turf/space/lighting_tag(var/level)
-	var/area/A = loc
-	return A.tagbase + "sd_L_space"
-turf/space/build_lighting_area(var/tag,var/level)
-	var/area/A = ..(tag,4)
-	A.lighting_space = 1
-	A.SetLightLevel(4)
-	A.icon_state = null
-	return A
-
-
-area
-	var/lighting_use_dynamic = 1	//Turn this flag off to prevent sd_DynamicAreaLighting from affecting this area
-	var/image/lighting_overlay		//tracks the darkness image of the area for easy removal
-	var/lighting_subarea = 0		//tracks whether we're a lighting sub-area
-	var/lighting_space = 0			// true for space-only lighting subareas
-	var/tagbase
-	var/image/color_overlay //Tracks the color image.
-
-	proc/SetLightLevel(light, color_light = 0)
-		if(!src) return
-		if(light <= 0)
-			light = 0
-			luminosity = 0
-		else
-			if(light > lighting_controller.lighting_states)
-				light = lighting_controller.lighting_states
-			luminosity = 1
-
-		if(lighting_overlay)
-			overlays -= lighting_overlay
-			lighting_overlay.icon_state = "[light]"
-		else
-			lighting_overlay = image(LIGHTING_ICON,,num2text(light),LIGHTING_LAYER)
-
-		if (color_overlay)
-			overlays.Remove(color_overlay)
-			color_overlay.icon_state = "5"
-		else
-			if (l_color)
-				color_overlay = image('icons/effects/effects.dmi', ,"5", 10.1)
-				//color_overlay = image('icons/effects/effects.dmi', ,"white", 10.1)
-
-		if (istype(color_overlay))
-			color_overlay.color = l_color
-
-
-			switch (color_light)
-				if (6)
-					color_overlay.icon_state = "5"
-					//color_overlay.alpha = 180
-				if (5)
-					color_overlay.icon_state = "4"
-					//color_overlay.alpha = 150
-				if (4)
-					color_overlay.icon_state = "3"
-					//color_overlay.alpha = 120
-				if (3)
-					color_overlay.icon_state = "2"
-					//color_overlay.alpha = 90
-				if (2)
-					color_overlay.icon_state = "1"
-					//color_overlay.alpha = 60
-				if (1)
-					color_overlay.icon_state = "1"
-					color_overlay.alpha = 200
-					//color_overlay.alpha = 30
-				if (-INFINITY to 0)
-					//world << "Zero or below, [color_light]."
-					color_overlay.alpha = 0
-				else
-					//world << "Setting the alpha to max... color_light [color_light]."
-					color_overlay.alpha = 180
-
-			color_overlay.blend_mode = BLEND_ADD
-			if (color_overlay.color)
-				overlays.Add(color_overlay)
-
-		if (isnull(color_overlay))
-			overlays.Add(lighting_overlay)
-		else if (light < 6)
-			overlays.Add(lighting_overlay)
-
-	proc/SetDynamicLighting()
-
-		src.lighting_use_dynamic = 1
-		for(var/turf/T in src.contents)
-			T.update_lumcount(0)
-
-	proc/InitializeLighting()	//TODO: could probably improve this bit ~Carn
-		tagbase = "[type]"
-		if(!tag) tag = tagbase
-		if(!lighting_use_dynamic)
-			if(!lighting_subarea)	// see if this is a lighting subarea already
-			//show the dark overlay so areas, not yet in a lighting subarea, won't be bright as day and look silly.
-				SetLightLevel(4)
-
-//#undef LIGHTING_LAYER
-#undef LIGHTING_CIRCULAR
-//#undef LIGHTING_ICON
-
-#define LIGHTING_MAX_LUMINOSITY_STATIC	8	//Maximum luminosity to reduce lag.
-#define LIGHTING_MAX_LUMINOSITY_MOBILE	5	//Moving objects have a lower max luminosity since these update more often. (lag reduction)
-#define LIGHTING_MAX_LUMINOSITY_TURF	1	//turfs have a severely shortened range to protect from inevitable floor-lighttile spam.
-
-//set the changed status of all lights which could have possibly lit this atom.
-//We don't need to worry about lights which lit us but moved away, since they will have change status set already
-//This proc can cause lots of lights to be updated. :(
-atom/proc/UpdateAffectingLights()
-	for(var/atom/A in oview(LIGHTING_MAX_LUMINOSITY_STATIC-1,src))
-		if(A.light)
-			A.light.changed = 1			//force it to update at next process()
-
-//caps luminosity effects max-range based on what type the light's owner is.
-atom/proc/get_light_range()
-	return min(luminosity, LIGHTING_MAX_LUMINOSITY_STATIC)
-
-atom/movable/get_light_range()
-	return min(luminosity, LIGHTING_MAX_LUMINOSITY_MOBILE)
-
-obj/machinery/light/get_light_range()
-	return min(luminosity, LIGHTING_MAX_LUMINOSITY_STATIC)
-
-turf/get_light_range()
-	return min(luminosity, LIGHTING_MAX_LUMINOSITY_TURF)
-
-#undef LIGHTING_MAX_LUMINOSITY_STATIC
-#undef LIGHTING_MAX_LUMINOSITY_MOBILE
-#undef LIGHTING_MAX_LUMINOSITY_TURF
--- a/code/controllers/failsafe.dm
+++ b/code/controllers/failsafe.dm
@@ -25,7 +25,6 @@ var/datum/controller/failsafe/Failsafe
 		set background = 1
 		while(1)	//more efficient than recursivly calling ourself over and over. background = 1 ensures we do not trigger an infinite loop
 			if(!master_controller)		new /datum/controller/game_controller()	//replace the missing master_controller! This should never happen.
-			if(!lighting_controller)	new /datum/controller/lighting()		//replace the missing lighting_controller

 			if(processing)
 				if(lighting_controller.processing)
--- a/code/controllers/lighting_controller.dm
+++ b/code/controllers/lighting_controller.dm
@@ -1,130 +0,0 @@
-var/datum/controller/lighting/lighting_controller = new ()
-
-datum/controller/lighting
-	var/processing = 0
-	var/processing_interval = 5	//setting this too low will probably kill the server. Don't be silly with it!
-	var/process_cost = 0
-	var/iteration = 0
-
-	var/lighting_states = 7
-
-	var/list/lights = list()
-	var/lights_workload_max = 0
-
-//	var/list/changed_lights()		//TODO: possibly implement this to reduce on overheads?
-
-	var/list/changed_turfs = list()
-	var/changed_turfs_workload_max = 0
-
-
-datum/controller/lighting/New()
-	lighting_states = max( 0, length(icon_states(LIGHTING_ICON))-1 )
-	if(lighting_controller != src)
-		if(istype(lighting_controller,/datum/controller/lighting))
-			Recover()	//if we are replacing an existing lighting_controller (due to a crash) we attempt to preserve as much as we can
-			qdel(lighting_controller)
-		lighting_controller = src
-
-
-//Workhorse of lighting. It cycles through each light to see which ones need their effects updating. It updates their
-//effects and then processes every turf in the queue, moving the turfs to the corresponing lighting sub-area.
-//All queue lists prune themselves, which will cause lights with no luminosity to be garbage collected (cheaper and safer
-//than deleting them). Processing interval should be roughly half a second for best results.
-//By using queues we are ensuring we don't perform more updates than are necessary
-datum/controller/lighting/proc/process()
-	processing = 1
-	spawn(0)
-		set background = 1
-		while(1)
-			if(processing)
-				iteration++
-				var/started = world.timeofday
-
-				lights_workload_max = max(lights_workload_max,lights.len)
-				for(var/i=1, i<=lights.len, i++)
-					var/datum/light_source/L = lights[i]
-					if(L && !L.check())
-						continue
-					lights.Cut(i,i+1)
-					i--
-
-				sleep(-1)
-
-				changed_turfs_workload_max = max(changed_turfs_workload_max,changed_turfs.len)
-				for(var/i=1, i<=changed_turfs.len, i++)
-					var/turf/T = changed_turfs[i]
-					if(T && T.lighting_changed)
-						T.shift_to_subarea()
-				changed_turfs.Cut()		// reset the changed list
-
-				process_cost = (world.timeofday - started)
-
-			sleep(processing_interval)
-
-//same as above except it attempts to shift ALL turfs in the world regardless of lighting_changed status
-//Does not loop. Should be run prior to process() being called for the first time.
-//Note: if we get additional z-levels at runtime (e.g. if the gateway thin ever gets finished) we can initialize specific
-//z-levels with the z_level argument
-datum/controller/lighting/proc/initializeLighting(var/z_level)
-	processing = 0
-	spawn(-1)
-		set background = 1
-		for(var/i=1, i<=lights.len, i++)
-			var/datum/light_source/L = lights[i]
-			if(L.check())
-				lights.Cut(i,i+1)
-				i--
-
-		var/z_start = 1
-		var/z_finish = world.maxz
-		if(z_level)
-			z_level = round(z_level,1)
-			if(z_level > 0 && z_level <= world.maxz)
-				z_start = z_level
-				z_finish = z_level
-
-		for(var/k=z_start,k<=z_finish,k++)
-			for(var/i=1,i<=world.maxx,i++)
-				for(var/j=1,j<=world.maxy,j++)
-					var/turf/T = locate(i,j,k)
-					if(T)	T.shift_to_subarea()
-
-		changed_turfs.Cut()		// reset the changed list
-
-
-//Used to strip valid information from an existing controller and transfer it to a replacement
-//It works by using spawn(-1) to transfer the data, if there is a runtime the data does not get transfered but the loop
-//does not crash
-datum/controller/lighting/proc/Recover()
-	if(!istype(lighting_controller.changed_turfs,/list))
-		lighting_controller.changed_turfs = list()
-	if(!istype(lighting_controller.lights,/list))
-		lighting_controller.lights = list()
-
-	for(var/i=1, i<=lighting_controller.lights.len, i++)
-		var/datum/light_source/L = lighting_controller.lights[i]
-		if(istype(L))
-			spawn(-1)			//so we don't crash the loop (inefficient)
-				L.check()
-				lights += L		//If we didn't runtime then this will get transferred over
-
-	for(var/i=1, i<=lighting_controller.changed_turfs.len, i++)
-		var/turf/T = lighting_controller.changed_turfs[i]
-		if(istype(T) && T.lighting_changed)
-			spawn(-1)
-				T.shift_to_subarea()
-
-	var/msg = "## DEBUG: [time2text(world.timeofday)] lighting_controller restarted. Reports:\n"
-	for(var/varname in lighting_controller.vars)
-		switch(varname)
-			if("tag","bestF","type","parent_type","vars")	continue
-			else
-				var/varval1 = lighting_controller.vars[varname]
-				var/varval2 = vars[varname]
-				if(istype(varval1,/list))
-					varval1 = "/list([length(varval1)])"
-					varval2 = "/list([length(varval2)])"
-				msg += "\t [varname] = [varval1] -> [varval2]\n"
-	world.log << msg
-
-#undef LIGHTING_ICON
--- a/code/controllers/verbs.dm
+++ b/code/controllers/verbs.dm
@@ -30,7 +30,7 @@
 	var/tz =    input("Z? (default 1)")       as text|null
 	new map_datum(seed,tx,ty,tz)

-/client/proc/restart_controller(controller in list("Master","Failsafe","Lighting","Supply"))
+/client/proc/restart_controller(controller in list("Supply"))
 	set category = "Debug"
 	set name = "Restart Controller"
 	set desc = "Restart one of the various periodic loop controllers for the game (be careful!)"
@@ -39,13 +39,6 @@
 	usr = null
 	src = null
 	switch(controller)
-		if("Failsafe")
-			new /datum/controller/failsafe()
-			feedback_add_details("admin_verb","RFailsafe")
-		if("Lighting")
-			new /datum/controller/lighting()
-			lighting_controller.process()
-			feedback_add_details("admin_verb","RLighting")
 		if("Supply")
 			supply_controller.process()
 			feedback_add_details("admin_verb","RSupply")
@@ -62,7 +55,7 @@
 		usr.client.debug_variables(antag)
 		message_admins("Admin [key_name_admin(usr)] is debugging the [antag.role_text] template.")

-/client/proc/debug_controller(controller in list("Master","Failsafe","Ticker","Ticker Process","Lighting","Air","Jobs","Sun","Radio","Supply","Shuttles","Emergency Shuttle","Configuration","pAI", "Cameras", "Transfer Controller", "Gas Data","Event","Plants","Alarm","Nano"))
+/client/proc/debug_controller(controller in list("Master","Ticker","Ticker Process","Air","Jobs","Sun","Radio","Supply","Shuttles","Emergency Shuttle","Configuration","pAI", "Cameras", "Transfer Controller", "Gas Data","Event","Plants","Alarm","Nano"))
 	set category = "Debug"
 	set name = "Debug Controller"
 	set desc = "Debug the various periodic loop controllers for the game (be careful!)"
@@ -72,18 +65,12 @@
 		if("Master")
 			debug_variables(master_controller)
 			feedback_add_details("admin_verb","DMC")
-		if("Failsafe")
-			debug_variables(Failsafe)
-			feedback_add_details("admin_verb","DFailsafe")
 		if("Ticker")
 			debug_variables(ticker)
 			feedback_add_details("admin_verb","DTicker")
 		if("Ticker Process")
 			debug_variables(tickerProcess)
 			feedback_add_details("admin_verb","DTickerProcess")
-		if("Lighting")
-			debug_variables(lighting_controller)
-			feedback_add_details("admin_verb","DLighting")
 		if("Air")
 			debug_variables(air_master)
 			feedback_add_details("admin_verb","DAir")
--- a/code/game/area/Space
+++ b/code/game/area/Space
@@ -26,8 +26,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	icon = 'icons/turf/areas.dmi'
 	icon_state = "unknown"
 	layer = 10
+	luminosity = 1
 	mouse_opacity = 0
-	invisibility = INVISIBILITY_LIGHTING
 	var/lightswitch = 1

 	var/eject = null
@@ -48,9 +48,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	var/has_gravity = 1
 	var/list/apc = list()
 	var/no_air = null
-	var/area/master				// master area used for power calcluations
-								// (original area before splitting due to sd_DAL)
-	var/list/related			// the other areas of the same type as this
 //	var/list/lights				// list of all lights on this area
 	var/list/all_doors = list()		//Added by Strumpetplaya - Alarm Change - Contains a list of doors adjacent to this area
 	var/air_doors_activated = 0
@@ -102,7 +99,6 @@ var/list/ghostteleportlocs = list()
 	icon_state = "space"
 	requires_power = 1
 	always_unpowered = 1
-	lighting_use_dynamic = 1
 	power_light = 0
 	power_equip = 0
 	power_environ = 0
@@ -145,10 +141,8 @@ area/space/atmosalert()
 //place to another. Look at escape shuttle for example.
 //All shuttles should now be under shuttle since we have smooth-wall code.

-/area/shuttle //DO NOT TURN THE lighting_use_dynamic STUFF ON FOR SHUTTLES. IT BREAKS THINGS.
+/area/shuttle
 	requires_power = 0
-	luminosity = 1
-	lighting_use_dynamic = 0

 /area/shuttle/arrival
 	name = "\improper Arrival Shuttle"
@@ -249,15 +243,11 @@ area/space/atmosalert()
 	icon_state = "shuttle"
 	name = "\improper Alien Shuttle Base"
 	requires_power = 1
-	luminosity = 0
-	lighting_use_dynamic = 1

 /area/shuttle/alien/mine
 	icon_state = "shuttle"
 	name = "\improper Alien Shuttle Mine"
 	requires_power = 1
-	luminosity = 0
-	lighting_use_dynamic = 1

 /area/shuttle/prison/
 	name = "\improper Prison Shuttle"
@@ -343,7 +333,6 @@ area/space/atmosalert()
 	name = "start area"
 	icon_state = "start"
 	requires_power = 0
-	luminosity = 1
 	lighting_use_dynamic = 0
 	has_gravity = 1

@@ -361,6 +350,7 @@ area/space/atmosalert()
 	icon_state = "centcom"
 	requires_power = 0
 	unlimited_power = 1
+	lighting_use_dynamic = 0

 /area/centcom/control
 	name = "\improper Centcom Control"
@@ -399,6 +389,7 @@ area/space/atmosalert()
 	icon_state = "syndie-ship"
 	requires_power = 0
 	unlimited_power = 1
+	lighting_use_dynamic = 0

 /area/syndicate_mothership/control
 	name = "\improper Mercenary Control Room"
@@ -1009,7 +1000,6 @@ area/space/atmosalert()
 /area/holodeck
 	name = "\improper Holodeck"
 	icon_state = "Holodeck"
-	luminosity = 1
 	lighting_use_dynamic = 0

 /area/holodeck/alphadeck
@@ -1139,7 +1129,6 @@ area/space/atmosalert()
 /area/solar
 	requires_power = 1
 	always_unpowered = 1
-	luminosity = 1
 	lighting_use_dynamic = 0

 	auxport
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -10,50 +10,38 @@
 /area/New()
 	icon_state = ""
 	layer = 10
-	master = src //moved outside the spawn(1) to avoid runtimes in lighting.dm when it references loc.loc.master ~Carn
 	uid = ++global_uid
-	related = list(src)
 	all_areas += src

-	if(requires_power)
-		luminosity = 0
-	else
+	if(!requires_power)
 		power_light = 0			//rastaf0
 		power_equip = 0			//rastaf0
 		power_environ = 0		//rastaf0
-		luminosity = 1
-		lighting_use_dynamic = 0

 	..()

 //	spawn(15)
 	power_change()		// all machines set to current power level, also updates lighting icon
-	InitializeLighting()

 /area/proc/get_contents()
-	var/list/concat_contents = list()
-	for (var/area/RA in related)
-		concat_contents |= RA.contents
-	return concat_contents
+	return contents

 /area/proc/get_cameras()
 	var/list/cameras = list()
-	for (var/area/RA in related)
-		for (var/obj/machinery/camera/C in RA)
-			cameras += C
+	for (var/obj/machinery/camera/C in src)
+		cameras += C
 	return cameras

 /area/proc/atmosalert(danger_level, var/alarm_source)
 	if (danger_level == 0)
-		atmosphere_alarm.clearAlarm(master, alarm_source)
+		atmosphere_alarm.clearAlarm(src, alarm_source)
 	else
-		atmosphere_alarm.triggerAlarm(master, alarm_source, severity = danger_level)
+		atmosphere_alarm.triggerAlarm(src, alarm_source, severity = danger_level)

 	//Check all the alarms before lowering atmosalm. Raising is perfectly fine.
-	for (var/area/RA in related)
-		for (var/obj/machinery/alarm/AA in RA)
-			if (!(AA.stat & (NOPOWER|BROKEN)) && !AA.shorted && AA.report_danger_level)
-				danger_level = max(danger_level, AA.danger_level)
+	for (var/obj/machinery/alarm/AA in src)
+		if (!(AA.stat & (NOPOWER|BROKEN)) && !AA.shorted && AA.report_danger_level)
+			danger_level = max(danger_level, AA.danger_level)

 	if(danger_level != atmosalm)
 		if (danger_level < 1 && atmosalm >= 1)
@@ -63,17 +51,16 @@
 			air_doors_close()

 		atmosalm = danger_level
-		for(var/area/RA in related)
-			for (var/obj/machinery/alarm/AA in RA)
-				AA.update_icon()
+		for (var/obj/machinery/alarm/AA in src)
+			AA.update_icon()

 		return 1
 	return 0

 /area/proc/air_doors_close()
-	if(!src.master.air_doors_activated)
-		src.master.air_doors_activated = 1
-		for(var/obj/machinery/door/firedoor/E in src.master.all_doors)
+	if(!air_doors_activated)
+		air_doors_activated = 1
+		for(var/obj/machinery/door/firedoor/E in all_doors)
 			if(!E.blocked)
 				if(E.operating)
 					E.nextstate = CLOSED
@@ -82,9 +69,9 @@
 						E.close()

 /area/proc/air_doors_open()
-	if(src.master.air_doors_activated)
-		src.master.air_doors_activated = 0
-		for(var/obj/machinery/door/firedoor/E in src.master.all_doors)
+	if(air_doors_activated)
+		air_doors_activated = 0
+		for(var/obj/machinery/door/firedoor/E in all_doors)
 			if(!E.blocked)
 				if(E.operating)
 					E.nextstate = OPEN
@@ -95,11 +82,8 @@

 /area/proc/fire_alert()
 	if(!fire)
-		master.fire = 1	//used for firedoor checks
-		master.updateicon()
-		for(var/area/A in related)
-			A.fire = 1
-			A.updateicon()
+		fire = 1	//used for firedoor checks
+		updateicon()
 		mouse_opacity = 0
 		for(var/obj/machinery/door/firedoor/D in all_doors)
 			if(!D.blocked)
@@ -111,11 +95,8 @@

 /area/proc/fire_reset()
 	if (fire)
-		master.fire = 0	//used for firedoor checks
-		master.updateicon()
-		for(var/area/A in related)
-			A.fire = 0
-			A.updateicon()
+		fire = 0	//used for firedoor checks
+		updateicon()
 		mouse_opacity = 0
 		for(var/obj/machinery/door/firedoor/D in all_doors)
 			if(!D.blocked)
@@ -159,7 +140,7 @@
 	return

 /area/proc/updateicon()
-	if ((fire || eject || party) && (!requires_power||power_environ) && !lighting_space)//If it doesn't require power, can still activate this proc.
+	if ((fire || eject || party) && (!requires_power||power_environ) && !istype(src, /area/space))//If it doesn't require power, can still activate this proc.
 		if(fire && !eject && !party)
 			icon_state = "blue"
 		/*else if(atmosalm && !fire && !eject && !party)
@@ -183,56 +164,53 @@

 /area/proc/powered(var/chan)		// return true if the area has power to given channel

-	if(!master.requires_power)
+	if(!requires_power)
 		return 1
-	if(master.always_unpowered)
+	if(always_unpowered)
 		return 0
-	if(src.lighting_space)
-		return 0 // Nope sorry
 	switch(chan)
 		if(EQUIP)
-			return master.power_equip
+			return power_equip
 		if(LIGHT)
-			return master.power_light
+			return power_light
 		if(ENVIRON)
-			return master.power_environ
+			return power_environ

 	return 0

 // called when power status changes
 /area/proc/power_change()
-	for(var/area/RA in related)
-		for(var/obj/machinery/M in RA)	// for each machine in the area
-			M.power_change()			// reverify power status (to update icons etc.)
-		if (fire || eject || party)
-			RA.updateicon()
+	for(var/obj/machinery/M in src)	// for each machine in the area
+		M.power_change()			// reverify power status (to update icons etc.)
+	if (fire || eject || party)
+		updateicon()

 /area/proc/usage(var/chan)
 	var/used = 0
 	switch(chan)
 		if(LIGHT)
-			used += master.used_light
+			used += used_light
 		if(EQUIP)
-			used += master.used_equip
+			used += used_equip
 		if(ENVIRON)
-			used += master.used_environ
+			used += used_environ
 		if(TOTAL)
-			used += master.used_light + master.used_equip + master.used_environ
+			used += used_light + used_equip + used_environ
 	return used

 /area/proc/clear_usage()
-	master.used_equip = 0
-	master.used_light = 0
-	master.used_environ = 0
+	used_equip = 0
+	used_light = 0
+	used_environ = 0

 /area/proc/use_power(var/amount, var/chan)
 	switch(chan)
 		if(EQUIP)
-			master.used_equip += amount
+			used_equip += amount
 		if(LIGHT)
-			master.used_light += amount
+			used_light += amount
 		if(ENVIRON)
-			master.used_environ += amount
+			used_environ += amount


 var/list/mob/living/forced_ambiance_list = new
@@ -280,27 +258,23 @@ var/list/mob/living/forced_ambiance_list = new
 			L.client.played = world.time

 /area/proc/gravitychange(var/gravitystate = 0, var/area/A)
-
 	A.has_gravity = gravitystate

-	for(var/area/SubA in A.related)
-		SubA.has_gravity = gravitystate
-
-		if(gravitystate)
-			for(var/mob/living/carbon/human/M in SubA)
-				thunk(M)
-			for(var/mob/M1 in SubA)
-				M1.make_floating(0)
-		else
-			for(var/mob/M in SubA)
-				if(M.Check_Dense_Object() && istype(src,/mob/living/carbon/human/))
-					var/mob/living/carbon/human/H = src
-					if(istype(H.shoes, /obj/item/clothing/shoes/magboots) && (H.shoes.flags & NOSLIP))  //magboots + dense_object = no floaty effect
-						H.make_floating(0)
-					else
-						H.make_floating(1)
+	if(gravitystate)
+		for(var/mob/living/carbon/human/M in A)
+			thunk(M)
+		for(var/mob/M1 in A)
+			M1.make_floating(0)
+	else
+		for(var/mob/M in A)
+			if(M.Check_Dense_Object() && istype(src,/mob/living/carbon/human/))
+				var/mob/living/carbon/human/H = src
+				if(istype(H.shoes, /obj/item/clothing/shoes/magboots) && (H.shoes.flags & NOSLIP))  //magboots + dense_object = no floaty effect
+					H.make_floating(0)
 				else
-					M.make_floating(1)
+					H.make_floating(1)
+			else
+				M.make_floating(1)

 /area/proc/thunk(mob)
 	if(istype(get_turf(mob), /turf/space)) // Can't fall onto nothing.
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -11,6 +11,7 @@
 	var/pass_flags = 0
 	var/throwpass = 0
 	var/germ_level = GERM_LEVEL_AMBIENT // The higher the germ level, the more germ on the atom.
+	var/simulated = 1 //filter for actions - used by lighting overlays

 	///Chemistry.
 	var/datum/reagents/reagents = null
@@ -25,7 +26,7 @@
 /atom/Destroy()
 	. = ..()
 	density = 0
-	SetOpacity(0)
+	set_opacity(0)

 	if(reagents)
 		qdel(reagents)
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -30,15 +30,10 @@
 	..()

 /atom/movable/Destroy()
-	if(opacity)
-		if(isturf(loc))
-			if(loc:lighting_lumcount > 1)
-				UpdateAffectingLights()
+	. = ..()
+
 	loc = null

-	..()
-
-
 /atom/movable/proc/initialize()
 	return

@@ -215,4 +210,4 @@
 /atom/movable/overlay/attack_hand(a, b, c)
 	if (src.master)
 		return src.master.attack_hand(a, b, c)
-	return
+	return
--- a/code/game/gamemodes/blob/theblob.dm
+++ b/code/game/gamemodes/blob/theblob.dm
@@ -3,7 +3,7 @@
 	name = "blob"
 	icon = 'icons/mob/blob.dmi'
 	icon_state = "blob"
-	luminosity = 3
+	light_range = 3
 	desc = "Some blob creature thingy"
 	density = 1
 	opacity = 0
--- a/code/game/gamemodes/cult/cult_structures.dm
+++ b/code/game/gamemodes/cult/cult_structures.dm
@@ -22,8 +22,8 @@
 	desc = "A floating crystal that hums with an unearthly energy"
 	icon_state = "pylon"
 	var/isbroken = 0
-	luminosity = 5
-	l_color = "#3e0000"
+	light_range = 5
+	light_color = "#3e0000"
 	var/obj/item/wepon = null

 /obj/structure/cult/pylon/attack_hand(mob/M as mob)
@@ -47,7 +47,7 @@
 			isbroken = 1
 			density = 0
 			icon_state = "pylon-broken"
-			SetLuminosity(0)
+			set_light(0)
 		else
 			user << "You hit the pylon!"
 			playsound(get_turf(src), 'sound/effects/Glasshit.ogg', 75, 1)
@@ -66,13 +66,12 @@
 		isbroken = 0
 		density = 1
 		icon_state = "pylon"
-		SetLuminosity(5)
+		set_light(5)

 /obj/structure/cult/tome
 	name = "Desk"
 	desc = "A desk covered in arcane manuscripts and tomes in unknown languages. Looking at the text makes your skin crawl"
 	icon_state = "tomealtar"
-//	luminosity = 5

 //sprites for this no longer exist	-Pete
 //(they were stolen from another game anyway)
@@ -105,8 +104,8 @@
 	return

 /obj/effect/gateway/active
-	luminosity=5
-	l_color="#ff0000"
+	light_range=5
+	light_color="#ff0000"
 	spawnable=list(
 		/mob/living/simple_animal/hostile/scarybat,
 		/mob/living/simple_animal/hostile/creature,
@@ -114,8 +113,8 @@
 	)

 /obj/effect/gateway/active/cult
-	luminosity=5
-	l_color="#ff0000"
+	light_range=5
+	light_color="#ff0000"
 	spawnable=list(
 		/mob/living/simple_animal/hostile/scarybat/cult,
 		/mob/living/simple_animal/hostile/creature/cult,
--- a/code/game/gamemodes/cult/cultify/mob.dm
+++ b/code/game/gamemodes/cult/cultify/mob.dm
@@ -43,7 +43,7 @@
 			narsimage = image('icons/obj/narsie.dmi',src.loc,"narsie",9,1)
 			narsimage.mouse_opacity = 0
 		if(!narglow) //Create narglow
-			narglow = image('icons/obj/narsie.dmi',narsimage.loc,"glow-narsie",LIGHTING_LAYER+2,1)
+			narglow = image('icons/obj/narsie.dmi',narsimage.loc,"glow-narsie",12,1)
 			narglow.mouse_opacity = 0
 		//Else if no dir is given, simply send them the image of narsie
 		var/new_x = 32 * (N.x - src.x) + N.pixel_x
--- a/code/game/gamemodes/cult/hell_universe.dm
+++ b/code/game/gamemodes/cult/hell_universe.dm
@@ -54,9 +54,8 @@ In short:
 	runedec += 9000	//basically removing the rune cap

 /datum/universal_state/hell/proc/AreaSet()
-	for(var/area/ca in world)
-		var/area/A = ca.master
-		if(!istype(A,/area) || A.name=="Space")
+	for(var/area/A in world)
+		if(A.name=="Space")
 			continue

 		// Reset all alarms.
@@ -74,9 +73,8 @@ In short:
 		spess.overlays += I

 /datum/universal_state/hell/proc/AmbientSet()
-	for(var/turf/T in world)
-		if(istype(T, /turf/space))	continue
-		T.update_lumcount(1, 255, 0, 0, 0)
+	for(var/atom/movable/lighting_overlay/L in world)
+		L.update_lumcount(1, 0, 0)

 /datum/universal_state/hell/proc/MiscSet()
 	for(var/turf/simulated/floor/T in world)
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -127,6 +127,7 @@ var/list/sacrificed = list()
 					if(target.getFireLoss() < 100)
 						target.hallucination = min(target.hallucination, 500)
 					return 0
+
 				target.take_overall_damage(0, rand(5, 20)) // You dirty resister cannot handle the damage to your mind. Easily. - even cultists who accept right away should experience some effects
 				// Resist messages go!
 				if(initial_message) //don't do this stuff right away, only if they resist or hesitate.
@@ -417,6 +418,7 @@ var/list/sacrificed = list()
 			var/mob/dead/observer/ghost
 			for(var/mob/dead/observer/O in this_rune.loc)
 				if(!O.client)	continue
+				if(!O.MayRespawn()) continue
 				if(O.mind && O.mind.current && O.mind.current.stat != DEAD)	continue
 				ghost = O
 				break
--- a/code/game/gamemodes/endgame/supermatter_cascade/blob.dm
+++ b/code/game/gamemodes/endgame/supermatter_cascade/blob.dm
@@ -8,7 +8,7 @@

 	//luminosity = 5
 	//l_color="#0066FF"
-	layer = LIGHTING_LAYER+1
+	layer = 11

 	var/spawned=0 // DIR mask
 	var/next_check=0
--- a/code/game/gamemodes/endgame/supermatter_cascade/portal.dm
+++ b/code/game/gamemodes/endgame/supermatter_cascade/portal.dm
@@ -10,7 +10,7 @@
 	announce=0
 	narnar=0

-	layer=LIGHTING_LAYER+2 // ITS SO BRIGHT
+	layer=12 // ITS SO BRIGHT

 	consume_range = 6

@@ -65,7 +65,7 @@
 /mob/proc/see_rift(var/obj/singularity/narsie/large/exit/R)
 	if((R.z == src.z) && (get_dist(R,src) <= (R.consume_range+10)) && !(R in view(src)))
 		if(!riftimage)
-			riftimage = image('icons/obj/rift.dmi',src.loc,"rift",LIGHTING_LAYER+2,1)
+			riftimage = image('icons/obj/rift.dmi',src.loc,"rift",12,1)
 			riftimage.mouse_opacity = 0

 		var/new_x = 32 * (R.x - src.x) + R.pixel_x
--- a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm
+++ b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm
@@ -83,11 +83,10 @@ AUTOMATED ALERT: Link to [command_name()] lost."}
 		return

 /datum/universal_state/supermatter_cascade/proc/AreaSet()
-	for(var/area/ca in world)
-		var/area/A=ca.master
+	for(var/area/A in world)
 		if(A.z in config.admin_levels)
 			continue
-		if(!istype(A,/area) || istype(A,/area/space))
+		if(istype(A,/area/space))
 			continue

 		// Reset all alarms.
@@ -111,10 +110,9 @@ AUTOMATED ALERT: Link to [command_name()] lost."}
 		spess.overlays += "end01"

 /datum/universal_state/supermatter_cascade/proc/AmbientSet()
-	for(var/turf/T in world)
-		if(istype(T, /turf/space))	continue
-		if(!(T.z in config.admin_levels))
-			T.update_lumcount(1, 160, 255, 0, 0)
+	for(var/atom/movable/lighting_overlay/L in world)
+		if(!(L.z in config.admin_levels))
+			L.update_lumcount(0.5, 1, 0)

 /datum/universal_state/supermatter_cascade/proc/MiscSet()
 	for (var/obj/machinery/firealarm/alm in world)
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -126,8 +126,6 @@

 /obj/machinery/alarm/proc/first_run()
 	alarm_area = get_area(src)
-	if (alarm_area.master)
-		alarm_area = alarm_area.master
 	area_uid = alarm_area.uid
 	if (name == "alarm")
 		name = "[alarm_area.name] Air Alarm"
@@ -288,11 +286,10 @@


 /obj/machinery/alarm/proc/elect_master()
-	for (var/area/A in alarm_area.related)
-		for (var/obj/machinery/alarm/AA in A)
-			if (!(AA.stat & (NOPOWER|BROKEN)))
-				alarm_area.master_air_alarm = AA
-				return 1
+	for (var/obj/machinery/alarm/AA in alarm_area)
+		if (!(AA.stat & (NOPOWER|BROKEN)))
+			alarm_area.master_air_alarm = AA
+			return 1
 	return 0

 /obj/machinery/alarm/proc/get_danger_level(var/current_value, var/list/danger_levels)
@@ -399,9 +396,8 @@
 /obj/machinery/alarm/proc/apply_mode()
 	//propagate mode to other air alarms in the area
 	//TODO: make it so that players can choose between applying the new mode to the room they are in (related area) vs the entire alarm area
-	for (var/area/RA in alarm_area.related)
-		for (var/obj/machinery/alarm/AA in RA)
-			AA.mode = mode
+	for (var/obj/machinery/alarm/AA in alarm_area)
+		AA.mode = mode

 	switch(mode)
 		if(AALARM_MODE_SCRUBBING)
@@ -1026,7 +1022,6 @@ FIRE ALARM
 	var/d2
 	if (istype(user, /mob/living/carbon/human) || istype(user, /mob/living/silicon))
 		A = A.loc
-		A = A.master

 		if (A.fire)
 			d1 = text("<A href='?src=\ref[];reset=1'>Reset - Lockdown</A>", src)
@@ -1093,9 +1088,8 @@ FIRE ALARM
 	if (!( src.working ))
 		return
 	var/area/area = get_area(src)
-	for(var/area/A in area.related)
-		for(var/obj/machinery/firealarm/FA in A)
-			fire_alarm.clearAlarm(loc, FA)
+	for(var/obj/machinery/firealarm/FA in area)
+		fire_alarm.clearAlarm(loc, FA)
 	update_icon()
 	return

@@ -1103,9 +1097,8 @@ FIRE ALARM
 	if (!( src.working))
 		return
 	var/area/area = get_area(src)
-	for(var/area/A in area.related)
-		for(var/obj/machinery/firealarm/FA in A)
-			fire_alarm.triggerAlarm(loc, FA, duration)
+	for(var/obj/machinery/firealarm/FA in area)
+		fire_alarm.triggerAlarm(loc, FA, duration)
 	update_icon()
 	//playsound(src.loc, 'sound/ambience/signal.ogg', 75, 0)
 	return
@@ -1170,8 +1163,6 @@ Just a object used in constructing fire alarms
 	user.machine = src
 	var/area/A = get_area(src)
 	ASSERT(isarea(A))
-	if(A.master)
-		A = A.master
 	var/d1
 	var/d2
 	if (istype(user, /mob/living/carbon/human) || istype(user, /mob/living/silicon/ai))
@@ -1210,8 +1201,6 @@ Just a object used in constructing fire alarms
 		return
 	var/area/A = get_area(src)
 	ASSERT(isarea(A))
-	if(A.master)
-		A = A.master
 	A.partyreset()
 	return

@@ -1220,8 +1209,6 @@ Just a object used in constructing fire alarms
 		return
 	var/area/A = get_area(src)
 	ASSERT(isarea(A))
-	if(A.master)
-		A = A.master
 	A.partyalert()
 	return

--- a/code/game/machinery/atmoalter/area_atmos_computer.dm
+++ b/code/game/machinery/atmoalter/area_atmos_computer.dm
@@ -2,6 +2,7 @@
 	name = "Area Air Control"
 	desc = "A computer used to control the stationary scrubbers and pumps in the area."
 	icon_state = "area_atmos"
+	light_color = "#e6ffff"
 	circuit = "/obj/item/weapon/circuitboard/area_atmos"

 	var/list/connectedscrubbers = new()
@@ -147,14 +148,10 @@
 		var/turf/T_src = get_turf(src)
 		if(!T_src.loc) return 0
 		var/area/A_src = T_src.loc
-		if (A_src.master)
-			A_src = A_src.master

 		var/turf/T_scrub = get_turf(scrubber)
 		if(!T_scrub.loc) return 0
 		var/area/A_scrub = T_scrub.loc
-		if (A_scrub.master)
-			A_scrub = A_scrub.master

 		if(A_scrub != A_src)
 			return 0
@@ -169,13 +166,11 @@
 		var/turf/T = get_turf(src)
 		if(!T.loc) return
 		var/area/A = T.loc
-		if (A.master)
-			A = A.master
 		for(var/obj/machinery/portable_atmospherics/powered/scrubber/huge/scrubber in world )
 			var/turf/T2 = get_turf(scrubber)
 			if(T2 && T2.loc)
 				var/area/A2 = T2.loc
-				if(istype(A2) && A2.master && A2.master == A )
+				if(istype(A2) && A2 == A)
 					connectedscrubbers += scrubber
 					found = 1

@@ -183,4 +178,4 @@
 		if(!found)
 			status = "ERROR: No scrubber found!"

-		src.updateUsrDialog()
+		src.updateUsrDialog()
--- a/code/game/machinery/bots/bots.dm
+++ b/code/game/machinery/bots/bots.dm
@@ -3,7 +3,7 @@
 /obj/machinery/bot
 	icon = 'icons/obj/aibots.dmi'
 	layer = MOB_LAYER
-	luminosity = 3
+	light_range = 3
 	use_power = 0
 	var/obj/item/weapon/card/id/botcard			// the ID card that the bot "holds"
 	var/on = 1
@@ -18,12 +18,12 @@
 /obj/machinery/bot/proc/turn_on()
 	if(stat)	return 0
 	on = 1
-	SetLuminosity(initial(luminosity))
+	set_light(initial(light_range))
 	return 1

 /obj/machinery/bot/proc/turn_off()
 	on = 0
-	SetLuminosity(0)
+	set_light(0)

 /obj/machinery/bot/proc/explode()
 	qdel(src)
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -65,7 +65,7 @@
 	if(!isEmpProof())
 		if(prob(100/severity))
 			stat |= EMPED
-			SetLuminosity(0)
+			set_light(0)
 			kick_viewers()
 			triggerCameraAlarm(30 / severity)
 			update_icon()
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -174,17 +174,9 @@
 			//So clones don't die of oxyloss in a running pod.
 			if(occupant.reagents.get_reagent_amount("inaprovaline") < 30)
 				occupant.reagents.add_reagent("inaprovaline", 60)
-
-			//So clones will remain asleep for long enough to get them into cryo (Bay RP edit)
-			if(occupant.reagents.get_reagent_amount("stoxin") < 10)
-				occupant.reagents.add_reagent("stoxin", 5)
-			if(occupant.reagents.get_reagent_amount("chloralhydrate") < 1)
-				occupant.reagents.add_reagent("chloralhydrate", 1)
-
+			occupant.Sleeping(30)
 			//Also heal some oxyloss ourselves because inaprovaline is so bad at preventing it!!
 			occupant.adjustOxyLoss(-4)
-			if(notoxin)
-				occupant.adjustToxLoss(-2) // If sufficiently upgraded - remove toxin damage from chloral

 			use_power(7500) //This might need tweaking.
 			return
--- a/code/game/machinery/computer/Operating.dm
+++ b/code/game/machinery/computer/Operating.dm
@@ -5,6 +5,7 @@
 	density = 1
 	anchored = 1.0
 	icon_state = "operating"
+	light_color = "#315ab4"
 	circuit = "/obj/item/weapon/circuitboard/operating"
 	var/mob/living/carbon/human/victim = null
 	var/obj/machinery/optable/table = null
--- a/code/game/machinery/computer/RCON_Console.dm
+++ b/code/game/machinery/computer/RCON_Console.dm
@@ -9,6 +9,7 @@
 	desc = "Console used to remotely control machinery on the station."
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "ai-fixer"
+	light_color = "#a97faa"
 	circuit = /obj/item/weapon/circuitboard/rcon_console
 	req_one_access = list(access_engine)
 	var/current_tag = null
--- a/code/game/machinery/computer/aifixer.dm
+++ b/code/game/machinery/computer/aifixer.dm
@@ -2,6 +2,7 @@
 	name = "\improper AI system integrity restorer"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "ai-fixer"
+	light_color = "#a97faa"
 	circuit = /obj/item/weapon/circuitboard/aifixer
 	req_one_access = list(access_robotics, access_heads)
 	var/mob/living/silicon/ai/occupant = null
--- a/code/game/machinery/computer/atmos_alert.dm
+++ b/code/game/machinery/computer/atmos_alert.dm
@@ -9,6 +9,7 @@ var/global/list/minor_air_alarms = list()
 	desc = "Used to access the station's atmospheric sensors."
 	circuit = "/obj/item/weapon/circuitboard/atmos_alert"
 	icon_state = "alert:0"
+	light_color = "#e6ffff"

 /obj/machinery/computer/atmos_alert/New()
 	..()
--- a/code/game/machinery/computer/atmos_control.dm
+++ b/code/game/machinery/computer/atmos_control.dm
@@ -6,6 +6,7 @@
 	name = "\improper Central Atmospherics Computer"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "computer_generic"
+	light_color = "#00b000"
 	density = 1
 	anchored = 1.0
 	circuit = "/obj/item/weapon/circuitboard/atmoscontrol"
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -1,20 +1,20 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31

+/var/camera_cache_id = 1
+
 /proc/invalidateCameraCache()
-	for(var/obj/machinery/computer/security/s in machines)
-		s.camera_cache = null
-	var/datum/alarm_handler/AHandler = new /datum/alarm_handler()
-	for(var/datum/alarm/A in AHandler.alarms)
-		A.cameras = null
+	camera_cache_id = (++camera_cache_id % 999999)

 /obj/machinery/computer/security
 	name = "security camera monitor"
 	desc = "Used to access the various cameras on the station."
 	icon_state = "cameras"
+	light_color = "#a91515"
 	var/obj/machinery/camera/current = null
 	var/last_pic = 1.0
 	var/list/network
 	var/mapping = 0//For the overview file, interesting bit of code.
+	var/cache_id = 0
 	circuit = /obj/item/weapon/circuitboard/security
 	var/camera_cache = null

@@ -43,7 +43,8 @@

 		data["current"] = null

-		if(isnull(camera_cache))
+		if(camera_cache_id != cache_id)
+			cache_id = camera_cache_id
 			cameranet.process_sort()

 			var/cameras[0]
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -4,6 +4,7 @@
 	name = "\improper ID card modification console"
 	desc = "Terminal for programming NanoTrasen employee ID cards to access parts of the station."
 	icon_state = "id"
+	light_color = "#0099ff"
 	req_access = list(access_change_ids)
 	circuit = "/obj/item/weapon/circuitboard/card"
 	var/obj/item/weapon/card/id/scan = null
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -2,6 +2,7 @@
 	name = "cloning control console"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "dna"
+	light_color = "#315ab4"
 	circuit = "/obj/item/weapon/circuitboard/cloning"
 	req_access = list(access_heads) //Only used for record deletion right now.
 	var/obj/machinery/dna_scannernew/scanner = null //Linked scanner. For scanning.
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -5,6 +5,7 @@
 	name = "command and communications console"
 	desc = "Used to command and control the station. Can relay long-range communications."
 	icon_state = "comm"
+	light_color = "#0099ff"
 	req_access = list(access_heads)
 	circuit = "/obj/item/weapon/circuitboard/communications"
 	var/prints_intercept = 1
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -9,6 +9,9 @@
 	var/circuit = null //The path to the circuit board type. If circuit==null, the computer can't be disassembled.
 	var/processing = 0

+	var/light_range_on = 3
+	var/light_power_on = 1
+
 /obj/machinery/computer/initialize()
 	power_change()

@@ -86,6 +89,10 @@
 /obj/machinery/computer/power_change()
 	..()
 	update_icon()
+	if(stat & NOPOWER)
+		set_light(0)
+	else
+		set_light(light_range_on, light_power_on)


 /obj/machinery/computer/proc/set_broken()
--- a/code/game/machinery/computer/crew.dm
+++ b/code/game/machinery/computer/crew.dm
@@ -2,6 +2,7 @@
 	name = "crew monitoring computer"
 	desc = "Used to monitor active health sensors built into most of the crew's uniforms."
 	icon_state = "crew"
+	light_color = "#315ab4"
 	use_power = 1
 	idle_power_usage = 250
 	active_power_usage = 500
--- a/code/game/machinery/computer/guestpass.dm
+++ b/code/game/machinery/computer/guestpass.dm
@@ -5,6 +5,7 @@
 	name = "guest pass"
 	desc = "Allows temporary access to station areas."
 	icon_state = "guest"
+	light_color = "#0099ff"

 	var/temp_access = list() //to prevent agent cards stealing access as permanent
 	var/expiration_time = 0
@@ -186,4 +187,4 @@
 				else
 					usr << "\red Cannot issue pass without issuing ID."
 	updateUsrDialog()
-	return
+	return
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -4,6 +4,7 @@
 	name = "medical records console"
 	desc = "Used to view, edit and maintain medical records."
 	icon_state = "medcomp"
+	light_color = "#315ab4"
 	req_one_access = list(access_medical, access_forensics_lockers)
 	circuit = "/obj/item/weapon/circuitboard/med_data"
 	var/obj/item/weapon/card/id/scan = null
--- a/code/game/machinery/computer/message.dm
+++ b/code/game/machinery/computer/message.dm
@@ -4,6 +4,7 @@
 	name = "messaging monitor console"
 	desc = "Used to access and maintain data on messaging servers. Allows you to view PDA and request console messages."
 	icon_state = "comm_logs"
+	light_color = "#00b000"
 	var/hack_icon = "comm_logsc"
 	var/normal_icon = "comm_logs"
 	circuit = "/obj/item/weapon/circuitboard/message_monitor"
--- a/code/game/machinery/computer/pod.dm
+++ b/code/game/machinery/computer/pod.dm
@@ -4,6 +4,7 @@
 	name = "pod launch control console"
 	desc = "A control console for launching pods. Some people prefer firing Mechas."
 	icon_state = "computer_generic"
+	light_color = "#00b000"
 	circuit = /obj/item/weapon/circuitboard/pod
 	var/id = 1.0
 	var/obj/machinery/mass_driver/connected = null
--- a/code/game/machinery/computer/prisoner.dm
+++ b/code/game/machinery/computer/prisoner.dm
@@ -4,6 +4,7 @@
 	name = "prisoner management console"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "explosive"
+	light_color = "#a91515"
 	req_access = list(access_armory)
 	circuit = "/obj/item/weapon/circuitboard/prisoner"
 	var/id = 0.0
--- a/code/game/machinery/computer/prisonshuttle.dm
+++ b/code/game/machinery/computer/prisonshuttle.dm
@@ -14,6 +14,7 @@ var/prison_shuttle_timeleft = 0
 	name = "prison shuttle control console"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "shuttle"
+	light_color = "#00ffff"
 	req_access = list(access_security)
 	circuit = "/obj/item/weapon/circuitboard/prison_shuttle"
 	var/temp = null
@@ -233,4 +234,4 @@ var/prison_shuttle_timeleft = 0
 					pest.gib()

 				start_location.move_contents_to(end_location)
-		return
+		return
--- a/code/game/machinery/computer/robot.dm
+++ b/code/game/machinery/computer/robot.dm
@@ -5,6 +5,7 @@
 	desc = "Used to remotely lockdown or detonate linked cyborgs."
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "robot"
+	light_color = "#a97faa"
 	req_access = list(access_robotics)
 	circuit = "/obj/item/weapon/circuitboard/robotics"

--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -4,6 +4,7 @@
 	name = "security records console"
 	desc = "Used to view, edit and maintain security records"
 	icon_state = "security"
+	light_color = "#a91515"
 	req_one_access = list(access_security, access_forensics_lockers)
 	circuit = "/obj/item/weapon/circuitboard/secure_data"
 	var/obj/item/weapon/card/id/scan = null
--- a/code/game/machinery/computer/shuttle.dm
+++ b/code/game/machinery/computer/shuttle.dm
@@ -2,6 +2,7 @@
 	name = "Shuttle"
 	desc = "For shuttle control."
 	icon_state = "shuttle"
+	light_color = "#00ffff"
 	var/auth_need = 3.0
 	var/list/authorized = list(  )

--- a/code/game/machinery/computer/skills.dm
+++ b/code/game/machinery/computer/skills.dm
@@ -4,6 +4,7 @@
 	name = "employment records console"
 	desc = "Used to view, edit and maintain employment records."
 	icon_state = "medlaptop"
+	light_color = "#00b000"
 	req_one_access = list(access_heads)
 	circuit = "/obj/item/weapon/circuitboard/skills"
 	var/obj/item/weapon/card/id/scan = null
@@ -411,4 +412,4 @@ What a mess.*/
 			qdel(R)
 			continue

-	..(severity)
+	..(severity)
--- a/code/game/machinery/computer/specops_shuttle.dm
+++ b/code/game/machinery/computer/specops_shuttle.dm
@@ -15,6 +15,7 @@ var/specops_shuttle_timeleft = 0
 	name = "special operations shuttle control console"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "shuttle"
+	light_color = "#00ffff"
 	req_access = list(access_cent_specops)
 //	req_access = list(ACCESS_CENT_SPECOPS)
 	var/temp = null
--- a/code/game/machinery/computer/station_alert.dm
+++ b/code/game/machinery/computer/station_alert.dm
@@ -3,6 +3,7 @@
 	name = "Station Alert Console"
 	desc = "Used to access the station's automated alert system."
 	icon_state = "alert:0"
+	light_color = "#e6ffff"
 	circuit = /obj/item/weapon/circuitboard/stationalert_engineering
 	var/obj/nano_module/alarm_monitor/alarm_monitor
 	var/monitor_type = /obj/nano_module/alarm_monitor/engineering
--- a/code/game/machinery/computer/supply.dm
+++ b/code/game/machinery/computer/supply.dm
@@ -2,6 +2,7 @@
 	name = "supply control console"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "supply"
+	light_color = "#b88b2e"
 	req_access = list(access_cargo)
 	circuit = "/obj/item/weapon/circuitboard/supplycomp"
 	var/temp = null
--- a/code/game/machinery/computer/syndicate_specops_shuttle.dm
+++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm
@@ -14,6 +14,7 @@ var/syndicate_elite_shuttle_timeleft = 0
 	name = "elite syndicate squad shuttle control console"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "syndishuttle"
+	light_color = "#00ffff"
 	req_access = list(access_cent_specops)
 	var/temp = null
 	var/hacked = 0
@@ -256,4 +257,4 @@ var/syndicate_elite_shuttle_timeleft = 0

 	add_fingerprint(usr)
 	updateUsrDialog()
-	return
+	return
--- a/code/game/machinery/computer3/computer.dm
+++ b/code/game/machinery/computer3/computer.dm
@@ -278,8 +278,8 @@
 			chan = power_channel

 		var/area/A = get_area(loc)
-		if(istype(A) && A.master && A.master.powered(chan))
-			A.master.use_power(amount, chan)
+		if(istype(A) && A.powered(chan))
+			A.use_power(amount, chan)
 		else if(battery && battery.charge > 0)
 			battery.use(amount)

--- a/code/game/machinery/computer3/networking.dm
+++ b/code/game/machinery/computer3/networking.dm
@@ -143,10 +143,9 @@
 		if(typekey == null)
 			typekey = /obj/machinery
 		var/list/machines = list()
-		for(var/area/area in A.related)
-			for(var/obj/O in area.contents)
-				if(istype(O,typekey))
-					machines |= O
+		for(var/obj/O in A.contents)
+			if(istype(O,typekey))
+				machines |= O
 		return machines
 	verify_machine(var/obj/previous)
 		if(!previous) return 0
--- a/code/game/machinery/doors/alarmlock.dm
+++ b/code/game/machinery/doors/alarmlock.dm
@@ -34,8 +34,6 @@
 	var/alert = signal.data["alert"]

 	var/area/our_area = get_area(src)
-	if (our_area.master)
-		our_area = our_area.master

 	if(alarm_area == our_area.name)
 		switch(alert)
@@ -44,4 +42,4 @@
 				close()
 			if("minor", "clear")
 				autoclose = 0
-				open()
+				open()
--- a/code/game/machinery/doors/blast_door.dm
+++ b/code/game/machinery/doors/blast_door.dm
@@ -23,8 +23,8 @@
 	var/id = 1.0
 	dir = 1
 	explosion_resistance = 25
-	
-	//Most blast doors are infrequently toggled and sometimes used with regular doors anyways, 
+
+	//Most blast doors are infrequently toggled and sometimes used with regular doors anyways,
 	//turning this off prevents awkward zone geometry in places like medbay lobby, for example.
 	block_air_zones = 0

@@ -56,7 +56,7 @@
 	src.density = 0
 	update_nearby_tiles()
 	src.update_icon()
-	src.SetOpacity(0)
+	src.set_opacity(0)
 	sleep(15)
 	src.layer = open_layer
 	src.operating = 0
@@ -71,7 +71,7 @@
 	src.density = 1
 	update_nearby_tiles()
 	src.update_icon()
-	src.SetOpacity(initial(opacity))
+	src.set_opacity(initial(opacity))
 	sleep(15)
 	src.operating = 0

--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -35,11 +35,11 @@
 	..()

 	spawn(20)
-		for(var/obj/machinery/door/window/brigdoor/M in world)
+		for(var/obj/machinery/door/window/brigdoor/M in machines)
 			if (M.id == src.id)
 				targets += M

-		for(var/obj/machinery/flasher/F in world)
+		for(var/obj/machinery/flasher/F in machines)
 			if(F.id == src.id)
 				targets += F

@@ -345,4 +345,4 @@
 #undef FONT_SIZE
 #undef FONT_COLOR
 #undef FONT_STYLE
-#undef CHARS_PER_LINE
+#undef CHARS_PER_LINE
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -394,14 +394,14 @@

 	do_animate("opening")
 	icon_state = "door0"
-	src.SetOpacity(0)
+	set_opacity(0)
 	sleep(3)
 	src.density = 0
 	sleep(7)
 	src.layer = open_layer
 	explosion_resistance = 0
 	update_icon()
-	SetOpacity(0)
+	set_opacity(0)
 	update_nearby_tiles()
 	operating = 0

@@ -427,7 +427,7 @@
 	sleep(7)
 	update_icon()
 	if(visible && !glass)
-		SetOpacity(1)	//caaaaarn!
+		set_opacity(1)	//caaaaarn!
 	operating = 0
 	update_nearby_tiles()

--- a/code/game/machinery/floodlight.dm
+++ b/code/game/machinery/floodlight.dm
@@ -26,7 +26,7 @@
 		else
 			on = 0
 			updateicon()
-			SetLuminosity(0)
+			set_light(0)
 			src.visible_message("<span class='warning'>[src] shuts down due to lack of power!</span>")
 			return

@@ -50,7 +50,7 @@
 	if(on)
 		on = 0
 		user << "\blue You turn off the light"
-		SetLuminosity(0)
+		set_light(0)
 	else
 		if(!cell)
 			return
@@ -58,7 +58,7 @@
 			return
 		on = 1
 		user << "\blue You turn on the light"
-		SetLuminosity(brightness_on)
+		set_light(brightness_on)

 	updateicon()

--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -37,7 +37,7 @@ var/const/HOLOPAD_MODE = RANGE_BASED
 	icon_state = "holopad0"

 	layer = TURF_LAYER+0.1 //Preventing mice and drones from sneaking under them.
-	
+
 	var/power_per_hologram = 500 //per usage per hologram
 	idle_power_usage = 5
 	use_power = 1
@@ -120,10 +120,10 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 	hologram.layer = FLY_LAYER//Above all the other objects/mobs. Or the vast majority of them.
 	hologram.anchored = 1//So space wind cannot drag it.
 	hologram.name = "[A.name] (Hologram)"//If someone decides to right click.
-	hologram.SetLuminosity(2)	//hologram lighting
+	hologram.set_light(2)	//hologram lighting
 	hologram.color = color //painted holopad gives coloured holograms
 	masters[A] = hologram
-	SetLuminosity(2)			//pad lighting
+	set_light(2)			//pad lighting
 	icon_state = "holopad1"
 	A.holo = src
 	return 1
@@ -134,7 +134,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 	qdel(masters[user])//Get rid of user's hologram
 	masters -= user //Discard AI from the list of those who use holopad
 	if (!masters.len)//If no users left
-		SetLuminosity(0)			//pad lighting (hologram lighting will be handled automatically since its owner was deleted)
+		set_light(0)			//pad lighting (hologram lighting will be handled automatically since its owner was deleted)
 		icon_state = "holopad0"
 	return 1

@@ -144,16 +144,15 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 		if((stat & NOPOWER) || !active_ai)
 			clear_holo(master)
 			continue
-		
+
 		if((HOLOPAD_MODE == RANGE_BASED && (get_dist(master.eyeobj, src) > holo_range)))
 			clear_holo(master)
 			continue
-		
+
 		if(HOLOPAD_MODE == AREA_BASED)
 			var/area/holo_area = get_area(src)
 			var/area/eye_area = get_area(master.eyeobj)
-			
-			if(!(eye_area in holo_area.master.related))
+			if(eye_area != holo_area)
 				clear_holo(master)
 				continue

--- a/code/game/machinery/jukebox.dm
+++ b/code/game/machinery/jukebox.dm
@@ -188,11 +188,10 @@ datum/track/New(var/title_name, var/audio)
 /obj/machinery/media/jukebox/proc/StopPlaying()
 	var/area/main_area = get_area(src)
 	// Always kill the current sound
-	for(var/area/related_area in main_area.related)
-		for(var/mob/living/M in mobs_in_area(related_area))
-			M << sound(null, channel = 1)
+	for(var/mob/living/M in mobs_in_area(main_area))
+		M << sound(null, channel = 1)

-		related_area.forced_ambience = null
+		main_area.forced_ambience = null
 	playing = 0
 	update_use_power(1)
 	update_icon()
@@ -204,12 +203,10 @@ datum/track/New(var/title_name, var/audio)
 		return

 	var/area/main_area = get_area(src)
-	for(var/area/related_area in main_area.related)
-		related_area.forced_ambience = list(current_track.sound)
-
-		for(var/mob/living/M in mobs_in_area(related_area))
-			if(M.mind)
-				related_area.play_ambience(M)
+	main_area.forced_ambience = list(current_track.sound)
+	for(var/mob/living/M in mobs_in_area(main_area))
+		if(M.mind)
+			main_area.play_ambience(M)

 	playing = 1
 	update_use_power(2)
--- a/code/game/machinery/lightswitch.dm
+++ b/code/game/machinery/lightswitch.dm
@@ -42,15 +42,14 @@

 	on = !on

-	for(var/area/A in area.master.related)
-		A.lightswitch = on
-		A.updateicon()
+	area.lightswitch = on
+	area.updateicon()

-		for(var/obj/machinery/light_switch/L in A)
-			L.on = on
-			L.updateicon()
+	for(var/obj/machinery/light_switch/L in area)
+		L.on = on
+		L.updateicon()

-	area.master.power_change()
+	area.power_change()

 /obj/machinery/light_switch/power_change()

--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -264,8 +264,8 @@ Class Procs:
 	s.start()
 	if (electrocute_mob(user, get_area(src), src, 0.7))
 		var/area/temp_area = get_area(src)
-		if(temp_area && temp_area.master)
-			var/obj/machinery/power/apc/temp_apc = temp_area.master.get_apc()
+		if(temp_area)
+			var/obj/machinery/power/apc/temp_apc = temp_area.get_apc()

 			if(temp_apc && temp_apc.terminal && temp_apc.terminal.powernet)
 				temp_apc.terminal.powernet.trigger_warning()
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -164,7 +164,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
 	var/c_locked=0;        //Will our new channel be locked to public submissions?
 	var/hitstaken = 0      //Death at 3 hits from an item with force>=15
 	var/datum/feed_channel/viewing_channel = null
-	luminosity = 0
+	light_range = 0
 	anchored = 1


--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -54,7 +54,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 	var/message = "";
 	var/dpt = ""; //the department which will be receiving the message
 	var/priority = -1 ; //Priority of the message being sent
-	luminosity = 0
+	light_range = 0
 	var/datum/announcement/announcement = new

 /obj/machinery/requests_console/power_change()
@@ -176,7 +176,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 					if (Console.department == department)
 						Console.newmessagepriority = 0
 						Console.icon_state = "req_comp0"
-						Console.luminosity = 1
+						Console.set_light(1)
 				newmessagepriority = 0
 				icon_state = "req_comp0"
 				for(var/msg in messages)
@@ -320,7 +320,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 								Console.messages += "<B>Message from <A href='?src=\ref[Console];write=[ckey(department)]'>[department]</A></FONT></B><BR>[message]"

 						screen = 6
-						Console.luminosity = 2
+						Console.set_light(2)
 				messages += "<B>Message sent to [dpt]</B><BR>[message]"
 			else
 				for (var/mob/O in hearers(4, src.loc))
--- a/code/game/machinery/turret_control.dm
+++ b/code/game/machinery/turret_control.dm
@@ -46,12 +46,11 @@

 /obj/machinery/turretid/initialize()
 	if(!control_area)
-		var/area/CA = get_area(src)
-		control_area = CA.master
+		control_area = get_area(src)
 	else if(istext(control_area))
 		for(var/area/A in world)
 			if(A.name && A.name==control_area)
-				control_area = A.master
+				control_area = A
 				break

 	if(control_area)
@@ -178,9 +177,8 @@
 	TC.ailock = ailock

 	if(istype(control_area))
-		for(var/area/sub_area in control_area.related)
-			for (var/obj/machinery/porta_turret/aTurret in sub_area)
-				aTurret.setState(TC)
+		for (var/obj/machinery/porta_turret/aTurret in control_area)
+			aTurret.setState(TC)

 	update_icon()

--- a/code/game/machinery/turrets.dm
+++ b/code/game/machinery/turrets.dm
@@ -13,9 +13,6 @@

 /area/turret_protected/Entered(O)
 	..()
-	if( master && master != src )
-		return master.Entered(O)
-
 	if( iscarbon(O) )
 		turretTargets |= O
 	else if( istype(O, /obj/mecha) )
@@ -27,9 +24,6 @@
 	return 1

 /area/turret_protected/Exited(O)
-	if( master && master != src )
-		return master.Exited(O)
-
 	if( ismob(O) && !issilicon(O) )
 		turretTargets -= O
 	else if( istype(O, /obj/mecha) )
@@ -148,8 +142,6 @@
 /obj/machinery/turret/proc/get_protected_area()
 	var/area/turret_protected/TP = get_area(src)
 	if(istype(TP))
-		if(TP.master && TP.master != TP)
-			TP = TP.master
 		return TP
 	return

--- a/code/game/mecha/equipment/tools/tools.dm
+++ b/code/game/mecha/equipment/tools/tools.dm
@@ -778,7 +778,7 @@
 		var/pow_chan
 		if(A)
 			for(var/c in use_channels)
-				if(A.master && A.master.powered(c))
+				if(A.powered(c))
 					pow_chan = c
 					break
 		return pow_chan
@@ -825,13 +825,13 @@
 			if(A)
 				var/pow_chan
 				for(var/c in list(EQUIP,ENVIRON,LIGHT))
-					if(A.master.powered(c))
+					if(A.powered(c))
 						pow_chan = c
 						break
 				if(pow_chan)
 					var/delta = min(12, ER.chassis.cell.maxcharge-cur_charge)
 					ER.chassis.give_power(delta)
-					A.master.use_power(delta*ER.coeff, pow_chan)
+					A.use_power(delta*ER.coeff, pow_chan)
 		return


--- a/code/game/mecha/mech_bay.dm
+++ b/code/game/mecha/mech_bay.dm
@@ -139,6 +139,7 @@
 	anchored = 1
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "recharge_comp"
+	light_color = "#a97faa"
 	circuit = "/obj/item/weapon/circuitboard/mech_bay_power_console"
 	var/autostart = 1
 	var/voltage = 45
@@ -214,4 +215,4 @@
 		// open the new ui window
 		ui.open()
 		// auto update every Master Controller tick
-		ui.set_auto_update(1)
+		ui.set_auto_update(1)
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -1004,8 +1004,8 @@
 	set popup_menu = 0
 	if(usr!=occupant)	return
 	lights = !lights
-	if(lights)	SetLuminosity(luminosity + lights_power)
-	else		SetLuminosity(luminosity - lights_power)
+	if(lights)	set_light(light_range + lights_power)
+	else		set_light(light_range - lights_power)
 	src.occupant_message("Toggled lights [lights?"on":"off"].")
 	log_message("Toggled lights [lights?"on":"off"].")
 	return
--- a/code/game/mecha/mecha_control_console.dm
+++ b/code/game/mecha/mecha_control_console.dm
@@ -2,6 +2,7 @@
 	name = "Exosuit Control"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "mecha"
+	light_color = "#a97faa"
 	req_access = list(access_robotics)
 	circuit = "/obj/item/weapon/circuitboard/mecha_control"
 	var/list/located = list()
--- a/code/game/objects/effects/aliens.dm
+++ b/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()
--- a/code/game/objects/effects/decals/Cleanable/misc.dm
+++ b/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")
--- a/code/game/objects/effects/effect_system.dm
+++ b/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
--- a/code/game/objects/effects/overlays.dm
+++ b/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)
--- a/code/game/objects/explosion.dm
+++ b/code/game/objects/explosion.dm
@@ -68,8 +68,8 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa
 			message_admins("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range]) in area [epicenter.loc.name] ([epicenter.x],[epicenter.y],[epicenter.z]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[epicenter.x];Y=[epicenter.y];Z=[epicenter.z]'>JMP</a>)")
 			log_game("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range]) in area [epicenter.loc.name] ")

-		var/lighting_controller_was_processing = lighting_controller.processing	//Pause the lighting updates for a bit
-		lighting_controller.processing = 0
+//		var/lighting_controller_was_processing = lighting_controller.processing	//Pause the lighting updates for a bit
+//		lighting_controller.processing = 0


 		var/approximate_intensity = (devastation_range * 3) + (heavy_impact_range * 2) + light_impact_range
@@ -87,8 +87,8 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa
 		var/y0 = epicenter.y
 		var/z0 = epicenter.z

-		for(var/turf/T in range(epicenter, max_range))
-			var/dist = cheap_pythag(T.x - x0,T.y - y0)
+		for(var/turf/T in trange(max_range, epicenter))
+			var/dist = sqrt((T.x - x0)**2 + (T.y - y0)**2)

 			if(dist < devastation_range)		dist = 1
 			else if(dist < heavy_impact_range)	dist = 2
@@ -99,7 +99,7 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa
 			if(T)
 				for(var/atom_movable in T.contents)	//bypass type checking since only atom/movable can be contained by turfs anyway
 					var/atom/movable/AM = atom_movable
-					if(AM)	AM.ex_act(dist)
+					if(AM && AM.simulated)	AM.ex_act(dist)

 		var/took = (world.timeofday-start)/10
 		//You need to press the DebugGame verb to see these now....they were getting annoying and we've collected a fair bit of data. Just -test- changes  to explosion code using this please so we can compare
@@ -113,7 +113,7 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa

 		sleep(8)

-		if(!lighting_controller.processing)	lighting_controller.processing = lighting_controller_was_processing
+//		if(!lighting_controller.processing)	lighting_controller.processing = lighting_controller_was_processing
 		if(!powernet_rebuild_was_deferred_already && defer_powernet_rebuild)
 			makepowernets()
 			defer_powernet_rebuild = 0
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -76,7 +76,6 @@ move an amendment</a> to the drawing.</p>
 /obj/item/blueprints/proc/get_area()
 	var/turf/T = get_turf(usr)
 	var/area/A = T.loc
-	A = A.master
 	return A

 /obj/item/blueprints/proc/get_area_type(var/area/A = get_area())
@@ -122,7 +121,6 @@ move an amendment</a> to the drawing.</p>
 		return
 	var/area/A = new
 	A.name = str
-	A.tagbase = "[A.type]_[md5(str)]" // without this dynamic light system ruin everithing
 	//var/ma
 	//ma = A.master ? "[A.master]" : "(null)"
 	//world << "DEBUG: create_area: <br>A.name=[A.name]<br>A.tag=[A.tag]<br>A.master=[ma]"
@@ -133,9 +131,6 @@ move an amendment</a> to the drawing.</p>
 	move_turfs_to_area(turfs, A)

 	A.always_unpowered = 0
-	for(var/turf/T in A.contents)
-		T.lighting_changed = 1
-		lighting_controller.changed_turfs += T

 	spawn(5)
 		//ma = A.master ? "[A.master]" : "(null)"
@@ -161,8 +156,7 @@ move an amendment</a> to the drawing.</p>
 		usr << "\red Text too long."
 		return
 	set_area_machinery_title(A,str,prevname)
-	for(var/area/RA in A.related)
-		RA.name = str
+	A.name = str
 	usr << "\blue You set the area '[prevname]' title to '[str]'."
 	interact()
 	return
@@ -172,17 +166,17 @@ move an amendment</a> to the drawing.</p>
 /obj/item/blueprints/proc/set_area_machinery_title(var/area/A,var/title,var/oldtitle)
 	if (!oldtitle) // or replacetext goes to infinite loop
 		return
-	for(var/area/RA in A.related)
-		for(var/obj/machinery/alarm/M in RA)
-			M.name = replacetext(M.name,oldtitle,title)
-		for(var/obj/machinery/power/apc/M in RA)
-			M.name = replacetext(M.name,oldtitle,title)
-		for(var/obj/machinery/atmospherics/unary/vent_scrubber/M in RA)
-			M.name = replacetext(M.name,oldtitle,title)
-		for(var/obj/machinery/atmospherics/unary/vent_pump/M in RA)
-			M.name = replacetext(M.name,oldtitle,title)
-		for(var/obj/machinery/door/M in RA)
-			M.name = replacetext(M.name,oldtitle,title)
+
+	for(var/obj/machinery/alarm/M in A)
+		M.name = replacetext(M.name,oldtitle,title)
+	for(var/obj/machinery/power/apc/M in A)
+		M.name = replacetext(M.name,oldtitle,title)
+	for(var/obj/machinery/atmospherics/unary/vent_scrubber/M in A)
+		M.name = replacetext(M.name,oldtitle,title)
+	for(var/obj/machinery/atmospherics/unary/vent_pump/M in A)
+		M.name = replacetext(M.name,oldtitle,title)
+	for(var/obj/machinery/door/M in A)
+		M.name = replacetext(M.name,oldtitle,title)
 	//TODO: much much more. Unnamed airlocks, cameras, etc.

 /obj/item/blueprints/proc/check_tile_is_border(var/turf/T2,var/dir)
@@ -243,4 +237,4 @@ move an amendment</a> to the drawing.</p>
 				if(BORDER_SPACE)
 					return ROOM_ERR_SPACE
 		found+=T
-	return found
+	return found
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -308,15 +308,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
 /*
 *	The Actual PDA
 */
-/obj/item/device/pda/pickup(mob/user)
-	if(fon)
-		SetLuminosity(0)
-		user.SetLuminosity(user.luminosity + f_lum)
-
-/obj/item/device/pda/dropped(mob/user)
-	if(fon)
-		user.SetLuminosity(user.luminosity - f_lum)
-		SetLuminosity(f_lum)

 /obj/item/device/pda/New()
 	..()
@@ -644,12 +635,10 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		if("Light")
 			if(fon)
 				fon = 0
-				if(src in U.contents)	U.SetLuminosity(U.luminosity - f_lum)
-				else					SetLuminosity(0)
+				set_light(0)
 			else
 				fon = 1
-				if(src in U.contents)	U.SetLuminosity(U.luminosity + f_lum)
-				else					SetLuminosity(f_lum)
+				set_light(f_lum)
 		if("Medical Scan")
 			if(scanmode == 1)
 				scanmode = 0
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -18,24 +18,17 @@
 	..()
 	if(on)
 		icon_state = "[initial(icon_state)]-on"
-		SetLuminosity(brightness_on)
+		set_light(brightness_on)
 	else
 		icon_state = initial(icon_state)
-		SetLuminosity(0)
+		set_light(0)

 /obj/item/device/flashlight/proc/update_brightness(var/mob/user = null)
 	if(on)
 		icon_state = "[initial(icon_state)]-on"
-		if(loc == user)
-			user.SetLuminosity(user.luminosity + brightness_on)
-		else if(isturf(loc))
-			SetLuminosity(brightness_on)
+		set_light(brightness_on)
 	else
-		icon_state = initial(icon_state)
-		if(loc == user)
-			user.SetLuminosity(user.luminosity - brightness_on)
-		else if(isturf(loc))
-			SetLuminosity(0)
+		set_light(0)

 /obj/item/device/flashlight/attack_self(mob/user)
 	if(!isturf(user.loc))
@@ -88,19 +81,6 @@
 	else
 		return ..()

-
-/obj/item/device/flashlight/pickup(mob/user)
-	if(on)
-		user.SetLuminosity(user.luminosity + brightness_on)
-		SetLuminosity(0)
-
-
-/obj/item/device/flashlight/dropped(mob/user)
-	if(on)
-		user.SetLuminosity(user.luminosity - brightness_on)
-		SetLuminosity(brightness_on)
-
-
 /obj/item/device/flashlight/pen
 	name = "penlight"
 	desc = "A pen-sized light, used by medical staff."
@@ -217,7 +197,7 @@
 	on = 1 //Bio-luminesence has one setting, on.

 /obj/item/device/flashlight/slime/New()
-	SetLuminosity(brightness_on)
+	set_light(brightness_on)
 	spawn(1) //Might be sloppy, but seems to be necessary to prevent further runtimes and make these work as intended... don't judge me!
 		update_brightness()
 		icon_state = initial(icon_state)
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -140,7 +140,9 @@
 				var/obj/item/weapon/light/L1 = new target.light_type(target.loc)
 				L1.status = target.status
 				L1.rigged = target.rigged
-				L1.brightness = target.brightness
+				L1.brightness_range = target.brightness_range
+				L1.brightness_power = target.brightness_power
+				L1.brightness_color = target.brightness_color
 				L1.switchcount = target.switchcount
 				target.switchcount = 0
 				L1.update()
@@ -153,7 +155,9 @@
 			target.status = L2.status
 			target.switchcount = L2.switchcount
 			target.rigged = emagged
-			target.brightness = L2.brightness
+			target.brightness_range = L2.brightness_range
+			target.brightness_power = L2.brightness_power
+			target.brightness_color = L2.brightness_color
 			target.on = target.has_power()
 			target.update()
 			qdel(L2)
--- a/code/game/objects/items/devices/powersink.dm
+++ b/code/game/objects/items/devices/powersink.dm
@@ -52,7 +52,7 @@
 			anchored = 0
 			mode = 0
 			src.visible_message("<span class='notice'>[user] detaches [src] from the cable!</span>")
-			SetLuminosity(0)
+			set_light(0)
 			icon_state = "powersink0"

 			return
@@ -74,7 +74,7 @@
 		if(2)  //This switch option wasn't originally included. It exists now. --NeoFite
 			src.visible_message("<span class='notice'>[user] deactivates [src]!</span>")
 			mode = 1
-			SetLuminosity(0)
+			set_light(0)
 			icon_state = "powersink0"
 			processing_objects.Remove(src)

@@ -91,7 +91,7 @@
 	if(!PN)
 		return

-	SetLuminosity(12)
+	set_light(12)
 	PN.trigger_warning()
 	// found a powernet, so drain up to max power from it
 	drained = PN.draw_power(drain_rate)
@@ -124,4 +124,4 @@
 	if(attached && attached.powernet)
 		PN = attached.powernet
 	else
-		PN = null
+		PN = null
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -58,10 +58,10 @@
 			on = 0
 		else
 			var/area/A = src.loc.loc
-			if(!A || !isarea(A) || !A.master)
+			if(!A || !isarea(A))
 				on = 0
 			else
-				on = A.master.powered(EQUIP) // set "on" to the power status
+				on = A.powered(EQUIP) // set "on" to the power status

 		if(!on)
 			icon_state = "intercom-p"
--- a/code/game/objects/items/weapons/candle.dm
+++ b/code/game/objects/items/weapons/candle.dm
@@ -48,7 +48,7 @@
 		//src.damtype = "fire"
 		for(var/mob/O in viewers(usr, null))
 			O.show_message(flavor_text, 1)
-		SetLuminosity(CANDLE_LUM)
+		set_light(CANDLE_LUM)
 		processing_objects.Add(src)


@@ -66,22 +66,8 @@
 		var/turf/T = loc
 		T.hotspot_expose(700, 5)

-
 /obj/item/weapon/flame/candle/attack_self(mob/user as mob)
 	if(lit)
 		lit = 0
 		update_icon()
-		SetLuminosity(0)
-		user.SetLuminosity(user.luminosity - CANDLE_LUM)
-
-
-/obj/item/weapon/flame/candle/pickup(mob/user)
-	if(lit)
-		SetLuminosity(0)
-		user.SetLuminosity(user.luminosity + CANDLE_LUM)
-
-
-/obj/item/weapon/flame/candle/dropped(mob/user)
-	if(lit)
-		user.SetLuminosity(user.luminosity - CANDLE_LUM)
-		SetLuminosity(CANDLE_LUM)
+		set_light(0)
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -176,7 +176,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			M.update_inv_l_hand(0)
 			M.update_inv_r_hand(1)
 		processing_objects.Remove(src)
-
+
 /obj/item/clothing/mask/smokable/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	..()
 	if(isflamesource(W))
@@ -221,7 +221,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	if(istype(W, /obj/item/weapon/melee/energy/sword))
 		var/obj/item/weapon/melee/energy/sword/S = W
 		if(S.active)
-			light("<span class='warning'>[user] swings their [W], barely missing their nose. They light their [name] in the process.</span>")
+			light("<span class='warning'>[user] swings their [W], barely missing their nose. They light their [name] in the process.</span>")

 	return

@@ -456,7 +456,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 						user.apply_damage(2,BURN,"r_hand")
 					user.visible_message("<span class='notice'>After a few attempts, [user] manages to light the [src], they however burn their finger in the process.</span>")

-			user.SetLuminosity(user.luminosity + 2)
+			set_light(2)
 			processing_objects.Add(src)
 		else
 			lit = 0
@@ -467,7 +467,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			else
 				user.visible_message("<span class='notice'>[user] quietly shuts off the [src].")

-			user.SetLuminosity(user.luminosity - 2)
+			set_light(0)
 			processing_objects.Remove(src)
 	else
 		return ..()
@@ -496,17 +496,3 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	if(location)
 		location.hotspot_expose(700, 5)
 	return
-
-
-/obj/item/weapon/flame/lighter/pickup(mob/user)
-	if(lit)
-		SetLuminosity(0)
-		user.SetLuminosity(user.luminosity+2)
-	return
-
-
-/obj/item/weapon/flame/lighter/dropped(mob/user)
-	if(lit)
-		user.SetLuminosity(user.luminosity-2)
-		SetLuminosity(2)
-	return
--- a/code/game/objects/items/weapons/implants/implanter.dm
+++ b/code/game/objects/items/weapons/implants/implanter.dm
@@ -32,9 +32,7 @@
 				for (var/mob/O in viewers(M, null))
 					O.show_message("\red [M] has been implanted by [user].", 1)

-				M.attack_log += text("\[[time_stamp()]\] <font color='orange'> Implanted with [src.name] ([src.imp.name])  by [user.name] ([user.ckey])</font>")
-				user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] ([src.imp.name]) to implant [M.name] ([M.ckey])</font>")
-				msg_admin_attack("[user.name] ([user.ckey]) implanted [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+				admin_attack_log(user, M, "Implanted using \the [src.name] ([src.imp.name])", "Implanted with \the [src.name] ([src.imp.name])", "used an implanter, [src.name] ([src.imp.name]), on")

 				user.show_message("\red You implanted the implant into [M].")
 				if(src.imp.implanted(M))
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -7,8 +7,6 @@
 	var/list/climbers = list()

 /obj/structure/Destroy()
-	if(opacity)
-		UpdateAffectingLights()
 	if(parts)
 		new parts(loc)
 	..()
--- a/code/game/objects/structures/curtains.dm
+++ b/code/game/objects/structures/curtains.dm
@@ -1,5 +1,5 @@
-#define SHOWER_OPEN_LAYER MOB_LAYER + 0.1
-#define SHOWER_CLOSED_LAYER OBJ_LAYER + 0.4
+#define SHOWER_OPEN_LAYER OBJ_LAYER + 0.4
+#define SHOWER_CLOSED_LAYER MOB_LAYER + 0.1

 /obj/structure/curtain
 	name = "curtain"
--- a/code/game/objects/structures/mineral_doors.dm
+++ b/code/game/objects/structures/mineral_doors.dm
@@ -154,7 +154,7 @@
 /obj/structure/mineral_door/uranium
 	mineralType = "uranium"
 	hardness = 3
-	luminosity = 2
+	light_range = 2

 /obj/structure/mineral_door/sandstone
 	mineralType = "sandstone"
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -479,10 +479,10 @@
 /obj/structure/window/reinforced/polarized/proc/toggle()
 	if(opacity)
 		animate(src, color="#FFFFFF", time=5)
-		SetOpacity(0)
+		set_opacity(0)
 	else
 		animate(src, color="#222222", time=5)
-		SetOpacity(1)
+		set_opacity(1)



--- a/code/game/response_team.dm
+++ b/code/game/response_team.dm
@@ -37,10 +37,12 @@ var/can_call_ert
 	log_admin("[key_name(usr)] used Dispatch Response Team.")
 	trigger_armed_response_team(1)

-
 client/verb/JoinResponseTeam()
 	set category = "IC"

+	if(!MayRespawn(1))
+		return
+
 	if(istype(usr,/mob/dead/observer) || istype(usr,/mob/new_player))
 		if(!send_emergency_team)
 			usr << "No emergency response team is currently being sent."
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -26,18 +26,14 @@ var/list/mechtoys = list(
 /obj/item/weapon/paper/manifest
 	name = "supply manifest"

-/area/supply/station //DO NOT TURN THE lighting_use_dynamic STUFF ON FOR SHUTTLES. IT BREAKS THINGS.
+/area/supply/station
 	name = "Supply Shuttle"
 	icon_state = "shuttle3"
-	luminosity = 1
-	lighting_use_dynamic = 0
 	requires_power = 0

-/area/supply/dock //DO NOT TURN THE lighting_use_dynamic STUFF ON FOR SHUTTLES. IT BREAKS THINGS.
+/area/supply/dock
 	name = "Supply Shuttle"
 	icon_state = "shuttle3"
-	luminosity = 1
-	lighting_use_dynamic = 0
 	requires_power = 0

 /obj/structure/plasticflaps //HOW DO YOU CALL THOSE THINGS ANYWAY
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -133,19 +133,19 @@ turf/simulated/floor/proc/update_icon()
 			switch(get_lightfloor_state())
 				if(LIGHTFLOOR_STATE_OK)
 					icon_state = "light_on"
-					SetLuminosity(5)
+					set_light(5)
 				if(LIGHTFLOOR_STATE_FLICKER)
 					var/num = pick("1","2","3","4")
 					icon_state = "light_on_flicker[num]"
-					SetLuminosity(5)
+					set_light(5)
 				if(LIGHTFLOOR_STATE_BREAKING)
 					icon_state = "light_on_broken"
-					SetLuminosity(5)
+					set_light(5)
 				if(LIGHTFLOOR_STATE_BROKEN)
 					icon_state = "light_off"
-					SetLuminosity(0)
+					set_light(0)
 		else
-			SetLuminosity(0)
+			set_light(0)
 			icon_state = "light_off"
 	else if(is_grass_floor())
 		if(!broken && !burnt)
@@ -339,7 +339,7 @@ turf/simulated/floor/proc/update_icon()

 	if(!floor_type) return
 	icon_plating = "plating"
-	SetLuminosity(0)
+	set_light(0)
 	floor_type = null
 	intact = 0
 	broken = 0
@@ -355,7 +355,7 @@ turf/simulated/floor/proc/update_icon()
 	broken = 0
 	burnt = 0
 	intact = 1
-	SetLuminosity(0)
+	set_light(0)
 	if(T)
 		if(istype(T,/obj/item/stack/tile/plasteel))
 			floor_type = T.type
--- a/code/game/turfs/simulated/floor_types.dm
+++ b/code/game/turfs/simulated/floor_types.dm
@@ -14,7 +14,7 @@

 /turf/simulated/floor/light
 	name = "Light floor"
-	luminosity = 5
+	light_range = 5
 	icon_state = "light_on"
 	floor_type = /obj/item/stack/tile/light

--- a/code/game/turfs/simulated/wall_attacks.dm
+++ b/code/game/turfs/simulated/wall_attacks.dm
@@ -10,14 +10,14 @@
 		//flick("[material.icon_base]fwall_opening", src)
 		sleep(15)
 		density = 0
-		SetOpacity(0)
+		set_light(0)
 	else
 		can_open = WALL_OPENING
 		//flick("[material.icon_base]fwall_closing", src)
 		set_wall_state("[material.icon_base]0")
 		density = 1
 		sleep(15)
-		SetOpacity(1)
+		set_light(1)

 	can_open = WALL_CAN_OPEN
 	update_icon()
--- a/code/game/turfs/simulated/wall_icon.dm
+++ b/code/game/turfs/simulated/wall_icon.dm
@@ -24,9 +24,9 @@
 	set_wall_state("[material.icon_base]0")

 	if(material.opacity > 0.5 && !opacity)
-		SetOpacity(1)
+		set_light(1)
 	else if(material.opacity < 0.5 && opacity)
-		SetOpacity(0)
+		set_light(0)

 	update_icon()
 	check_relatives()
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -6,6 +6,7 @@ var/list/accessible_z_levels = list("1" = 5, "3" = 10, "4" = 15, "5" = 10, "6" =
 	icon = 'icons/turf/space.dmi'
 	name = "\proper space"
 	icon_state = "0"
+	dynamic_lighting = 0

 	temperature = T20C
 	thermal_conductivity = OPEN_HEAT_TRANSFER_COEFFICIENT
@@ -20,9 +21,9 @@ var/list/accessible_z_levels = list("1" = 5, "3" = 10, "4" = 15, "5" = 10, "6" =
 	if(!config.starlight)
 		return
 	if(locate(/turf/simulated) in orange(src,1))
-		SetLuminosity(config.starlight)
+		set_light(config.starlight)
 	else
-		SetLuminosity(0)
+		set_light(0)

 /turf/space/attackby(obj/item/C as obj, mob/user as mob)

--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -32,6 +32,8 @@
 	// holy water
 	var/holy = 0

+	var/dynamic_lighting = 1
+
 /turf/New()
 	..()
 	for(var/atom/movable/AM as mob|obj in src)
@@ -218,8 +220,10 @@
 					return W
 ///// Z-Level Stuff

-	var/old_lumcount = lighting_lumcount - initial(lighting_lumcount)
 	var/obj/fire/old_fire = fire
+	var/old_opacity = opacity
+	var/old_dynamic_lighting = dynamic_lighting
+	var/list/old_affecting_lights = affecting_lights

 	//world << "Replacing [src.type] with [N]"

@@ -233,15 +237,7 @@
 		if(S.zone) S.zone.rebuild()

 	if(ispath(N, /turf/simulated/floor))
-		var/old_opacity = opacity
 		var/turf/simulated/W = new N( locate(src.x, src.y, src.z) )
-		//W.Assimilate_Air()
-
-		W.lighting_lumcount += old_lumcount
-		if((old_lumcount != W.lighting_lumcount) || (loc.name != "Space" && force_lighting_update))
-			W.lighting_changed = 1
-			lighting_controller.changed_turfs += W
-
 		if(old_fire)
 			fire = old_fire

@@ -258,20 +254,11 @@
 			S.update_starlight()

 		W.levelupdate()
-
-		// Testing if this fixes bugs with lighting not updating.
-		if(old_opacity != W.opacity)
-			W.UpdateAffectingLights()
-
-		return W
+		. = W

 	else

 		var/turf/W = new N( locate(src.x, src.y, src.z) )
-		W.lighting_lumcount += old_lumcount
-		if((old_lumcount != W.lighting_lumcount) || (loc.name != "Space" && force_lighting_update))
-			W.lighting_changed = 1
-			lighting_controller.changed_turfs += W

 		if(old_fire)
 			old_fire.RemoveFire()
@@ -286,7 +273,16 @@
 			S.update_starlight()

 		W.levelupdate()
-		return W
+		. =  W
+
+	affecting_lights = old_affecting_lights
+	if((old_opacity != opacity) || (dynamic_lighting != old_dynamic_lighting) || force_lighting_update)
+		reconsider_lights()
+	if(dynamic_lighting != old_dynamic_lighting)
+		if(dynamic_lighting)
+			lighting_build_overlays()
+		else
+			lighting_clear_overlays()


 //Commented out by SkyMarshal 5/10/13 - If you are patching up space, it should be vacuum.
--- a/code/modules/admin/verbs/massmodvar.dm
+++ b/code/modules/admin/verbs/massmodvar.dm
@@ -208,8 +208,8 @@
 					O.vars[variable]) as num|null
 			if(new_value == null) return

-			if(variable=="luminosity")
-				O.SetLuminosity(new_value)
+			if(variable=="light_range")
+				O.set_light(new_value)
 			else
 				O.vars[variable] = new_value

@@ -217,24 +217,24 @@
 				if(istype(O, /mob))
 					for(var/mob/M in mob_list)
 						if ( istype(M , O.type) )
-							if(variable=="luminosity")
-								M.SetLuminosity(new_value)
+							if(variable=="light_range")
+								M.set_light(new_value)
 							else
 								M.vars[variable] = O.vars[variable]

 				else if(istype(O, /obj))
 					for(var/obj/A in world)
 						if ( istype(A , O.type) )
-							if(variable=="luminosity")
-								A.SetLuminosity(new_value)
+							if(variable=="light_range")
+								A.set_light(new_value)
 							else
 								A.vars[variable] = O.vars[variable]

 				else if(istype(O, /turf))
 					for(var/turf/A in world)
 						if ( istype(A , O.type) )
-							if(variable=="luminosity")
-								A.SetLuminosity(new_value)
+							if(variable=="light_range")
+								A.set_light(new_value)
 							else
 								A.vars[variable] = O.vars[variable]

@@ -242,24 +242,24 @@
 				if(istype(O, /mob))
 					for(var/mob/M in mob_list)
 						if (M.type == O.type)
-							if(variable=="luminosity")
-								M.SetLuminosity(new_value)
+							if(variable=="light_range")
+								M.set_light(new_value)
 							else
 								M.vars[variable] = O.vars[variable]

 				else if(istype(O, /obj))
 					for(var/obj/A in world)
 						if (A.type == O.type)
-							if(variable=="luminosity")
-								A.SetLuminosity(new_value)
+							if(variable=="light_range")
+								A.set_light(new_value)
 							else
 								A.vars[variable] = O.vars[variable]

 				else if(istype(O, /turf))
 					for(var/turf/A in world)
 						if (A.type == O.type)
-							if(variable=="luminosity")
-								A.SetLuminosity(new_value)
+							if(variable=="light_range")
+								A.set_light(new_value)
 							else
 								A.vars[variable] = O.vars[variable]

@@ -372,4 +372,4 @@
 							A.vars[variable] = O.vars[variable]

 	log_admin("[key_name(src)] mass modified [original_name]'s [variable] to [O.vars[variable]]")
-	message_admins("[key_name_admin(src)] mass modified [original_name]'s [variable] to [O.vars[variable]]", 1)
+	message_admins("[key_name_admin(src)] mass modified [original_name]'s [variable] to [O.vars[variable]]", 1)
--- a/code/modules/admin/verbs/modifyvariables.dm
+++ b/code/modules/admin/verbs/modifyvariables.dm
@@ -455,10 +455,10 @@ var/list/forbidden_varedit_object_types = list(
 			O.vars[variable] = var_new

 		if("num")
-			if(variable=="luminosity")
+			if(variable=="light_range")
 				var/var_new = input("Enter new number:","Num",O.vars[variable]) as null|num
 				if(var_new == null) return
-				O.SetLuminosity(var_new)
+				O.set_light(var_new)
 			else if(variable=="stat")
 				var/var_new = input("Enter new number:","Num",O.vars[variable]) as null|num
 				if(var_new == null) return
--- a/Show More
+++ b/Show More