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-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1458 from Citadel-Station-13/upstream-merge-28146

Browse Source 
[MIRROR] Makes processing subsystems respect qdel and PROCESS_KILL
This commit is contained in:
LetterJay
2017-06-14 08:54:17 -05:00
committed by GitHub
parent 9df28d90bf 0c2e0d5fb2
commit 5117b3ea88
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/controllers/subsystem/processing/processing.dm
View File

@@ -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
return 0