Fixes some unnecessary attack chain cancels (#61038)

Replaced attack chain cancels on some objects with parent calls
This commit is contained in:
GoblinBackwards
2021-09-01 16:26:05 +01:00
committed by GitHub
parent 5a07412f8e
commit 53765ac6fa
4 changed files with 12 additions and 4 deletions
@@ -479,13 +479,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)
+5 -1
View File
@@ -460,7 +460,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)