Merge pull request #10918 from Ikarrus/gangending

Adds Ending Cinematic for Gang Dominations
This commit is contained in:
Jordie
2015-07-30 20:49:39 +10:00
4 changed files with 8 additions and 2 deletions
+3
View File
@@ -240,6 +240,9 @@ var/datum/subsystem/ticker/ticker
world << sound('sound/effects/explosionfar.ogg')
flick("station_intact_fade_red",cinematic)
cinematic.icon_state = "summary_nukefail"
if("gang war") //Gang Domination (just show the override screen)
cinematic.icon_state = "intro_malf_still"
flick("intro_malf",cinematic)
if("fake") //The round isn't over, we're just freaking people out for fun
flick("intro_nuke",cinematic)
sleep(35)
+4 -1
View File
@@ -308,4 +308,7 @@ var/list/gang_colors_pool = list("red","orange","yellow","green","blue","purple"
G.domination(0.5)
priority_announce("Multiple station takeover attempts have made simultaneously. Conflicting takeover attempts appears to have restarted.","Network Alert")
else
ticker.force_ending = pick(winners)
ticker.mode.explosion_in_progress = 1
ticker.station_explosion_cinematic(1)
ticker.mode.explosion_in_progress = 0
ticker.force_ending = pick(winners)
+1 -1
View File
@@ -10,7 +10,7 @@
var/override
switch(parameter)
if(1)
override = input(src,"mode = ?","Enter Parameter",null) as anything in list("nuclear emergency","no override")
override = input(src,"mode = ?","Enter Parameter",null) as anything in list("nuclear emergency","gang war","fake","no override")
if(0)
override = input(src,"mode = ?","Enter Parameter",null) as anything in list("blob","nuclear emergency","AI malfunction","no override")
ticker.station_explosion_cinematic(parameter,override)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 MiB

After

Width:  |  Height:  |  Size: 2.3 MiB