From 34c39e773a6f8407d25f831f6eb613ebaf3923d5 Mon Sep 17 00:00:00 2001
From: Mloc-Hibernia <colmohici@gmail.com>
Date: Mon, 24 Mar 2014 13:55:23 +0000
Subject: [PATCH] Revert "Merge pull request #4513 from Aryn/master"

This reverts commit fa88663c23c206c187bcdcc0a364ce5f345d9830, reversing
changes made to 608c48c6dbec5c59e05c61b209eada6c630a5a6b.
---
 code/WorkInProgress/Aryn/Lighting/Controller.dm |  5 ++---
 code/WorkInProgress/Aryn/Lighting/Engine.dm     | 14 +++-----------
 code/WorkInProgress/Aryn/Lighting/Lightpoint.dm | 15 +++++----------
 code/game/supplyshuttle.dm                      |  4 ++--
 4 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/code/WorkInProgress/Aryn/Lighting/Controller.dm b/code/WorkInProgress/Aryn/Lighting/Controller.dm
index c5a0fee140..5c668d62c7 100644
--- a/code/WorkInProgress/Aryn/Lighting/Controller.dm
+++ b/code/WorkInProgress/Aryn/Lighting/Controller.dm
@@ -76,7 +76,7 @@ var/list/lit_z_levels = list(1,5)
 						world << "<font color=red>Progress: [round((turfs_updated/total_turfs)*100, 0.01)]% ([turfs_updated]/[total_turfs])"
 
 					var/turf/T = locate(x,y,z)
-					if(!T.is_outside)
+					if(!T.light_overlay && !T.is_outside)
 						T.light_overlay = new(T)
 					//T.ResetValue()
 				if(!all_lightpoints_made) new/lightpoint(x+0.5,y+0.5,z)
@@ -89,8 +89,7 @@ var/list/lit_z_levels = list(1,5)
 	started = 1
 
 	for(var/turf/T)
-		if(!T.is_outside && T.light_overlay)
-
+		if(T.light_overlay)
 			T.ResetValue()
 			T.UpdateLight()
 
diff --git a/code/WorkInProgress/Aryn/Lighting/Engine.dm b/code/WorkInProgress/Aryn/Lighting/Engine.dm
index 3e9254acc2..82a4324ba8 100644
--- a/code/WorkInProgress/Aryn/Lighting/Engine.dm
+++ b/code/WorkInProgress/Aryn/Lighting/Engine.dm
@@ -53,9 +53,8 @@ Turf Procs:
 
 #define LIGHTCLAMP(x) ( max(0,min(3,round(x,1))) )
 
-atom/movable/lighting_overlay
-	name = ""
-	anchored = 1
+obj/effect/lighting_overlay
+	//anchored = 1
 	layer = 9
 	mouse_opacity = 0
 	icon = 'icons/effects/ArynLights.dmi'
@@ -64,7 +63,7 @@ atom/movable/lighting_overlay
 
 atom/var/light/light
 
-turf/var/atom/movable/lighting_overlay/light_overlay
+turf/var/obj/effect/lighting_overlay/light_overlay
 
 turf/var/lit_value = 0
 turf/var/max_brightness = 0
@@ -169,13 +168,6 @@ turf/proc/ResetAllLights()
 	for(var/light/light in lit_by)
 		light.Reset()
 
-/turf/space/ResetAllLights()
-	var/atom/movable/lighting_overlay/overlay = locate() in src
-	overlay.loc = null
-	light_overlay = null
-	is_outside = 1
-	. = ..()
-
 turf/proc/ResetValue()
 	if(is_outside)
 		max_brightness = lighting_controller.starlight
diff --git a/code/WorkInProgress/Aryn/Lighting/Lightpoint.dm b/code/WorkInProgress/Aryn/Lighting/Lightpoint.dm
index 5b9aade35e..dfca9db4fd 100644
--- a/code/WorkInProgress/Aryn/Lighting/Lightpoint.dm
+++ b/code/WorkInProgress/Aryn/Lighting/Lightpoint.dm
@@ -52,14 +52,9 @@ lightpoint
 	proc/max_value()
 		if(cached_value < 0)
 			var
-				valueA = value_of(NW)
-				valueB = value_of(NE)
-				valueC = value_of(SW)
-				valueD = value_of(SE)
+				valueA = (NW?(NW.lit_value):0)
+				valueB = (NE?(NE.lit_value):0)
+				valueC = (SW?(SW.lit_value):0)
+				valueD = (SE?(SE.lit_value):0)
 			cached_value = max(valueA,valueB,valueC,valueD)
-		return cached_value
-
-	proc/value_of(turf/T)
-		if(!T) return 0
-		if(T.is_outside) return min(lighting_controller.starlight,3)
-		return T.lit_value
\ No newline at end of file
+		return cached_value
\ No newline at end of file
diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm
index ea9446e2d0..f28b649ba7 100644
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -1,8 +1,8 @@
 //Config stuff
 #define SUPPLY_DOCKZ 2          //Z-level of the Dock.
 #define SUPPLY_STATIONZ 1       //Z-level of the Station.
-#define SUPPLY_STATION_AREATYPE /area/supply/station //Type of the supply shuttle area for station
-#define SUPPLY_DOCK_AREATYPE /area/supply/dock	//Type of the supply shuttle area for dock
+#define SUPPLY_STATION_AREATYPE "/area/supply/station" //Type of the supply shuttle area for station
+#define SUPPLY_DOCK_AREATYPE "/area/supply/dock"	//Type of the supply shuttle area for dock
 
 var/datum/controller/supply_shuttle/supply_shuttle = new()