From b6653dd94c8600d5799e06832f94f6ee4d31e197 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Sat, 9 Dec 2017 16:07:55 -0500
Subject: [PATCH 1/2] Merge pull request #33384 from
 ninjanomnom/deletes-in-my-shutle-subsystem

Allows for qdel in shuttleMove procs
---
 code/modules/shuttle/shuttle.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 79d662c8e4..2e0248b2cd 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -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