shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6609 from Citadel-Station-13/upstream-merge-37584

Browse Source 
[MIRROR] Readds missing nuked narsie cinematic.
This commit is contained in:
deathride58
2018-05-02 01:30:19 +00:00
committed by GitHub
parent a84f5c5328 1398225044
commit 5c40a38457
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/power/singularity/narsie.dm
View File

@@ -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)