cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix nuke rounds not ending when nuke was disarmed (#39440)

Browse Source
This commit is contained in:
AnturK
2018-07-31 23:36:15 +02:00
committed by yogstation13-bot
parent 8a52653c0c
commit 129de6ea48
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/gamemodes/nuclear/nuclear.dm
View File

@@ -67,10 +67,9 @@
/datum/game_mode/nuclear/check_finished()
//Keep the round going if ops are dead but bomb is ticking.
if(nuke_team.operatives_dead())
var/obj/machinery/nuclearbomb/N
pass(N) //suppress unused warning
if(N.bomb_set) //snaaaaaaaaaake! It's not over yet!
return FALSE //its a static var btw
for(var/obj/machinery/nuclearbomb/N in GLOB.nuke_list)
if(N.proper_bomb && (N.timing || N.exploding))
return FALSE
return ..()
/datum/game_mode/nuclear/set_round_result()