From 71a36f16060a8b0ef4c321b653859df064b83ebc Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 10 May 2017 18:10:38 -0500 Subject: [PATCH] [MIRROR] 150 hours of testing (fixes master) (#889) * 150 hours of testing (fixes master) * Update gang.dm * Delete gang.dm.rej --- code/game/gamemodes/gang/gang.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index a8a1548254..12191ac44a 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -312,8 +312,9 @@ GLOBAL_LIST_INIT(gang_colors_pool, list("red","orange","yellow","green","blue"," G.domination(0.5) priority_announce("Multiple station takeover attempts have made simultaneously. Conflicting takeover attempts appears to have restarted.","Network Alert") else + var/datum/gang/G = winners[1] G.is_dominating = FALSE SSticker.mode.explosion_in_progress = 1 SSticker.station_explosion_cinematic(1,"gang war", null) SSticker.mode.explosion_in_progress = 0 - SSticker.force_ending = pick(winners) + SSticker.force_ending = TRUE