diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 8c8583cd28d..3e36e2aec16 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -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) diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index b9ee7887e88..a0373cc04dc 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -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) \ No newline at end of file diff --git a/code/modules/admin/verbs/cinematic.dm b/code/modules/admin/verbs/cinematic.dm index dce6bbf8659..107c5310770 100644 --- a/code/modules/admin/verbs/cinematic.dm +++ b/code/modules/admin/verbs/cinematic.dm @@ -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) diff --git a/icons/effects/station_explosion.dmi b/icons/effects/station_explosion.dmi index 6ce74dbb36d..7dcab377107 100644 Binary files a/icons/effects/station_explosion.dmi and b/icons/effects/station_explosion.dmi differ