Merge pull request #33384 from ninjanomnom/deletes-in-my-shutle-subsystem

Allows for qdel in shuttleMove procs
2017-12-09 16:07:55 -05:00
parent edce62494d
commit b6653dd94c
1 changed files with 2 additions and 0 deletions
@@ -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