Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hopefully fixes #4538 #4542

Merged
merged 1 commit into from
Jan 20, 2020
Merged

Hopefully fixes #4538 #4542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion code/__DEFINES/subsystems.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ 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: 0 additions & 3 deletions code/controllers/subsystems.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@
/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: 3 additions & 0 deletions code/controllers/subsystems/machines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ 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 @@ -136,6 +137,7 @@ 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 @@ -151,6 +153,7 @@ 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