cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix air again

Browse Source
This commit is contained in:
Katherine Kiefer
2022-03-21 13:31:02 +11:00
parent 2a68dc2621
commit 689eb2daef
1 changed files with 7 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
code/controllers/subsystem/air.dm
View File

@@ -152,6 +152,7 @@ SUBSYSTEM_DEF(air)
return return
resumed = 0 resumed = 0
currentpart = SSAIR_ATMOSMACHINERY currentpart = SSAIR_ATMOSMACHINERY
// This is only machinery like filters, mixers that don't interact with air // This is only machinery like filters, mixers that don't interact with air
if(currentpart == SSAIR_ATMOSMACHINERY) if(currentpart == SSAIR_ATMOSMACHINERY)
timer = TICK_USAGE_REAL timer = TICK_USAGE_REAL
@@ -170,6 +171,7 @@ SUBSYSTEM_DEF(air)
return return
resumed = 0 resumed = 0
currentpart = SSAIR_FINALIZE_TURFS currentpart = SSAIR_FINALIZE_TURFS
// This literally just waits for the turf processing thread to finish, doesn't do anything else. // This literally just waits for the turf processing thread to finish, doesn't do anything else.
// this is necessary cause the next step after this interacts with the air--we get consistency // this is necessary cause the next step after this interacts with the air--we get consistency
// issues if we don't wait for it, disappearing gases etc. // issues if we don't wait for it, disappearing gases etc.
@@ -182,6 +184,7 @@ SUBSYSTEM_DEF(air)
thread_wait_ticks = MC_AVERAGE(thread_wait_ticks, cur_thread_wait_ticks) thread_wait_ticks = MC_AVERAGE(thread_wait_ticks, cur_thread_wait_ticks)
cur_thread_wait_ticks = 0 cur_thread_wait_ticks = 0
currentpart = SSAIR_DEFERRED_AIRS currentpart = SSAIR_DEFERRED_AIRS
if(currentpart == SSAIR_DEFERRED_AIRS) if(currentpart == SSAIR_DEFERRED_AIRS)
timer = TICK_USAGE_REAL timer = TICK_USAGE_REAL
process_deferred_airs(resumed) process_deferred_airs(resumed)
@@ -189,6 +192,8 @@ SUBSYSTEM_DEF(air)
if(state != SS_RUNNING) if(state != SS_RUNNING)
return return
resumed = 0 resumed = 0
currentpart = SSAIR_ATMOSMACHINERY_AIR
if(currentpart == SSAIR_ATMOSMACHINERY_AIR) if(currentpart == SSAIR_ATMOSMACHINERY_AIR)
timer = TICK_USAGE_REAL timer = TICK_USAGE_REAL
process_atmos_air_machinery(resumed) process_atmos_air_machinery(resumed)
@@ -206,6 +211,7 @@ SUBSYSTEM_DEF(air)
return return
resumed = 0 resumed = 0
currentpart = heat_enabled ? SSAIR_TURF_CONDUCTION : SSAIR_ACTIVETURFS currentpart = heat_enabled ? SSAIR_TURF_CONDUCTION : SSAIR_ACTIVETURFS
// Heat -- slow and of questionable usefulness. Off by default for this reason. Pretty cool, though. // Heat -- slow and of questionable usefulness. Off by default for this reason. Pretty cool, though.
if(currentpart == SSAIR_TURF_CONDUCTION) if(currentpart == SSAIR_TURF_CONDUCTION)
timer = TICK_USAGE_REAL timer = TICK_USAGE_REAL
@@ -216,6 +222,7 @@ SUBSYSTEM_DEF(air)
return return
resumed = 0 resumed = 0
currentpart = SSAIR_ACTIVETURFS currentpart = SSAIR_ACTIVETURFS
// This simply starts the turf thread. It runs in the background until the FINALIZE_TURFS step, at which point it's waited for. // This simply starts the turf thread. It runs in the background until the FINALIZE_TURFS step, at which point it's waited for.
// This also happens to do all the commented out stuff below, all in a single separate thread. This is mostly so that the // This also happens to do all the commented out stuff below, all in a single separate thread. This is mostly so that the
// waiting is consistent. // waiting is consistent.
@@ -226,38 +233,8 @@ SUBSYSTEM_DEF(air)
if(state != SS_RUNNING) if(state != SS_RUNNING)
return return
resumed = 0 resumed = 0
/*
// Monstermos and/or Putnamos--making large pressure deltas move faster
if(currentpart == SSAIR_EQUALIZE)
timer = TICK_USAGE_REAL
process_turf_equalize(resumed)
cost_equalize = MC_AVERAGE(cost_equalize, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
if(state != SS_RUNNING)
return
resumed = 0
currentpart = SSAIR_EXCITEDGROUPS
// Making small pressure deltas equalize immediately so they don't process anymore
if(currentpart == SSAIR_EXCITEDGROUPS)
timer = TICK_USAGE_REAL
process_excited_groups(resumed)
cost_groups = MC_AVERAGE(cost_groups, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
if(state != SS_RUNNING)
return
resumed = 0
currentpart = SSAIR_TURF_POST_PROCESS
// Quick multithreaded "should we display/react?" checks followed by finishing those up before the next step
if(currentpart == SSAIR_TURF_POST_PROCESS)
timer = TICK_USAGE_REAL
post_process_turfs(resumed)
cost_post_process = MC_AVERAGE(cost_post_process, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
if(state != SS_RUNNING)
return
resumed = 0
currentpart = SSAIR_HOTSPOTS
*/
currentpart = SSAIR_REBUILD_PIPENETS currentpart = SSAIR_REBUILD_PIPENETS
/datum/controller/subsystem/air/proc/process_pipenets(resumed = FALSE) /datum/controller/subsystem/air/proc/process_pipenets(resumed = FALSE)
if (!resumed) if (!resumed)
src.currentrun = networks.Copy() src.currentrun = networks.Copy()