From 27210bdbfd4e2e7773de17c5b1bc573b69ef1dca Mon Sep 17 00:00:00 2001
From: vuonojenmustaturska <naksu@youzen.ext.b2.fi>
Date: Thu, 22 Mar 2018 05:02:39 +0200
Subject: [PATCH] Fixes regression with pulled objects and space transitions
 (#36587)

* Fixes spesspulling

* honk
---
 code/game/turfs/space/space.dm | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index 2e4c42ed44d..8f628efc5f5 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -150,15 +150,13 @@
 			else
 				ty--
 			DT = locate(tx, ty, destination_z)
-		A.forceMove(DT)
 
-		if(isliving(A))
-			var/mob/living/L = A
-			var/atom/movable/AM = L.pulling
-			if(AM)
-				var/turf/T = get_step(L.loc,turn(A.dir, 180))
-				AM.forceMove(T)
-				L.start_pulling(AM)
+		var/atom/movable/AM = A.pulling
+		A.forceMove(DT)
+		if(AM)
+			var/turf/T = get_step(A.loc,turn(A.dir, 180))
+			AM.forceMove(T)
+			A.start_pulling(AM)
 
 		//now we're on the new z_level, proceed the space drifting
 		stoplag()//Let a diagonal move finish, if necessary