diff --git a/Content.Server/GameObjects/Components/Interactable/ToolComponent.cs b/Content.Server/GameObjects/Components/Interactable/ToolComponent.cs index 3d15516178..9ef6d8d96f 100644 --- a/Content.Server/GameObjects/Components/Interactable/ToolComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/ToolComponent.cs @@ -115,9 +115,12 @@ namespace Content.Server.GameObjects.Components.Interactable public virtual bool UseTool(IEntity user, IEntity target, ToolQuality toolQualityNeeded) { + if (!HasQuality(toolQualityNeeded) || !ActionBlockerSystem.CanInteract(user)) + return false; + PlayUseSound(); - return ActionBlockerSystem.CanInteract(user) && HasQuality(toolQualityNeeded); + return true; } protected void PlaySoundCollection(string name, float volume=-5f)