From 9fa59ce3931a2354066c516ca05c09fcd17effd6 Mon Sep 17 00:00:00 2001 From: Shadowlight213 Date: Wed, 1 Jun 2016 07:44:18 -0700 Subject: [PATCH 1/2] makes safety only set level if it's stopping a timer --- code/game/gamemodes/nuclear/nuclearbomb.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index d6c783a5413..c4d4936c44b 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -309,9 +309,10 @@ var/bomb_set /obj/machinery/nuclearbomb/proc/set_safety() safety = !safety if(safety) + if(timing) + set_security_level(previous_level) timing = 0 bomb_set = 0 - set_security_level(previous_level) update_icon() /obj/machinery/nuclearbomb/proc/set_active() From 72d2e14d22a4713167b9f07ebc5c3b87120ee157 Mon Sep 17 00:00:00 2001 From: Shadowlight213 Date: Wed, 1 Jun 2016 07:52:59 -0700 Subject: [PATCH 2/2] Fixes some other ways the sec level could get stuck or the bomb stuck on possibly. --- code/game/gamemodes/nuclear/nuclearbomb.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index c4d4936c44b..27987aa8c26 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -316,12 +316,12 @@ var/bomb_set update_icon() /obj/machinery/nuclearbomb/proc/set_active() - if(safety) + if(safety && !bomb_set) usr << "The safety is still on." return timing = !timing - previous_level = get_security_level() if(timing) + previous_level = get_security_level() bomb_set = 1 set_security_level("delta") else