From 0c2e0d5fb2e490d4088ecab5f18f296c358130c2 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <CitadelStationBot>
Date: Wed, 7 Jun 2017 14:17:28 -0500
Subject: [PATCH] Makes processing subsystems respect qdel and PROCESS_KILL

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

diff --git a/code/controllers/subsystem/processing/processing.dm b/code/controllers/subsystem/processing/processing.dm
index 602455621b..67ee5113cb 100644
--- a/code/controllers/subsystem/processing/processing.dm
+++ b/code/controllers/subsystem/processing/processing.dm
@@ -22,9 +22,7 @@ SUBSYSTEM_DEF(processing)
 	while(current_run.len)
 		var/datum/thing = current_run[current_run.len]
 		current_run.len--
-		if(thing)
-			thing.process(wait)
-		else
+		if(QDELETED(thing) || thing.process(wait) == PROCESS_KILL)
 			processing -= thing
 		if (MC_TICK_CHECK)
 			return
@@ -33,4 +31,4 @@ SUBSYSTEM_DEF(processing)
 /datum/proc/process()
 	set waitfor = 0
 	STOP_PROCESSING(SSobj, src)
-	return 0
\ No newline at end of file
+	return 0