Skip to content

Reptilian Claw Popup Fix #3431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NazrinNya merged 2 commits into from
Mar 12, 2026
Merged

Reptilian Claw Popup Fix #3431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85751a9
Fix wirecutters showing claws popup when they shouldn't. Lowered defa…
chuga-git Mar 10, 2026
2f3d2e0
jaws of life clip at normal speeds
chuga-git Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Content.Shared/_Mono/Claws/ClawsSystem.NailClippers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,13 @@ private void OnTargetUse(Entity<NailClipperComponent> ent, ref AfterInteractEven
public bool TryClipNails(NailClipperComponent component, EntityUid nailClipper, EntityUid user, EntityUid? target = null)
{
target ??= user;

if (!TryComp<ClawsComponent>(target, out var claws))
{
return false;
}

if (!TryComp<ClawsComponent>(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;
Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/_Mono/Claws/Components/NailClipperComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

/// <summary>
/// Amount of stages to skip down. Capped to 0.
Expand Down
Loading