From 346819e30c4e4b94de6871d4441b52c06995e770 Mon Sep 17 00:00:00 2001 From: AnturK Date: Tue, 1 May 2018 18:04:55 +0200 Subject: [PATCH] Readds missing nuked narsie cinematic. (#37584) --- code/__DEFINES/cinematics.dm | 3 ++- code/datums/cinematic.dm | 11 +++++++++++ code/modules/power/singularity/narsie.dm | 5 ++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/cinematics.dm b/code/__DEFINES/cinematics.dm index 22e0943802c..aa19ffb4cf1 100644 --- a/code/__DEFINES/cinematics.dm +++ b/code/__DEFINES/cinematics.dm @@ -9,4 +9,5 @@ #define CINEMATIC_NUKE_FAKE 9 #define CINEMATIC_NUKE_NO_CORE 10 #define CINEMATIC_NUKE_FAR 11 -#define CINEMATIC_NUKE_CLOWNOP 12 \ No newline at end of file +#define CINEMATIC_NUKE_CLOWNOP 12 +#define CINEMATIC_CULT_NUKE 13 \ No newline at end of file diff --git a/code/datums/cinematic.dm b/code/datums/cinematic.dm index f5d65df110e..ecb5b785bb9 100644 --- a/code/datums/cinematic.dm +++ b/code/datums/cinematic.dm @@ -168,6 +168,17 @@ GLOBAL_LIST_EMPTY(cinematics) sleep(70) special() +/datum/cinematic/cult_nuke + id = CINEMATIC_CULT_NUKE + +/datum/cinematic/cult_nuke/content() + flick("intro_nuke",screen) + sleep(35) + flick("station_explode_fade_red",screen) + cinematic_sound(sound('sound/effects/explosion_distant.ogg')) + special() + screen.icon_state = "summary_cult" + /datum/cinematic/nuke_annihilation id = CINEMATIC_ANNIHILATION diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm index dc6c1c649ae..7f40f819030 100644 --- a/code/modules/power/singularity/narsie.dm +++ b/code/modules/power/singularity/narsie.dm @@ -91,7 +91,10 @@ SSticker.force_ending = 1 /proc/cult_ending_helper(var/no_explosion = 0) - Cinematic(CINEMATIC_CULT,world,CALLBACK(GLOBAL_PROC,.ending_helper)) + if(no_explosion) + Cinematic(CINEMATIC_CULT,world,CALLBACK(GLOBAL_PROC,/proc/ending_helper)) + else + Cinematic(CINEMATIC_CULT_NUKE,world,CALLBACK(GLOBAL_PROC,/proc/ending_helper)) //ATTACK GHOST IGNORING PARENT RETURN VALUE /obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)