From 7d8f17610e5f5ee33e2cd192f72ca3960215f4c5 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Sun, 16 May 2021 09:16:34 -0400 Subject: [PATCH] For conflicting stuff --- code/game/gamemodes/nuclear/nuclearbomb.dm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index ce2a834ecc6..a1aa14dd92b 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -19,6 +19,7 @@ GLOBAL_VAR(bomb_set) icon_state = "nuclearbomb0" density = 1 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF + anchored = TRUE var/extended = FALSE var/lighthack = FALSE var/timeleft = 120 @@ -44,6 +45,10 @@ GLOBAL_VAR(bomb_set) /obj/machinery/nuclearbomb/syndicate is_syndicate = TRUE +/obj/machinery/nuclearbomb/undeployed + extended = FALSE + anchored = FALSE + /obj/machinery/nuclearbomb/Initialize() . = ..() r_code = rand(10000, 99999.0) // Creates a random code upon object spawn. @@ -350,11 +355,6 @@ GLOBAL_VAR(bomb_set) else code = "ERROR" return - - if(!yes_code) // All requests below here require both NAD inserted AND code correct - return - - switch(action) if("toggle_anchor") if(removal_stage == NUKE_MOBILE) anchored = FALSE @@ -369,6 +369,11 @@ GLOBAL_VAR(bomb_set) else visible_message("The anchoring bolts slide back into the depths of [src].") return + + if(!yes_code) // All requests below here require both NAD inserted AND code correct + return + + switch(action) if("set_time") var/time = input(usr, "Detonation time (seconds, min 120, max 600)", "Input Time", 120) as num|null if(time)