[MIRROR] Moves tool use back higher in the chain, but makes it so tool acts are only called on non-combat-mode (#28457)

Moves tool use back higher in the chain, but makes it so tool acts are only called on non-combat-mode

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: SpaceLoveSs13 <68121607+SpaceLoveSs13@users.noreply.github.com>
This commit is contained in:
SkyratBot
2024-07-02 15:31:16 +05:30
committed by GitHub
co-authored by MrMelbert SpaceLoveSs13
parent 4e13b09bac
commit 53d3099582
27 changed files with 294 additions and 299 deletions
+2 -2
View File
@@ -188,11 +188,11 @@
return
return ..()
/obj/structure/window/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
/obj/structure/window/tool_act(mob/living/user, obj/item/tool, list/modifiers)
if(!can_be_reached(user))
return ITEM_INTERACT_SKIP_TO_ATTACK // Guess you get to hit it
add_fingerprint(user)
return NONE
return ..()
/obj/structure/window/welder_act(mob/living/user, obj/item/tool)
if(atom_integrity >= max_integrity)