diff --git a/code/__DEFINES/process_scheduler.dm b/code/__DEFINES/process_scheduler.dm deleted file mode 100644 index 4bc841022f8..00000000000 --- a/code/__DEFINES/process_scheduler.dm +++ /dev/null @@ -1,18 +0,0 @@ -// Process status defines -#define PROCESS_STATUS_IDLE 1 -#define PROCESS_STATUS_QUEUED 2 -#define PROCESS_STATUS_RUNNING 3 -#define PROCESS_STATUS_MAYBE_HUNG 4 -#define PROCESS_STATUS_PROBABLY_HUNG 5 -#define PROCESS_STATUS_HUNG 6 - -// Process time thresholds -#define PROCESS_DEFAULT_HANG_WARNING_TIME 300 // 30 seconds -#define PROCESS_DEFAULT_HANG_ALERT_TIME 600 // 60 seconds -#define PROCESS_DEFAULT_HANG_RESTART_TIME 900 // 90 seconds -#define PROCESS_DEFAULT_SCHEDULE_INTERVAL 50 // 50 ticks -#define PROCESS_DEFAULT_SLEEP_INTERVAL 20 // 20% of a tick -#define PROCESS_DEFAULT_DEFER_USAGE 90 // 90% of a tick - -// Sleep check macro -#define SCHECK if(TICK_USAGE >= next_sleep_usage) defer() diff --git a/code/controllers/Processes/air.dm b/code/controllers/Processes/air.dm deleted file mode 100644 index 8cc98770b91..00000000000 --- a/code/controllers/Processes/air.dm +++ /dev/null @@ -1,23 +0,0 @@ -/datum/controller/process/air/setup() - name = "air" - schedule_interval = 20 // every 2 seconds - start_delay = 4 - - if(!air_master) - air_master = new - air_master.Setup() - -/datum/controller/process/air/doWork() - if(!air_processing_killed) - if(!air_master.Tick()) //Runtimed. - air_master.failed_ticks++ - - if(air_master.failed_ticks > 5) - to_chat(world, "RUNTIMES IN ATMOS TICKER. Killing air simulation!") - world.log << "### ZAS SHUTDOWN" - - message_admins("ZASALERT: Shutting down! status: [air_master.tick_progress]") - log_admin("ZASALERT: Shutting down! status: [air_master.tick_progress]") - - air_processing_killed = TRUE - air_master.failed_ticks = 0 diff --git a/code/modules/admin/view_variables/get_variables.dm b/code/modules/admin/view_variables/get_variables.dm index 8e834e37e77..ac696e753f4 100644 --- a/code/modules/admin/view_variables/get_variables.dm +++ b/code/modules/admin/view_variables/get_variables.dm @@ -1,4 +1,4 @@ -/client/proc/vv_get_class(var_name, var_value) +/proc/vv_get_class(var_name, var_value) if(isnull(var_value)) . = VV_NULL diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm index 637f632e0a5..108ecf37b8f 100644 --- a/code/modules/atmospherics/gasmixtures/reactions.dm +++ b/code/modules/atmospherics/gasmixtures/reactions.dm @@ -122,7 +122,7 @@ datum/gas_mixture/proc/check_recombustability(list/fuel_objs) . = 0 CACHE_VSC_PROP(atmos_vsc, /atmos/fire/consumption_rate, fire_consumption_rate) for(var/g in gas) - if(gas_data.flags[g] & XGM_GAS_OXIDIZER && QUANTIZE(gas[g] * fire_consuption_rate) >= 0.1) + if(gas_data.flags[g] & XGM_GAS_OXIDIZER && QUANTIZE(gas[g] * fire_consumption_rate) >= 0.1) . = 1 break @@ -134,7 +134,7 @@ datum/gas_mixture/proc/check_recombustability(list/fuel_objs) . = 0 for(var/g in gas) - if(gas_data.flags[g] & XGM_GAS_FUEL && QUANTIZE(gas[g] * fire_consuption_rate) >= 0.005) + if(gas_data.flags[g] & XGM_GAS_FUEL && QUANTIZE(gas[g] * fire_consumption_rate) >= 0.005) . = 1 break diff --git a/code/modules/atmospherics/zas/Airflow.dm b/code/modules/atmospherics/zas/Airflow.dm index 48eb53dc452..3494fa1aa20 100644 --- a/code/modules/atmospherics/zas/Airflow.dm +++ b/code/modules/atmospherics/zas/Airflow.dm @@ -123,7 +123,7 @@ mob/living/carbon/human/airflow_hit(atom/A) if (prob(33)) loc:add_blood(src) bloody_body(src) - GET_VSC_PRO(atmos_vsc, /atmos/airflow/impact_damage, impact_damage) + GET_VSC_PROP(atmos_vsc, /atmos/airflow/impact_damage, impact_damage) var/b_loss = airflow_speed * impact_damage var/blocked = run_armor_check(BP_HEAD,"melee") @@ -141,10 +141,10 @@ mob/living/carbon/human/airflow_hit(atom/A) GET_VSC_PROP(atmos_vsc, /atmos/airflow/impact_stun, impact_stun) if(airflow_speed > 10) - Paralyse(round(airflow_speed * vsc.impact_stun)) + Paralyse(round(airflow_speed * impact_stun)) Stun(paralysis + 3) else - Stun(round(airflow_speed * vsc.impact_stun/2)) + Stun(round(airflow_speed * impact_stun/2)) . = ..() zone/proc/movables() diff --git a/code/modules/atmospherics/zas/Diagnostic.dm b/code/modules/atmospherics/zas/Diagnostic.dm index 83537b8575e..37873d2b605 100644 --- a/code/modules/atmospherics/zas/Diagnostic.dm +++ b/code/modules/atmospherics/zas/Diagnostic.dm @@ -94,7 +94,7 @@ client/proc/Test_ZAS_Connection(var/turf/simulated/T as turf) else to_chat(mob, "both turfs can merge.") -client/proc/ZASSettings() +/client/proc/ZASSettings() set category = "Debug" - vsc.SetDefault(mob) + atmos_vsc.request_and_set_preset(mob) diff --git a/vorestation.dme b/vorestation.dme index 3404e42f280..068eb4de942 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -66,7 +66,6 @@ #include "code\__DEFINES\objects.dm" #include "code\__DEFINES\parameters_world.dm" #include "code\__DEFINES\planets.dm" -#include "code\__DEFINES\process_scheduler.dm" #include "code\__DEFINES\qdel.dm" #include "code\__DEFINES\research.dm" #include "code\__DEFINES\roguemining_vr.dm"