From a7b94fcdf90093b2e0738d329a0ebd01df991b8b Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Thu, 13 Apr 2017 21:54:21 +0100 Subject: [PATCH] Fixes ops not exploding on death if their manual trigger window is open --- code/game/objects/items/weapons/implants/implant_explosive.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/implants/implant_explosive.dm b/code/game/objects/items/weapons/implants/implant_explosive.dm index ad7079fee1c..369effbe7c4 100644 --- a/code/game/objects/items/weapons/implants/implant_explosive.dm +++ b/code/game/objects/items/weapons/implants/implant_explosive.dm @@ -31,7 +31,7 @@ /obj/item/weapon/implant/explosive/activate(cause) if(!cause || !imp_in || active) return 0 - if(cause == "action_button" || !popup) + if(cause == "action_button" && !popup) popup = TRUE var/response = alert(imp_in, "Are you sure you want to activate your [name]? This will cause you to explode!", "[name] Confirmation", "Yes", "No") popup = FALSE