From 8074be3cdfec0a4714be036f85cf544b34de7213 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 17 Jan 2023 05:39:11 +0100 Subject: [PATCH] [MIRROR] Moves extinguisher cabinet open/close to right click [MDB IGNORE] (#18768) * Moves extinguisher cabinet open/close to right click (#72735) ## About The Pull Request Changes the open/close of extinguisher cabinets from AltClick() to attack_hand_secondary() to make it more intuitive to use ## Why It's Good For The Game If closing extinguisher cabinets is easier to do people will be more encouraged to clean up after themselves and put the extinguishers back. ## Changelog :cl: qol: Extinguisher cabiners are now opened and closed with right click instead of alt+click. /:cl: * Moves extinguisher cabinet open/close to right click Co-authored-by: Thunder12345 --- code/game/objects/structures/extinguisher.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 455f9f19fad..3fd7928b84a 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -93,6 +93,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/extinguisher_cabinet, 29) else toggle_cabinet(user) +/obj/structure/extinguisher_cabinet/attack_hand_secondary(mob/living/user) + if(!user.canUseTopic(src, be_close = TRUE, no_dexterity = TRUE, no_tk = FALSE, need_hands = TRUE)) + return ..() + toggle_cabinet(user) + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN /obj/structure/extinguisher_cabinet/attack_tk(mob/user) . = COMPONENT_CANCEL_ATTACK_CHAIN @@ -110,11 +115,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/extinguisher_cabinet, 29) /obj/structure/extinguisher_cabinet/attack_paw(mob/user, list/modifiers) return attack_hand(user, modifiers) -/obj/structure/extinguisher_cabinet/AltClick(mob/living/user) - if(!user.canUseTopic(src, be_close = TRUE, no_dexterity = TRUE, no_tk = FALSE, need_hands = TRUE)) - return - toggle_cabinet(user) - /obj/structure/extinguisher_cabinet/proc/toggle_cabinet(mob/user) if(opened && broken) to_chat(user, span_warning("[src] is broken open."))