shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Fixes regression with pulled objects and space transitions (#6065)

Browse Source 
* Fixes regression with pulled objects and space transitions (#36587)

* Fixes spesspulling

* honk

* Fixes regression with pulled objects and space transitions
This commit is contained in:
CitadelStationBot
2018-03-22 06:09:55 -05:00
committed by Poojawa
parent b283c5f07a
commit 30e5e7a56a
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/space/space.dm
+6 -8
View File
@@ -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