diff --git a/code/__DEFINES/MC.dm b/code/__DEFINES/MC.dm index 7b7aacc9e5..cad75fbfe4 100644 --- a/code/__DEFINES/MC.dm +++ b/code/__DEFINES/MC.dm @@ -1,7 +1,5 @@ #define MC_TICK_CHECK ( ( TICK_USAGE > Master.current_ticklimit || src.state != SS_RUNNING ) ? pause() : 0 ) -#define MC_TICK_REMAINING_MS ((Master.current_ticklimit - TICK_USAGE) * world.tick_lag) - #define MC_SPLIT_TICK_INIT(phase_count) var/original_tick_limit = Master.current_ticklimit; var/split_tick_phases = ##phase_count #define MC_SPLIT_TICK \ if(split_tick_phases > 1){\ diff --git a/code/__DEFINES/_tick.dm b/code/__DEFINES/_tick.dm index 7367240aa9..f4a8fbb9e5 100644 --- a/code/__DEFINES/_tick.dm +++ b/code/__DEFINES/_tick.dm @@ -23,6 +23,9 @@ /// Returns true if tick_usage is above the limit #define TICK_CHECK ( TICK_USAGE > Master.current_ticklimit ) + +#define TICK_REMAINING_MS ((Master.current_ticklimit - TICK_USAGE) * world.tick_lag) + /// runs stoplag if tick_usage is above the limit #define CHECK_TICK ( TICK_CHECK ? stoplag() : 0 ) diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 86af777c44..92482b06cc 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -209,7 +209,7 @@ SUBSYSTEM_DEF(air) // Heat -- slow and of questionable usefulness. Off by default for this reason. Pretty cool, though. if(currentpart == SSAIR_TURF_CONDUCTION) timer = TICK_USAGE_REAL - if(process_turf_heat(MC_TICK_REMAINING_MS)) + if(process_turf_heat(TICK_REMAINING_MS)) pause() cost_superconductivity = MC_AVERAGE(cost_superconductivity, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer)) if(state != SS_RUNNING) @@ -358,7 +358,7 @@ SUBSYSTEM_DEF(air) return /datum/controller/subsystem/air/proc/process_turf_equalize(resumed = 0) - if(process_turf_equalize_auxtools(resumed,MC_TICK_REMAINING_MS)) + if(process_turf_equalize_auxtools(resumed,TICK_REMAINING_MS)) pause() /* //cache for sanic speed @@ -378,7 +378,7 @@ SUBSYSTEM_DEF(air) */ /datum/controller/subsystem/air/proc/process_turfs(resumed = 0) - if(process_turfs_auxtools(resumed,MC_TICK_REMAINING_MS)) + if(process_turfs_auxtools(resumed,TICK_REMAINING_MS)) pause() /* //cache for sanic speed @@ -397,15 +397,15 @@ SUBSYSTEM_DEF(air) */ /datum/controller/subsystem/air/proc/process_excited_groups(resumed = 0) - if(process_excited_groups_auxtools(resumed,MC_TICK_REMAINING_MS)) + if(process_excited_groups_auxtools(resumed,TICK_REMAINING_MS)) pause() /datum/controller/subsystem/air/proc/finish_turf_processing(resumed = 0) - if(finish_turf_processing_auxtools(MC_TICK_REMAINING_MS)) + if(finish_turf_processing_auxtools(TICK_REMAINING_MS)) pause() /datum/controller/subsystem/air/proc/post_process_turfs(resumed = 0) - if(post_process_turfs_auxtools(resumed,MC_TICK_REMAINING_MS)) + if(post_process_turfs_auxtools(resumed,TICK_REMAINING_MS)) pause() /datum/controller/subsystem/air/proc/finish_turf_processing_auxtools() diff --git a/code/controllers/subsystem/callback.dm b/code/controllers/subsystem/callback.dm index ecc65760f4..21c43f3e6c 100644 --- a/code/controllers/subsystem/callback.dm +++ b/code/controllers/subsystem/callback.dm @@ -10,5 +10,5 @@ SUBSYSTEM_DEF(callbacks) CRASH("Auxtools not found! Callback subsystem shutting itself off.") /datum/controller/subsystem/callbacks/fire() - if(process_atmos_callbacks(MC_TICK_REMAINING_MS)) + if(process_atmos_callbacks(TICK_REMAINING_MS)) pause()