Skip to content

Being Hard Grabbed Blocks Uncuff Doafter #2269

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

Open
Tomce795 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Being Hard Grabbed Blocks Uncuff Doafter #2269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e30be60
added TryComp for being pulled check in uncuffing
Tomce795 Jan 3, 2026
1596479
Merge branch 'master' into cuffs
Tomce795 Jan 5, 2026
9c1ddb1
now checks for HardGrab instead of IsPulled
Tomce795 Jan 8, 2026
9b042fb
modified Handcuff component to include check for if cuffs are breakab…
Tomce795 Jan 8, 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: 8 additions & 0 deletions Content.Shared/Cuffs/Components/HandcuffComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,14 @@ public sealed partial class HandcuffComponent : Component
[DataField, AutoNetworkedField]
public string? BodyIconState = "body-overlay";

/// Den Edit
/// <summary>
/// Whenever or not the person cuffed can perform the uncuff do after while being Hard Grabbed.
/// By default, no.
/// </summary>
[DataField]
public bool UncuffDuringHardGrab = false;

/// <summary>
/// An opptional color specification for <see cref="BodyIconState"/>
/// </summary>
Expand Down
4 changes: 4 additions & 0 deletions Content.Shared/Cuffs/SharedCuffableSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,10 @@ public void TryUncuff(EntityUid target, EntityUid user, EntityUid? cuffsToRemove
if (!Resolve(cuffsToRemove.Value, ref cuff))
return;

// Den edit, checks if target is being hardgrabbed and if they the cuffs can be broken out of during a hard grab.
if (TryComp<PullableComponent>(target, out var pullable) && pullable.GrabStage == GrabStage.Hard && !cuff.UncuffDuringHardGrab)
return;

var attempt = new UncuffAttemptEvent(user, target);
RaiseLocalEvent(user, ref attempt, true);

Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
startBreakoutSound:
path: /Audio/Items/Handcuffs/rope_takeoff.ogg
uncuffEasierWhenLarge: true
uncuffDuringHardGrab: true #Den Edit
- type: Construction
graph: makeshifthandcuffs
node: cuffscable
Expand Down Expand Up @@ -124,6 +125,7 @@
startBreakoutSound:
path: /Audio/Items/Handcuffs/rope_takeoff.ogg
uncuffEasierWhenLarge: true
uncuffDuringHardGrab: true #Den Edit
- type: Sprite
sprite: Objects/Misc/zipties.rsi
state: cuff
Expand Down
Loading