diff --git a/auxmaptick.dll b/auxmaptick.dll deleted file mode 100644 index 9718cf3035..0000000000 Binary files a/auxmaptick.dll and /dev/null differ diff --git a/auxmaptick.pdb b/auxmaptick.pdb deleted file mode 100644 index 62b9e2bd6b..0000000000 Binary files a/auxmaptick.pdb and /dev/null differ diff --git a/auxmos.dll b/auxmos.dll index e0a23a8e55..6422ddca5d 100644 Binary files a/auxmos.dll and b/auxmos.dll differ diff --git a/auxmos.pdb b/auxmos.pdb index 000fd981a9..0731f4e6ba 100644 Binary files a/auxmos.pdb and b/auxmos.pdb differ diff --git a/code/__DEFINES/_extools.dm b/code/__DEFINES/_extools.dm index 082184c9cc..281eabf374 100644 --- a/code/__DEFINES/_extools.dm +++ b/code/__DEFINES/_extools.dm @@ -1,3 +1,2 @@ #define EXTOOLS (world.system_type == MS_WINDOWS ? "byond-extools.dll" : "libbyond-extools.so") #define AUXMOS (world.system_type == MS_WINDOWS ? "auxmos.dll" : "libauxmos.so") -#define AUXMAPTICK ((world.system_type == MS_WINDOWS ? "auxmaptick.dll" : "libauxmaptick.so")) diff --git a/code/__DEFINES/_tick.dm b/code/__DEFINES/_tick.dm index fc6147c430..6fd22affd1 100644 --- a/code/__DEFINES/_tick.dm +++ b/code/__DEFINES/_tick.dm @@ -1,7 +1,7 @@ /// Percentage of tick to leave for master controller to run #define MAPTICK_MC_MIN_RESERVE 70 /// internal_tick_usage is updated every tick by extools -#define MAPTICK_LAST_INTERNAL_TICK_USAGE ((GLOB.internal_tick_usage / world.tick_lag) * 100) +#define MAPTICK_LAST_INTERNAL_TICK_USAGE ((world.map_cpu / world.tick_lag) * 100) /// Tick limit while running normally #define TICK_BYOND_RESERVE 2 #define TICK_LIMIT_RUNNING (max(100 - TICK_BYOND_RESERVE - MAPTICK_LAST_INTERNAL_TICK_USAGE, MAPTICK_MC_MIN_RESERVE)) diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm index a59ee9fcb0..47a4387233 100644 --- a/code/__HELPERS/_lists.dm +++ b/code/__HELPERS/_lists.dm @@ -586,7 +586,7 @@ used_key_list[input_key] = 1 return input_key -#if DM_VERSION > 513 +#if DM_VERSION > 514 #error Remie said that lummox was adding a way to get a lists #error contents via list.values, if that is true remove this #error otherwise, update the version and bug lummox diff --git a/code/game/world.dm b/code/game/world.dm index 01d0140d25..8ce9d34f4c 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -10,9 +10,6 @@ GLOBAL_LIST(topic_status_cache) //This happens after the Master subsystem new(s) (it's a global datum) //So subsystems globals exist, but are not initialised -/proc/initialize_maptick() - CRASH("Auxtools is not loaded!") - /world/New() var/debug_server = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL") if (debug_server) @@ -23,8 +20,6 @@ GLOBAL_LIST(topic_status_cache) enable_reference_tracking() #endif world.Profile(PROFILE_START) - AUXTOOLS_CHECK(AUXMAPTICK) - initialize_maptick() log_world("World loaded at [TIME_STAMP("hh:mm:ss", FALSE)]!") GLOB.config_error_log = GLOB.world_manifest_log = GLOB.world_pda_log = GLOB.world_job_debug_log = GLOB.sql_error_log = GLOB.world_href_log = GLOB.world_runtime_log = GLOB.world_attack_log = GLOB.world_game_log = "data/logs/config_error.[GUID()].log" //temporary file used to record errors with loading config, moved to log directory once logging is set bl @@ -282,7 +277,6 @@ GLOBAL_LIST(topic_status_cache) /world/Del() shutdown_logging() // makes sure the thread is closed before end, else we terminate AUXTOOLS_SHUTDOWN(AUXMOS) - AUXTOOLS_SHUTDOWN(AUXMAPTICK) var/debug_server = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL") if (debug_server) call(debug_server, "auxtools_shutdown")() diff --git a/tgstation.dme b/tgstation.dme index 36629b3ead..8bce8b0a17 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -293,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\persistence.dm" #include "code\controllers\configuration\entries\general.dm" +#include "code\controllers\configuration\entries\persistence.dm" #include "code\controllers\configuration\entries\plushies.dm" #include "code\controllers\configuration\entries\policy.dm" #include "code\controllers\configuration\entries\resources.dm" @@ -362,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" @@ -586,7 +586,6 @@ #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" @@ -596,6 +595,7 @@ #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" @@ -2717,7 +2717,6 @@ #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" @@ -2728,6 +2727,7 @@ #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"