From bf14c1dd6191d2047e04039edd2c336e2f472bdd Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Fri, 7 Jul 2017 06:46:36 -0500
Subject: [PATCH] Machine subsystem now checks qdel status (#1922)

---
 code/controllers/subsystem/machines.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/controllers/subsystem/machines.dm b/code/controllers/subsystem/machines.dm
index 0c99eb7ea4..391804c4f8 100644
--- a/code/controllers/subsystem/machines.dm
+++ b/code/controllers/subsystem/machines.dm
@@ -39,12 +39,12 @@ SUBSYSTEM_DEF(machines)
 	while(currentrun.len)
 		var/obj/machinery/thing = currentrun[currentrun.len]
 		currentrun.len--
-		if(thing && thing.process(seconds) != PROCESS_KILL)
+		if(!QDELETED(thing) && thing.process(seconds) != PROCESS_KILL)
 			if(thing.use_power)
 				thing.auto_use_power() //add back the power state
 		else
 			processing -= thing
-			if (thing)
+			if (!QDELETED(thing))
 				thing.isprocessing = 0
 		if (MC_TICK_CHECK)
 			return