cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-27 10:15:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[MIRROR] Allows for qdel in shuttleMove procs
This commit is contained in:
deathride58
2017-12-10 03:06:31 +00:00
committed by GitHub
parent 79bbf1085b a71c61a97e
commit 15b51f6c6c
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/shuttle/shuttle.dm
View File

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