From 5f8c6dfd9a55b7a3ff9efe36c7a0aae8d01f3178 Mon Sep 17 00:00:00 2001 From: Mloc-Argent Date: Mon, 7 Apr 2014 19:42:06 +0100 Subject: [PATCH] voting: failed gamemode votes will undelay too Moved the undelay code in voting.dm out of the success check, as failures should get undelayed too. Signed-off-by: Mloc-Argent --- code/controllers/voting.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm index 8b1f719bc1..ef1e41dd53 100644 --- a/code/controllers/voting.dm +++ b/code/controllers/voting.dm @@ -163,13 +163,14 @@ datum/controller/vote restart = 1 else master_mode = . - if(!going) - going = 1 - world << "The round will start soon." if("crew_transfer") if(. == "Initiate Crew Transfer") init_shift_change(null, 1) + if(mode == "gamemode") //fire this even if the vote fails. + if(!going) + going = 1 + world << "The round will start soon." if(restart) world << "World restarting due to vote..."