Merge pull request #13760 from denghis1/bugfix_syndicate_bomb_defusal

bugfix syndicate bomb not triggering defuse properly
This commit is contained in:
Fox McCloud
2020-07-11 22:26:45 -04:00
committed by GitHub
2 changed files with 3 additions and 5 deletions
-1
View File
@@ -96,7 +96,6 @@
if(BOMB_WIRE_ACTIVATE)
if(!mended && B.active)
holder.visible_message("<span class='notice'>[bicon(B)] The timer stops! The bomb has been defused!</span>")
B.active = FALSE
B.defused = TRUE
B.update_icon()
..()
+3 -4
View File
@@ -77,11 +77,10 @@
update_icon()
try_detonate(TRUE)
//Counter terrorists win
else if(!active || defused)
if(defused && (payload in src))
else if(defused)
active = FALSE
if(payload in src)
payload.defuse()
countdown.stop()
STOP_PROCESSING(SSfastprocess, src)
/obj/machinery/syndicatebomb/New()
wires = new(src)