From dd72f9d1a974e1b844ca0416684cd754decacd01 Mon Sep 17 00:00:00 2001 From: zumorica Date: Wed, 29 Apr 2020 14:45:38 +0200 Subject: [PATCH] Actually raise ToolAct --- .../GameObjects/EntitySystems/Click/InteractionSystem.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs index ee5dee19b7..1d785fb3db 100644 --- a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs @@ -694,6 +694,11 @@ namespace Content.Server.GameObjects.EntitySystems // We handle specific tools AttackBy here. if (weapon.TryGetComponent(out var tool)) { + + if (attacked.GetAllComponents().Any((act => act.ToolAct(new ToolActEventArgs() + {User = user, ClickLocation = clickLocation, AttackWith = weapon})))) + return; + switch (tool.Behavior) { case Tool.Wrench: