Merge pull request #4297 from Citadel-Station-13/upstream-merge-33384

[MIRROR] Allows for qdel in shuttleMove procs
This commit is contained in:
deathride58
2017-12-10 03:06:31 +00:00
committed by GitHub

View File

@@ -665,6 +665,8 @@
for(var/i in 1 to moved_atoms.len)
CHECK_TICK
var/atom/movable/moved_object = moved_atoms[i]
if(QDELETED(moved_object))
continue
var/turf/oldT = moved_atoms[moved_object]
moved_object.afterShuttleMove(oldT, movement_force, dir, preferred_direction, movement_direction, rotation)//atoms