Updated to 514.

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"))

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))

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

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")()