From d4d2f1d0adcd3fa62935203ba14d385085877cc2 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sun, 11 Mar 2018 19:41:00 -0500 Subject: [PATCH] Should speed up ZAS --- code/controllers/subsystems/air.dm | 2 +- code/controllers/subsystems/airflow.dm | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/controllers/subsystems/air.dm b/code/controllers/subsystems/air.dm index ed4602f048..ef0173c33a 100644 --- a/code/controllers/subsystems/air.dm +++ b/code/controllers/subsystems/air.dm @@ -9,7 +9,7 @@ SUBSYSTEM_DEF(air) name = "Air" init_order = INIT_ORDER_AIR - priority = 20 + priority = 35 wait = 2 SECONDS // seconds (We probably can speed this up actually) flags = SS_BACKGROUND // TODO - Should this really be background? It might be important. runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME diff --git a/code/controllers/subsystems/airflow.dm b/code/controllers/subsystems/airflow.dm index 9db8138826..c98a02a5ce 100644 --- a/code/controllers/subsystems/airflow.dm +++ b/code/controllers/subsystems/airflow.dm @@ -14,7 +14,7 @@ SUBSYSTEM_DEF(airflow) wait = 2 flags = SS_NO_INIT runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME - priority = 15 + priority = 30 var/list/processing = list() var/list/currentrun = list() @@ -47,7 +47,7 @@ SUBSYSTEM_DEF(airflow) continue else if (target.airflow_process_delay) target.airflow_process_delay = 0 - + target.airflow_speed = min(target.airflow_speed, 15) target.airflow_speed -= vsc.airflow_speed_decay if (!target.airflow_skip_speedcheck) @@ -89,7 +89,7 @@ SUBSYSTEM_DEF(airflow) if (MC_TICK_CHECK) return continue - + step_towards(target, target.airflow_dest) var/mob/M = target if (ismob(target) && M.client) @@ -98,7 +98,7 @@ SUBSYSTEM_DEF(airflow) if (MC_TICK_CHECK) return -#undef CLEAR_OBJECT +#undef CLEAR_OBJECT /atom/movable var/tmp/airflow_xo @@ -129,9 +129,9 @@ SUBSYSTEM_DEF(airflow) if (airflow_falloff < 1) airflow_dest = null return FALSE - - airflow_speed = min(max(n * (9 / airflow_falloff), 1), 9) - + + airflow_speed = min(max(n * (9 / airflow_falloff), 1), 9) + airflow_od = 0 if (!density) @@ -154,7 +154,7 @@ SUBSYSTEM_DEF(airflow) /atom/movable/proc/RepelAirflowDest(n) if (!prepare_airflow(n)) return - + airflow_xo = -(airflow_dest.x - src.x) airflow_yo = -(airflow_dest.y - src.y)