Skip to content

Commit

Permalink
Revert "Fixes the recent revert (#4542)"
Browse files Browse the repository at this point in the history
This reverts commit d5aa313.
  • Loading branch information
ACCount12 authored Jan 20, 2020
1 parent d5aa313 commit 6ccc325
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/subsystems.dm
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ if (Datum.is_processing) {\
SSmachines.List += Datum;\
}

//stopProcessingWrapper catches removal from processing list before it happens to adjust last position in memory during resumes
#define STOP_PROCESSING_IN_LIST(Datum, List) \
if(Datum.is_processing) {\
if(SSmachines.List.Remove(Datum)) {\
Expand Down
3 changes: 3 additions & 0 deletions code/controllers/subsystems.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@
/datum/controller/subsystem/proc/PreInit()
return

/datum/controller/subsystem/proc/stopProcessingWrapper() //called before a thing stops being processed
return

//This is used so the mc knows when the subsystem sleeps. do not override.
/datum/controller/subsystem/proc/ignite(resumed = 0)
set waitfor = 0
Expand Down
3 changes: 0 additions & 3 deletions code/controllers/subsystems/machines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ datum/controller/subsystem/machines/proc/setup_atmos_machinery(list/machines)
current_run.Cut(1, 2)
if(istype(PN) && !QDELETED(PN))
PN.Process(wait)
else
pipenets.Remove(PN)
PN.is_processing = null
if(MC_TICK_CHECK)
Expand All @@ -137,7 +136,6 @@ datum/controller/subsystem/machines/proc/setup_atmos_machinery(list/machines)
if(istype(M) && !QDELETED(M) && !(M.Process(wait) == PROCESS_KILL))
if(M.use_power)
M.auto_use_power()
else
machinery.Remove(M)
M.is_processing = null
if(MC_TICK_CHECK)
Expand All @@ -153,7 +151,6 @@ datum/controller/subsystem/machines/proc/setup_atmos_machinery(list/machines)
current_run.Cut(1, 2)
if(istype(PN) && !QDELETED(PN))
PN.reset(wait)
else
powernets.Remove(PN)
PN.is_processing = null
if(MC_TICK_CHECK)
Expand Down

0 comments on commit 6ccc325

Please sign in to comment.