diff --git a/code/controllers/master.dm b/code/controllers/master.dm index a6026823ec9..fea79c2f7a5 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -62,10 +62,6 @@ GLOBAL_REAL(Master, /datum/controller/master) = new var/static/current_ticklimit = TICK_LIMIT_RUNNING /datum/controller/master/New() - //temporary file used to record errors with loading config, moved to log directory once logging is set up - GLOB.config_error_log = GLOB.world_game_log = GLOB.world_runtime_log = "data/logs/config_error.log" - load_configuration() - // Highlander-style: there can only be one! Kill off the old and replace it with the new. if(!random_seed) random_seed = rand(1, 1e9) @@ -73,6 +69,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new var/list/_subsystems = list() subsystems = _subsystems + // Highlander-style: there can only be one! Kill off the old and replace it with the new. if(Master != src) if(istype(Master)) Recover() diff --git a/code/game/world.dm b/code/game/world.dm index 762a0be70a8..174a1662dd0 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -3,6 +3,10 @@ GLOBAL_LIST_INIT(map_transition_config, MAP_TRANSITION_CONFIG) /world/New() + //temporary file used to record errors with loading config, moved to log directory once logging is set up + GLOB.config_error_log = GLOB.world_game_log = GLOB.world_runtime_log = "data/logs/config_error.log" + load_configuration() + // Setup all log paths and stamp them with startups SetupLogs() enable_debugger() // Enable the extools debugger log_world("World loaded at [time_stamp()]")