From 64c4a618199f48dbccbc89dc02ea66c538fcb3d7 Mon Sep 17 00:00:00 2001
From: xxalpha <xxnoob@live.com>
Date: Thu, 11 Jun 2015 21:24:35 +0100
Subject: [PATCH] Added animation for no nuke explosion.

---
 code/controllers/subsystem/ticker.dm       | 9 +++++++++
 code/game/gamemodes/nuclear/nuclearbomb.dm | 9 ++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 4d80d74daae..b6595708a99 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -271,6 +271,15 @@ var/datum/subsystem/ticker/ticker
 					flick("station_explode_fade_red",cinematic)
 					world << sound('sound/effects/explosionfar.ogg')
 					cinematic.icon_state = "summary_selfdes"
+				if("no_core") //Nuke failed to detonate as it had no core
+					flick("intro_nuke",cinematic)
+					sleep(35)
+					flick("station_intact",cinematic)
+					world << sound('sound/ambience/signal.ogg')
+					sleep(100)
+					if(cinematic)	del(cinematic)
+					if(temp_buckle)	del(temp_buckle)
+					return	//Faster exit, since nothing happened
 				else //Station nuked (nuke,explosion,summary)
 					flick("intro_nuke",cinematic)
 					sleep(35)
diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index 71464773568..840838a6042 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -190,7 +190,7 @@ var/bomb_set
 	overlays += panel
 
 /obj/machinery/nuclearbomb/process()
-	if (timing)
+	if (timing > 0)
 		bomb_set = 1 //So long as there is one nuke timing, it means one nuke is armed.
 		timeleft--
 		if (timeleft <= 0)
@@ -388,6 +388,13 @@ var/bomb_set
 		yes_code = 0
 		safety = 1
 		update_icon()
+		for(var/mob/M in player_list)
+			M << 'sound/machines/Alarm.ogg'
+		if(ticker && ticker.mode)
+			ticker.mode.explosion_in_progress = 1
+			sleep(100)
+			ticker.station_explosion_cinematic(3,"no_core")
+			ticker.mode.explosion_in_progress = 0
 
 /*
 This is here to make the tiles around the station mininuke change when it's armed.