From 1233e5568fd6f57e10f6ceef9017f6f7c1938ad7 Mon Sep 17 00:00:00 2001
From: Mloc-Hibernia <colmohici@gmail.com>
Date: Mon, 24 Mar 2014 13:54:50 +0000
Subject: [PATCH] Revert "Merge pull request #4541 from comma/dev"

This reverts commit 596b6084e3f9eee62e960379ec764518c14dff7d, reversing
changes made to fa88663c23c206c187bcdcc0a364ce5f345d9830.
---
 code/WorkInProgress/Aryn/Lighting/Engine.dm | 7 +++----
 code/WorkInProgress/Aryn/Lighting/Light.dm  | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/code/WorkInProgress/Aryn/Lighting/Engine.dm b/code/WorkInProgress/Aryn/Lighting/Engine.dm
index 061918b414..3e9254acc2 100644
--- a/code/WorkInProgress/Aryn/Lighting/Engine.dm
+++ b/code/WorkInProgress/Aryn/Lighting/Engine.dm
@@ -171,10 +171,9 @@ turf/proc/ResetAllLights()
 
 /turf/space/ResetAllLights()
 	var/atom/movable/lighting_overlay/overlay = locate() in src
-	if (overlay)
-		overlay.loc = null
-		light_overlay = null
-		is_outside = 1
+	overlay.loc = null
+	light_overlay = null
+	is_outside = 1
 	. = ..()
 
 turf/proc/ResetValue()
diff --git a/code/WorkInProgress/Aryn/Lighting/Light.dm b/code/WorkInProgress/Aryn/Lighting/Light.dm
index e354154180..28eb733a27 100644
--- a/code/WorkInProgress/Aryn/Lighting/Light.dm
+++ b/code/WorkInProgress/Aryn/Lighting/Light.dm
@@ -48,8 +48,6 @@ light/proc/Off()
 	lit_turfs = list()
 
 light/proc/CalculateBrightness(turf/T)
-	if (!atom)
-		return 0
 	var/square = get_square_dist(atom.x,atom.y,atom.z,T.x,T.y,T.z)
 	if(square > (radius+2)*(radius+2)) return 0
 		//+2 offset gives an ambient light effect.