From 327727f70cd99a5726f2f14cb6f96a8bdac37161 Mon Sep 17 00:00:00 2001
From: ninjanomnom <ninjanomnom@gmail.com>
Date: Thu, 7 Dec 2017 22:37:30 -0500
Subject: [PATCH] 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 249ab42e6b5..5ec83f31378 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