cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 21:18:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes some unnecessary attack chain cancels (#7910)

Browse Source 
* 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 <kinggreenyoshi@gmail.com>
This commit is contained in:
SkyratBot
2021-09-01 16:50:47 +01:00
committed by GitHub
co-authored by GoblinBackwards
parent a8a2af902b
commit 146469e37e
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/doors/door.dm
+1 -1
View File
@@ -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)
. = ..()
code/game/objects/structures/crates_lockers/closets.dm
+2 -1
View File
@@ -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)
code/game/objects/structures/window.dm
+5 -1
View File
@@ -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)
code/modules/reagents/chemistry/machinery/chem_mass_spec.dm
+4 -1
View File
@@ -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, "<span class='notice'> 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)
. = ..()