From 30fb3f8f5c6e7b770331b09a5035ee1963f51176 Mon Sep 17 00:00:00 2001 From: Tad Hardesty Date: Wed, 20 Dec 2017 22:33:54 -0800 Subject: [PATCH] Fix pulling things across space transitions (#33689) --- code/game/turfs/space/space.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index b1e8215592..5399b748e6 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -139,9 +139,11 @@ if(isliving(A)) var/mob/living/L = A - if(L.pulling) + var/atom/movable/AM = L.pulling + if(AM) var/turf/T = get_step(L.loc,turn(A.dir, 180)) - L.pulling.forceMove(T) + AM.forceMove(T) + L.start_pulling(AM) //now we're on the new z_level, proceed the space drifting stoplag()//Let a diagonal move finish, if necessary