diff --git a/Content.Shared/_Mono/Claws/ClawsSystem.NailClippers.cs b/Content.Shared/_Mono/Claws/ClawsSystem.NailClippers.cs index a1bbd59134c..059c9bb008e 100644 --- a/Content.Shared/_Mono/Claws/ClawsSystem.NailClippers.cs +++ b/Content.Shared/_Mono/Claws/ClawsSystem.NailClippers.cs @@ -43,9 +43,13 @@ private void OnTargetUse(Entity ent, ref AfterInteractEven public bool TryClipNails(NailClipperComponent component, EntityUid nailClipper, EntityUid user, EntityUid? target = null) { target ??= user; + + if (!TryComp(target, out var claws)) + { + return false; + } - if (!TryComp(target, out var claws)|| - TryGetStage(claws, out var stage) && !stage.CanBeCut) + if (TryGetStage(claws, out var stage) && !stage.CanBeCut) { _popup.PopupClient(Loc.GetString("has-no-claws-popup"), Transform(user).Coordinates, user); return false; diff --git a/Content.Shared/_Mono/Claws/Components/NailClipperComponent.cs b/Content.Shared/_Mono/Claws/Components/NailClipperComponent.cs index 8e82e3925f4..9c8bc40c3c8 100644 --- a/Content.Shared/_Mono/Claws/Components/NailClipperComponent.cs +++ b/Content.Shared/_Mono/Claws/Components/NailClipperComponent.cs @@ -10,7 +10,7 @@ namespace Content.Shared._Mono.Claws.Components; public sealed partial class NailClipperComponent : Component { [DataField] - public TimeSpan ClipDoAfter = TimeSpan.FromSeconds(10); + public TimeSpan ClipDoAfter = TimeSpan.FromSeconds(4); /// /// Amount of stages to skip down. Capped to 0.