From 4d7e1b32db13f73940aea7a0d3e3538d630d0ffa Mon Sep 17 00:00:00 2001 From: SandPoot Date: Wed, 13 Oct 2021 16:49:44 -0300 Subject: [PATCH] Update ticker.dm --- code/controllers/subsystem/ticker.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index b517c5867e..ff5539a2b1 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -186,6 +186,8 @@ SUBSYSTEM_DEF(ticker) send_gamemode_vote() else force_gamemode(CONFIG_GET(string/force_gamemode)) + if(GLOB.master_mode == "dynamic" && CONFIG_GET(flag/dynamic_voting)) + send_gamemode_vote() //countdown if(timeLeft < 0) return @@ -640,7 +642,7 @@ SUBSYSTEM_DEF(ticker) /datum/controller/subsystem/ticker/proc/load_mode() var/mode = trim(file2text("data/mode.txt")) if(mode) - GLOB.master_mode = "dynamic" + GLOB.master_mode = mode else GLOB.master_mode = GLOB.dynamic_forced_extended log_game("Saved mode is '[GLOB.master_mode]'")