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: