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

[MIRROR] 150 hours of testing (fixes master) (#889)

Browse Source 
* 150 hours of testing (fixes master)

* Update gang.dm

* Delete gang.dm.rej
This commit is contained in:
CitadelStationBot
2017-05-10 18:10:38 -05:00
committed by kevinz000
parent 69d72877a2
commit 71a36f1606
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/gang/gang.dm
+2 -1
View File
@@ -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