From e7047572f611250f8d487cdceb615f1ee810a0b5 Mon Sep 17 00:00:00 2001
From: kevinz000 <kevinz1234567890@gmail.com>
Date: Wed, 26 Jul 2017 22:30:23 -0700
Subject: [PATCH] Update SDQL_2.dm

---
 code/modules/admin/verbs/SDQL2/SDQL_2.dm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
index 820ee84d230..ae6c6d0fd42 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
@@ -90,6 +90,8 @@
 			if("call")
 				for(var/datum/d in objs)
 					world.SDQL_var(d, query_tree["call"][1], source = d)
+					CHECK_TICK
+					
 			if("delete")
 				for(var/datum/d in objs)
 					SDQL_qdel_datum(d)
@@ -123,11 +125,12 @@
 	text += "<A HREF='?_src_=vars;Vars=\ref[t]'>\ref[t]</A>"
 	if(istype(t, /atom))
 		var/atom/a = t
-		if(a.x)
-			text += ": [t] at ([a.x], [a.y], [a.z])<br>"
-
-		else if(a.loc && a.loc.x)
-			text += ": [t] in [a.loc] at ([a.loc.x], [a.loc.y], [a.loc.z])<br>"
+		var/turf/T = a.loc
+		var/turf/actual = get_turf(a)
+		if(istype(T))
+			text += ": [t] at turf [T] [COORD(T)]<br>"
+		else if(a.loc && istype(actual))
+			text += ": [t] in [a.loc] at turf [actual] [COORD(actual)]<br>"
 		else
 			text += ": [t]<br>"
 	else