From 165cdbf040227761514e9fe5287fe2d5ab26536e Mon Sep 17 00:00:00 2001 From: Putnam Date: Wed, 20 Jan 2021 18:36:45 -0800 Subject: [PATCH] Makes it compile. --- code/__DEFINES/subsystems.dm | 11 ----------- code/controllers/subsystem/time_track.dm | 20 ++++++++++++-------- tgstation.dme | 21 +++++++++++---------- 3 files changed, 23 insertions(+), 29 deletions(-) diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 6b9fbef739..bfa5e754b2 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -241,14 +241,3 @@ * * flags flags for this timer, see: code\__DEFINES\subsystems.dm */ #define addtimer(args...) _addtimer(args, file = __FILE__, line = __LINE__) - -// SSair run section -#define SSAIR_PIPENETS 1 -#define SSAIR_ATMOSMACHINERY 2 -#define SSAIR_EXCITEDGROUPS 3 -#define SSAIR_HIGHPRESSURE 4 -#define SSAIR_HOTSPOTS 5 -#define SSAIR_SUPERCONDUCTIVITY 6 -#define SSAIR_REBUILD_PIPENETS 7 -#define SSAIR_EQUALIZE 8 -#define SSAIR_ACTIVETURFS 9 diff --git a/code/controllers/subsystem/time_track.dm b/code/controllers/subsystem/time_track.dm index 8a0a351d48..4ef740ce8e 100644 --- a/code/controllers/subsystem/time_track.dm +++ b/code/controllers/subsystem/time_track.dm @@ -31,18 +31,20 @@ SUBSYSTEM_DEF(time_track) "maptick", "num_timers", "air_turf_cost", + "air_turf_thread_time", + "air_equalize_cost", + "air_post_process_cost", "air_eg_cost", "air_highpressure_cost", "air_hotspots_cost", - "air_superconductivity_cost", + "air_heat_spread_cost", "air_pipenets_cost", "air_rebuilds_cost", - "air_turf_count", - "air_eg_count", + "air_amt_gas_mixes", + "air_alloc_gas_mixes", "air_hotspot_count", "air_network_count", "air_delta_count", - "air_superconductive_count" ) ) @@ -81,17 +83,19 @@ SUBSYSTEM_DEF(time_track) MAPTICK_LAST_INTERNAL_TICK_USAGE, length(SStimer.timer_id_dict), SSair.cost_turfs, + SSair.turf_process_time(), + SSair.cost_equalize, + SSair.cost_post_process, SSair.cost_groups, SSair.cost_highpressure, SSair.cost_hotspots, SSair.cost_superconductivity, SSair.cost_pipenets, SSair.cost_rebuilds, - SSair.get_active_turfs(), //does not return a list, which is what we want - SSair.get_amt_excited_groups(), + SSair.get_amt_gas_mixes(), + SSair.get_max_gas_mixes(), length(SSair.hotspots), length(SSair.networks), - length(SSair.high_pressure_delta), - length(SSair.active_super_conductivity) + length(SSair.high_pressure_delta) ) ) diff --git a/tgstation.dme b/tgstation.dme index ed9ab353ea..c2692cf500 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -155,6 +155,7 @@ #include "code\__DEFINES\storage\_storage.dm" #include "code\__DEFINES\storage\volumetrics.dm" #include "code\__HELPERS\_cit_helpers.dm" +#include "code\__HELPERS\_extools_api.dm" #include "code\__HELPERS\_lists.dm" #include "code\__HELPERS\_logging.dm" #include "code\__HELPERS\_string_lists.dm" @@ -292,8 +293,8 @@ #include "code\controllers\configuration\entries\dynamic.dm" #include "code\controllers\configuration\entries\fail2topic.dm" #include "code\controllers\configuration\entries\game_options.dm" -#include "code\controllers\configuration\entries\general.dm" #include "code\controllers\configuration\entries\persistence.dm" +#include "code\controllers\configuration\entries\general.dm" #include "code\controllers\configuration\entries\plushies.dm" #include "code\controllers\configuration\entries\policy.dm" #include "code\controllers\configuration\entries\resources.dm" @@ -361,16 +362,16 @@ #include "code\controllers\subsystem\timer.dm" #include "code\controllers\subsystem\title.dm" #include "code\controllers\subsystem\traumas.dm" +#include "code\controllers\subsystem\persistence\_persistence.dm" +#include "code\controllers\subsystem\persistence\poly_parrot.dm" +#include "code\controllers\subsystem\persistence\trophies.dm" +#include "code\controllers\subsystem\persistence\secret_satchels.dm" +#include "code\controllers\subsystem\persistence\cleanable_debris.dm" +#include "code\controllers\subsystem\persistence\recent_votes_etc.dm" +#include "code\controllers\subsystem\persistence\panic_bunker.dm" #include "code\controllers\subsystem\vis_overlays.dm" #include "code\controllers\subsystem\vore.dm" #include "code\controllers\subsystem\vote.dm" -#include "code\controllers\subsystem\persistence\_persistence.dm" -#include "code\controllers\subsystem\persistence\cleanable_debris.dm" -#include "code\controllers\subsystem\persistence\panic_bunker.dm" -#include "code\controllers\subsystem\persistence\poly_parrot.dm" -#include "code\controllers\subsystem\persistence\recent_votes_etc.dm" -#include "code\controllers\subsystem\persistence\secret_satchels.dm" -#include "code\controllers\subsystem\persistence\trophies.dm" #include "code\controllers\subsystem\processing\chemistry.dm" #include "code\controllers\subsystem\processing\circuit.dm" #include "code\controllers\subsystem\processing\fastprocess.dm" @@ -585,6 +586,7 @@ #include "code\datums\diseases\advance\symptoms\sneeze.dm" #include "code\datums\diseases\advance\symptoms\species.dm" #include "code\datums\diseases\advance\symptoms\symptoms.dm" +#include "code\datums\elements\bed_tucking.dm" #include "code\datums\diseases\advance\symptoms\viral.dm" #include "code\datums\diseases\advance\symptoms\vision.dm" #include "code\datums\diseases\advance\symptoms\voice_change.dm" @@ -594,7 +596,6 @@ #include "code\datums\elements\_element.dm" #include "code\datums\elements\art.dm" #include "code\datums\elements\beauty.dm" -#include "code\datums\elements\bed_tucking.dm" #include "code\datums\elements\bsa_blocker.dm" #include "code\datums\elements\cleaning.dm" #include "code\datums\elements\decal.dm" @@ -2715,6 +2716,7 @@ #include "code\modules\mob\living\simple_animal\guardian\types\dextrous.dm" #include "code\modules\mob\living\simple_animal\guardian\types\explosive.dm" #include "code\modules\mob\living\simple_animal\guardian\types\fire.dm" +#include "code\modules\mob\living\simple_animal\hostile\bread.dm" #include "code\modules\mob\living\simple_animal\guardian\types\gravitokinetic.dm" #include "code\modules\mob\living\simple_animal\guardian\types\lightning.dm" #include "code\modules\mob\living\simple_animal\guardian\types\protector.dm" @@ -2725,7 +2727,6 @@ #include "code\modules\mob\living\simple_animal\hostile\banana_spider.dm" #include "code\modules\mob\living\simple_animal\hostile\bear.dm" #include "code\modules\mob\living\simple_animal\hostile\bees.dm" -#include "code\modules\mob\living\simple_animal\hostile\bread.dm" #include "code\modules\mob\living\simple_animal\hostile\carp.dm" #include "code\modules\mob\living\simple_animal\hostile\cat_butcher.dm" #include "code\modules\mob\living\simple_animal\hostile\dark_wizard.dm"