Skip to content

Commit d9c07d2

Browse files
authored
you look at your ARM and sigh (#7532)
enable debugging being called twice specifically on my system (apparently adri and CI/CD and the actual fucking server doesn't give a shit) explodes DD yay.
1 parent 9236efb commit d9c07d2

File tree

6 files changed

+11
-57
lines changed

6 files changed

+11
-57
lines changed

citadel.dme

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "_mapload\_basemap.dm"
2323
#include "code\___compile_options.dm"
2424
#include "code\__byond_version_compat.dm"
25-
#include "code\__global_init.dm"
2625
#include "code\_macros.dm"
2726
#include "code\global.dm"
2827
#include "code\world.dm"
@@ -748,7 +747,6 @@
748747
#include "code\controllers\toml_config\entries\backend.dm"
749748
#include "code\controllers\toml_config\entries\game-movement.dm"
750749
#include "code\controllers\toml_config\entries\game.dm"
751-
#include "code\controllers\world\world_debug_enabler.dm"
752750
#include "code\controllers\world\world_init_options.dm"
753751
#include "code\controllers\world\world_log_shunter.dm"
754752
#include "code\datums\ability.dm"

code/__global_init.dm

Lines changed: 0 additions & 33 deletions
This file was deleted.

code/controllers/world/world_debug_enabler.dm

Lines changed: 0 additions & 17 deletions
This file was deleted.

code/controllers/world/world_init_options.dm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
GLOBAL_REAL(world_init_options, /datum/world_init_options)
2+
13
/datum/world_init_options
24
/**
35
* If enabled, will force only loading the given station map and nothing else.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
GLOBAL_REAL(world_log_shunter, /datum/world_log_shunter)
2+
GLOBAL_REAL_VAR(world_log_shunter_active) = FALSE
3+
14
/datum/world_log_shunter/New()
25
world.ensure_logging_active()

code/game/world.dm

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ GLOBAL_LIST(topic_status_cache)
4747
* SO HELP ME GOD IF I FIND ABSTRACTION LAYERS OVER THIS!
4848
*/
4949
/world/proc/Genesis(tracy_initialized = FALSE)
50-
RETURN_TYPE(/datum/controller/master)
51-
5250
if(!tracy_initialized)
5351
Tracy = new
5452
#ifdef USE_BYOND_TRACY
@@ -68,6 +66,12 @@ GLOBAL_LIST(topic_status_cache)
6866
return
6967
#endif
7068

69+
// Init the debugger first because are you insane ofcourse you initialize the DEBUGGER first
70+
global.Debugger = new
71+
// Logs and shit
72+
global.world_log_shunter = new
73+
global.world_init_options = new
74+
7175
Profile(PROFILE_RESTART)
7276
Profile(PROFILE_RESTART, type = "sendmaps")
7377

@@ -76,9 +80,6 @@ GLOBAL_LIST(topic_status_cache)
7680
// citadel edit: world runtime log removed due to world.log shunt doing that for us
7781
GLOB.config_error_log = GLOB.world_href_log = GLOB.world_map_error_log = GLOB.world_attack_log = GLOB.world_game_log = tempfile
7882

79-
// Init the debugger first so we can debug Master
80-
Debugger = new
81-
8283
// THAT'S IT, WE'RE DONE, THE. FUCKING. END.
8384
Master = new
8485

0 commit comments

Comments
 (0)