From 716f8eea98f897694e1305bb4964ba45f4692813 Mon Sep 17 00:00:00 2001 From: FlavoredCactus Date: Tue, 16 Feb 2016 21:16:54 -0500 Subject: [PATCH] Fixes rev not working (for real this time) --- code/game/gamemodes/revolution/revolution.dm | 2 +- code/game/gameticker.dm | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index b6ace73c6..5f3b3c05e 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -81,7 +81,7 @@ for (var/i=1 to max_headrevs) if (antag_candidates.len==0) break - if (head_revolutionaries >= head_check) + if (head_revolutionaries.len >= head_check) break var/datum/mind/lenin = pick(antag_candidates) antag_candidates -= lenin diff --git a/code/game/gameticker.dm b/code/game/gameticker.dm index 96274f28c..99e198757 100644 --- a/code/game/gameticker.dm +++ b/code/game/gameticker.dm @@ -110,9 +110,12 @@ var/global/last_tick_duration = 0 if(!Debug2) if(!can_continue) + var/logged_mode = mode.name del(mode) current_state = GAME_STATE_PREGAME world << "Error setting up [master_mode]. Reverting to pre-game lobby." + message_admins("\blue Error setting up [logged_mode].", 1) + log_game("\blue Error setting up [logged_mode].") job_master.ResetOccupations() return 0 else