Purged extools

Watermelon914 · Nov 12, 2020 · 8da8d3e · 8da8d3e
1 parent ad0761f
commit 8da8d3e
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 233 deletions.
diff --git a/ColonialMarinesALPHA.dme b/ColonialMarinesALPHA.dme
@@ -20,7 +20,6 @@
 #include "code\__DEFINES\__rust_g.config.dm"
 #include "code\__DEFINES\__rust_g.dm"
 #include "code\__DEFINES\__spacemandmm.dm"
-#include "code\__DEFINES\_extools_api.dm"
 #include "code\__DEFINES\_globals.dm"
 #include "code\__DEFINES\_macros.dm"
 #include "code\__DEFINES\_math.dm"
@@ -59,7 +58,6 @@
 #include "code\__DEFINES\pain.dm"
 #include "code\__DEFINES\qdel.dm"
 #include "code\__DEFINES\skills.dm"
-#include "code\__DEFINES\socket.dm"
 #include "code\__DEFINES\sounds.dm"
 #include "code\__DEFINES\stamina.dm"
 #include "code\__DEFINES\STUI.dm"

diff --git a/byond-extools.dll b/byond-extools.dll
diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm
@@ -3,6 +3,8 @@
 #define DEBUG 0
 #define NO_FLAGS 0 // To make it even more clear that something is a bitfield
 
+#define GLOBAL_PROC		"magic BS"
+
 //Game defining directives.
 #define SURFACE_Z_LEVELS list(1)
 #define SURFACE_Z_LEVEL 1 // The planet/colony itself

diff --git a/code/__DEFINES/_extools_api.dm b/code/__DEFINES/_extools_api.dm
diff --git a/code/__DEFINES/_tick.dm b/code/__DEFINES/_tick.dm
@@ -1,10 +1,6 @@
-/// 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)
 /// 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))
+#define TICK_LIMIT_RUNNING 80
 /// Tick limit used to resume things in stoplag
 #define TICK_LIMIT_TO_RUN 70
 /// Tick limit for MC while running

diff --git a/code/__DEFINES/socket.dm b/code/__DEFINES/socket.dm
diff --git a/code/controllers/mc/master.dm b/code/controllers/mc/master.dm
@@ -607,7 +607,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	if(!statclick)
 		statclick = new/obj/effect/statclick/debug(null, "Initializing...", src)
 
-	stat("Byond:", "(FPS:[world.fps]) (TickCount:[world.time/world.tick_lag]) (TickDrift:[round(Master.tickdrift,1)]([round((Master.tickdrift/(world.time/world.tick_lag))*100,0.1)]%)) (Internal Tick Usage: [round(MAPTICK_LAST_INTERNAL_TICK_USAGE,0.1)]%)")
+	stat("Byond:", "(FPS:[world.fps]) (TickCount:[world.time/world.tick_lag]) (TickDrift:[round(Master.tickdrift,1)]([round((Master.tickdrift/(world.time/world.tick_lag))*100,0.1)]%))")
 	stat("Master Controller:", statclick.update("(TickRate:[Master.processing]) (Iteration:[Master.iteration]) (TickLimit: [round(Master.current_ticklimit, 0.1)])"))
 
 

diff --git a/code/game/world.dm b/code/game/world.dm
@@ -20,8 +20,6 @@ var/internal_tick_usage = 0
 
 /world/New()
 	internal_tick_usage = 0.2 * world.tick_lag
-	extools_initialize()
-	maptick_initialize()
 	hub_password = "[config.hub_password]"
 
 	//logs