From ca54747be7c5196a1f98ac963785eab523e39ac4 Mon Sep 17 00:00:00 2001 From: Incoming Date: Mon, 2 Mar 2015 18:30:57 -0500 Subject: [PATCH] Fixes mulligan'd rounds from never ending because the shuttle was set to strand still WHOOPS --- code/game/gamemodes/game_mode.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 0f776f289b1..4940484f902 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -97,6 +97,8 @@ for(var/datum/game_mode/G in runnable_modes) if(!G.reroll_friendly) del(G) + SSshuttle.emergencyNoEscape = 0 //Time to get the fuck out of here + if(!runnable_modes) return 0 var/list/datum/game_mode/replacementmode = pickweight(runnable_modes)