From 95dad15410d5a4d03f2eeb665982fcf6a9083f03 Mon Sep 17 00:00:00 2001 From: Cameron! Date: Tue, 8 Feb 2022 16:22:27 -0500 Subject: [PATCH] Wrench interactions with closets migrated to wrench_act_secondary (#64724) Backend cleanup of the code involving anchoring and unanchoring lockers. Moved feedback to balloon alerts as well. --- .../structures/crates_lockers/closets.dm | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 60bb092d63c..a1aeaa0ad5e 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -409,14 +409,6 @@ span_hear("You hear welding.")) log_game("[key_name(user)] [welded ? "welded":"unwelded"] closet [src] with [W] at [AREACOORD(src)]") update_appearance() - else if(W.tool_behaviour == TOOL_WRENCH && anchorable) - if(isinspace() && !anchored) - return - set_anchored(!anchored) - W.play_tool_sound(src, 75) - user.visible_message(span_notice("[user] [anchored ? "anchored" : "unanchored"] \the [src] [anchored ? "to" : "from"] the ground."), \ - span_notice("You [anchored ? "anchored" : "unanchored"] \the [src] [anchored ? "to" : "from"] the ground."), \ - span_hear("You hear a ratchet.")) else if (can_install_electronics && istype(W, /obj/item/electronics/airlock)\ && !secure && !electronics && !locked && (welded || !can_weld_shut) && !broken) user.visible_message(span_notice("[user] installs the electronics into the [src]."),\ @@ -470,6 +462,18 @@ else return FALSE +/obj/structure/closet/wrench_act_secondary(mob/living/user, obj/item/tool) + if(!anchorable) + balloon_alert(user, "no anchor bolts!") + return TRUE + if(isinspace() && !anchored) // We want to prevent anchoring a locker in space, but we should still be able to unanchor it there + balloon_alert(user, "nothing to anchor to!") + return TRUE + set_anchored(!anchored) + tool.play_tool_sound(src, 75) + user.balloon_alert_to_viewers("[anchored ? "anchored" : "unanchored"]") + return TRUE + /obj/structure/closet/proc/after_weld(weld_state) return