From 7181e4f01b6d560eca01e814379766dc1c2dc39e Mon Sep 17 00:00:00 2001 From: "n3ophyt3@gmail.com" Date: Sun, 26 Sep 2010 05:15:11 +0000 Subject: [PATCH] Fixed nuke rounds not ending if the nuke isn't detonated. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@176 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/gamemodes/gameticker.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 738a4a3ba3e..51001f9f6c5 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -142,7 +142,13 @@ var/global/datum/controller/gameticker/ticker spawn declare_completion() - if(ticker.mode.name != "nuclear emergency") + var/noboom = 0 + if(ticker.mode.name == "nuclear emergency") + var/datum/game_mode/nuclear/bam = ticker.mode + if (bam.nuke_detonated == 0) + noboom = 1 + + if(ticker.mode.name != "nuclear emergency" || noboom) spawn(50) world << "\blue Restarting in 25 seconds"