From f3fa0c3f3872e9ed30bd3df4e7ea321c877193e8 Mon Sep 17 00:00:00 2001
From: Nerd Lord <duorabbit2@gmail.com>
Date: Sat, 4 Jun 2016 21:56:10 -0400
Subject: [PATCH] is this a turf

---
 code/modules/power/singularity/singularity.dm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 04f918f7627..f31c2850b4d 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -239,18 +239,19 @@
 	set background = BACKGROUND_ENABLED
 	for(var/tile in spiral_range_turfs(grav_pull, src, 1))
 		var/turf/T = tile
-		if(!T)
+		if(!T || !isturf(loc))
 			continue
-		if(isturf(loc) && get_dist(T, src) > consume_range)
+		if(get_dist(T, src) > consume_range)
 			T.singularity_pull(src, current_size)
 		else
 			consume(T)
 		for(var/thing in T)
-			var/atom/movable/X = thing
-			if(isturf(loc) && get_dist(X, src) > consume_range)
-				X.singularity_pull(src, current_size)
-			else
-				consume(X)
+			if(isturf(loc))
+				var/atom/movable/X = thing
+				if(get_dist(X, src) > consume_range)
+					X.singularity_pull(src, current_size)
+				else
+					consume(X)
 			CHECK_TICK
 	return