From eeb8f7054cbf4aafce75189597c3914c2a3268fa Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Fri, 23 Jul 2021 14:36:18 -0400 Subject: [PATCH] Order tweaks, removal of duplicate --- code/game/gamemodes/nuclear/nuclearbomb.dm | 29 +++++------ code/game/objects/items/theft_items.dm | 46 +++++++----------- code/game/objects/items/tools/screwdriver.dm | 1 + code/modules/power/supermatter/supermatter.dm | 8 +-- icons/obj/nuke_tools.dmi | Bin 5507 -> 5343 bytes 5 files changed, 35 insertions(+), 49 deletions(-) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index db03ffe306d..b03a5d10fdf 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -29,13 +29,13 @@ GLOBAL_VAR(bomb_set) var/yes_code = FALSE var/safety = TRUE var/obj/item/disk/nuclear/auth = null - var/removal_stage = NUKE_INTACT var/obj/item/nuke_core/plutonium/core = null var/lastentered var/is_syndicate = FALSE use_power = NO_POWER_USE var/previous_level = "" var/datum/wires/nuclearbomb/wires = null + var/removal_stage = NUKE_INTACT ///The same state removal stage is, until someone opens the panel of the nuke. This way we can have someone open the front of the nuke, while keeping track of where in the world we are on the anchoring bolts. var/anchor_stage = NUKE_INTACT ///This is so that we can check if the internal components are sealed up properly when the outer hatch is closed. @@ -252,21 +252,18 @@ GLOBAL_VAR(bomb_set) attack_hand(user) /obj/machinery/nuclearbomb/attack_hand(mob/user as mob) - if(panel_open) - if(removal_stage == NUKE_CORE_FULLY_EXPOSED && core) - if(timing) //removing the core is less risk then cutting wires, and doesnt take long, so we should not let crew do it while the nuke is armed. You can however get to it, without the special screwdriver, if you put the NAD in. - to_chat(user, "[core] won't budge, metal clamps keep it in!") - return - user.visible_message("[user] starts to pull [core] out of [src]!", "You start to pull [core] out of [src]!") - if(do_after(user, 5 SECONDS, target = src)) - user.visible_message("[user] pulls [core] out of [src]!", "You pull [core] out of [src]! Might want to put it somewhere safe.") - core.forceMove(loc) - core = null - - else - wires.Interact(user) - else - ui_interact(user) + if(!panel_open) + return ui_interact(user) + if(removal_stage != NUKE_CORE_FULLY_EXPOSED || !core) + return wires.Interact(user) + if(timing) //removing the core is less risk then cutting wires, and doesnt take long, so we should not let crew do it while the nuke is armed. You can however get to it, without the special screwdriver, if you put the NAD in. + to_chat(user, "[core] won't budge, metal clamps keep it in!") + return + user.visible_message("[user] starts to pull [core] out of [src]!", "You start to pull [core] out of [src]!") + if(do_after(user, 5 SECONDS, target = src)) + user.visible_message("[user] pulls [core] out of [src]!", "You pull [core] out of [src]! Might want to put it somewhere safe.") + core.forceMove(loc) + core = null /obj/machinery/nuclearbomb/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) diff --git a/code/game/objects/items/theft_items.dm b/code/game/objects/items/theft_items.dm index 70806866e07..4fa99055e59 100644 --- a/code/game/objects/items/theft_items.dm +++ b/code/game/objects/items/theft_items.dm @@ -57,13 +57,12 @@ /obj/item/nuke_core_container/proc/load(obj/item/nuke_core/plutonium/new_core, mob/user) if(core || !istype(new_core)) - return FALSE + return new_core.forceMove(src) core = new_core icon_state = "core_container_loaded" to_chat(user, "Container is sealing...") addtimer(CALLBACK(src, .proc/seal), 10 SECONDS) - return TRUE /obj/item/nuke_core_container/proc/seal() if(!QDELETED(core)) @@ -83,16 +82,6 @@ else load(core, user) -//snowflake screwdriver, works as a key to start nuke theft, traitor only -/obj/item/screwdriver/nuke - name = "screwdriver" - desc = "A screwdriver with an ultra thin tip that's carefully designed to boost screwing speed." - icon = 'icons/obj/nuke_tools.dmi' - icon_state = "screwdriver_nuke" - item_state = "screwdriver_nuke" - toolspeed = 0.5 - random_color = FALSE - /obj/item/paper/guides/antag/nuke_instructions info = "How to break into a Nanotrasen nuclear device and remove its plutonium core:
\