From 7a3fb9e62e5157e6094fbda0f8553cd4ca39a61e Mon Sep 17 00:00:00 2001 From: Poojawa Date: Sun, 21 May 2017 01:05:10 -0500 Subject: [PATCH] update ticker.dm --- code/controllers/subsystem/ticker.dm | 11 ++++++----- code/world.dm | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index dcde132aad..a54c74966a 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -810,11 +810,12 @@ SUBSYSTEM_DEF(ticker) timeLeft = newtime /datum/controller/subsystem/ticker/proc/load_mode() - var/list/Lines = world.file2list("data/mode.txt") - if(Lines.len) - if(Lines[1]) - GLOB.master_mode = Lines[1] - GLOB.world_game_log << "Saved mode is '[GLOB.master_mode]'" + var/mode = trim(file2text("data/mode.txt")) + if(mode) + GLOB.master_mode = mode + else + GLOB.master_mode = "extended" + log_game("Saved mode is '[GLOB.master_mode]'") /datum/controller/subsystem/ticker/proc/save_mode(the_mode) var/F = file("data/mode.txt") diff --git a/code/world.dm b/code/world.dm index 6353fd644a..49427a9a21 100644 --- a/code/world.dm +++ b/code/world.dm @@ -32,6 +32,7 @@ load_motd() load_admins() + load_mentors() load_menu() if(config.usewhitelist) load_whitelist()