diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm index 444c8e826df..dea6e9645a0 100644 --- a/code/controllers/subsystem.dm +++ b/code/controllers/subsystem.dm @@ -45,6 +45,8 @@ can_fire = 0 /datum/subsystem/proc/pause() + if(!McTickCheck) + return 0 . = 1 if (!dynamic_wait) Master.priority_queue += src diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 12bce4e3029..6efb4ca6e40 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -147,7 +147,7 @@ var/datum/subsystem/air/SSair thing.process() else networks.Remove(thing) - if(MC_TICK_CHECK && McTickCheck) + if(MC_TICK_CHECK) return @@ -162,7 +162,7 @@ var/datum/subsystem/air/SSair currentrun.Cut(1, 2) if(!M || (M.process_atmos(seconds) == PROCESS_KILL)) atmos_machinery.Remove(M) - if(MC_TICK_CHECK && McTickCheck) + if(MC_TICK_CHECK) return @@ -175,7 +175,7 @@ var/datum/subsystem/air/SSair var/turf/T = currentrun[1] currentrun.Cut(1, 2) T.super_conduct() - if(MC_TICK_CHECK && McTickCheck) + if(MC_TICK_CHECK) return /datum/subsystem/air/proc/process_hotspots(resumed = 0) @@ -190,7 +190,7 @@ var/datum/subsystem/air/SSair H.process() else hotspots -= H - if(MC_TICK_CHECK && McTickCheck) + if(MC_TICK_CHECK) return @@ -200,7 +200,7 @@ var/datum/subsystem/air/SSair high_pressure_delta.Cut(1,2) T.high_pressure_movements() T.pressure_difference = 0 - if(MC_TICK_CHECK && McTickCheck) + if(MC_TICK_CHECK) return /datum/subsystem/air/proc/process_active_turfs(resumed = 0) @@ -215,7 +215,7 @@ var/datum/subsystem/air/SSair currentrun.Cut(1, 2) if (T) T.process_cell(fire_count) - if (MC_TICK_CHECK && McTickCheck) + if (MC_TICK_CHECK) return /datum/subsystem/air/proc/process_excited_groups(resumed = 0) @@ -232,7 +232,7 @@ var/datum/subsystem/air/SSair EG.self_breakdown() else if(EG.dismantle_cooldown >= EXCITED_GROUP_DISMANTLE_CYCLES) EG.dismantle() - if (MC_TICK_CHECK && McTickCheck) + if (MC_TICK_CHECK) return diff --git a/code/controllers/subsystem/diseases.dm b/code/controllers/subsystem/diseases.dm index b71d56f5d2d..71a64f45f53 100644 --- a/code/controllers/subsystem/diseases.dm +++ b/code/controllers/subsystem/diseases.dm @@ -25,5 +25,5 @@ var/datum/subsystem/diseases/SSdisease thing.process() else processing.Remove(thing) - if (MC_TICK_CHECK && McTickCheck) + if (MC_TICK_CHECK) return diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm index 81a935cd1ea..de4d4bbc86d 100644 --- a/code/controllers/subsystem/events.dm +++ b/code/controllers/subsystem/events.dm @@ -48,7 +48,7 @@ var/datum/subsystem/events/SSevent thing.process() else running.Remove(thing) - if (MC_TICK_CHECK && McTickCheck) + if (MC_TICK_CHECK) return //checks if we should select a random event yet, and reschedules if necessary diff --git a/code/controllers/subsystem/fastprocess.dm b/code/controllers/subsystem/fastprocess.dm index 85983f490d6..e3f136ac3a0 100644 --- a/code/controllers/subsystem/fastprocess.dm +++ b/code/controllers/subsystem/fastprocess.dm @@ -33,5 +33,5 @@ var/datum/subsystem/fastprocess/SSfastprocess thing.process(wait) else SSfastprocess.processing -= thing - if (MC_TICK_CHECK && McTickCheck) + if (MC_TICK_CHECK) return diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index 8b7bc0ea990..bbc9ac5afde 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -62,7 +62,7 @@ var/datum/subsystem/garbage_collector/SSgarbage /datum/subsystem/garbage_collector/proc/HandleToBeQueued(time_to_stop) var/list/tobequeued = src.tobequeued while(tobequeued.len && world.timeofday < time_to_stop) - if (MC_TICK_CHECK && McTickCheck) + if (MC_TICK_CHECK) break var/ref = tobequeued[1] Queue(ref) @@ -74,7 +74,7 @@ var/datum/subsystem/garbage_collector/SSgarbage var/time_to_kill = world.time - collection_timeout // Anything qdel() but not GC'd BEFORE this time needs to be manually del() var/list/queue = src.queue while(queue.len && world.timeofday < time_to_stop) - if (MC_TICK_CHECK && McTickCheck) + if (MC_TICK_CHECK) break var/refID = queue[1] if (!refID) diff --git a/code/controllers/subsystem/icon_smooth.dm b/code/controllers/subsystem/icon_smooth.dm index e9ba1d01f71..37d13a710cc 100644 --- a/code/controllers/subsystem/icon_smooth.dm +++ b/code/controllers/subsystem/icon_smooth.dm @@ -13,7 +13,7 @@ var/datum/subsystem/icon_smooth/SSicon_smooth for(var/atom in smooth_queue) ss_smooth_icon(atom) smooth_queue -= atom - if (MC_TICK_CHECK && McTickCheck) + if (MC_TICK_CHECK) return /datum/subsystem/icon_smooth/Initialize() diff --git a/code/controllers/subsystem/lighting.dm b/code/controllers/subsystem/lighting.dm index 3a447c9ccd1..dc6dee36d1a 100644 --- a/code/controllers/subsystem/lighting.dm +++ b/code/controllers/subsystem/lighting.dm @@ -41,7 +41,7 @@ var/datum/subsystem/lighting/SSlighting var/datum/light_source/LS = changed_lights[1] changed_lights.Cut(1, 2) LS.check() - if (MC_TICK_CHECK && McTickCheck) + if (MC_TICK_CHECK) return var/list/changed_turfs = src.changed_turfs @@ -52,7 +52,7 @@ var/datum/subsystem/lighting/SSlighting changed_turfs.Cut(1, 2) if(T.lighting_changed) T.redraw_lighting() - if (MC_TICK_CHECK && McTickCheck) + if (MC_TICK_CHECK) return //same as above except it attempts to shift ALL turfs in the world regardless of lighting_changed status diff --git a/code/controllers/subsystem/machines.dm b/code/controllers/subsystem/machines.dm index 47cd52fc3f2..8491da09678 100644 --- a/code/controllers/subsystem/machines.dm +++ b/code/controllers/subsystem/machines.dm @@ -52,7 +52,7 @@ var/datum/subsystem/machines/SSmachine thing:auto_use_power() //add back the power state else processing.Remove(thing) - if (MC_TICK_CHECK && McTickCheck) + if (MC_TICK_CHECK) return /datum/subsystem/machines/proc/setup_template_powernets(list/cables) diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm index 4e458b0a2da..aa7910c0af3 100644 --- a/code/controllers/subsystem/mobs.dm +++ b/code/controllers/subsystem/mobs.dm @@ -30,5 +30,5 @@ var/datum/subsystem/mobs/SSmob M.Life(seconds) else mob_list.Remove(M) - if (MC_TICK_CHECK && McTickCheck) + if (MC_TICK_CHECK) return \ No newline at end of file diff --git a/code/controllers/subsystem/objects.dm b/code/controllers/subsystem/objects.dm index 7c8576f091c..981724a8d84 100644 --- a/code/controllers/subsystem/objects.dm +++ b/code/controllers/subsystem/objects.dm @@ -52,7 +52,7 @@ var/datum/subsystem/objects/SSobj thing.process(wait) else SSobj.processing.Remove(thing) - if (MC_TICK_CHECK && McTickCheck) + if (MC_TICK_CHECK) return for(var/obj/burningobj in SSobj.burning)