From 146469e37ef54bbf41987f985a3df4cd2c69f468 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 1 Sep 2021 17:50:47 +0200 Subject: [PATCH] [MIRROR] Fixes some unnecessary attack chain cancels (#7910) * Fixes some unnecessary attack chain cancels (#61038) Replaced attack chain cancels on some objects with parent calls * Fixes some unnecessary attack chain cancels Co-authored-by: GoblinBackwards --- code/game/machinery/doors/door.dm | 2 +- code/game/objects/structures/crates_lockers/closets.dm | 3 ++- code/game/objects/structures/window.dm | 6 +++++- code/modules/reagents/chemistry/machinery/chem_mass_spec.dm | 5 ++++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index ae2f3010683..fcbee676abf 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -270,7 +270,7 @@ forced_open = crowbar.force_opens try_to_crowbar_secondary(weapon, user, forced_open) - return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + return ..() /obj/machinery/door/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) . = ..() diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index f5a2b12478b..c7e55981e69 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -483,13 +483,14 @@ open() /obj/structure/closet/attack_hand_secondary(mob/user, modifiers) - . = SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + . = ..() if(!user.canUseTopic(src, BE_CLOSE) || !isturf(loc)) return if(!opened && secure) togglelock(user) + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN /obj/structure/closet/proc/togglelock(mob/living/user, silent) if(secure && !broken) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 13a94e40b42..17c32716b2b 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -461,7 +461,11 @@ else if (tool.tool_behaviour) to_chat(user, span_warning("The bolts need to be loosened first!")) - return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + + if (tool.tool_behaviour) + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + + return ..() /obj/structure/window/proc/cool_bolts() if(state == RWINDOW_BOLTS_HEATED) diff --git a/code/modules/reagents/chemistry/machinery/chem_mass_spec.dm b/code/modules/reagents/chemistry/machinery/chem_mass_spec.dm index fb60e186bae..6d4c1733238 100644 --- a/code/modules/reagents/chemistry/machinery/chem_mass_spec.dm +++ b/code/modules/reagents/chemistry/machinery/chem_mass_spec.dm @@ -93,6 +93,8 @@ This will not clean any inverted reagents. Inverted reagents will still be corre ..() /obj/machinery/chem_mass_spec/attackby_secondary(obj/item/item, mob/user, params) + . = ..() + if(processing_reagents) to_chat(user, " The [src] is currently processing a batch!") return @@ -107,8 +109,9 @@ This will not clean any inverted reagents. Inverted reagents will still be corre replace_beaker(user, BEAKER2, beaker) to_chat(user, span_notice("You add [beaker] to [src].")) updateUsrDialog() + . = SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + update_appearance() - return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN /obj/machinery/chem_mass_spec/AltClick(mob/living/user) . = ..()