mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-20 04:26:03 +01:00
[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 <kinggreenyoshi@gmail.com>
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user