Merge pull request #4475 from Citadel-Station-13/upstream-merge-33689

[MIRROR] Fix pulling things across space transitions
This commit is contained in:
LetterJay
2017-12-21 04:56:35 -06:00
committed by GitHub
+4 -2
View File
@@ -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