tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Hotfix] Remove pull-escape trick (#40368)

Browse Source 
* make HandleStopPull byref

* we get signal
This commit is contained in:
Errant
2025-09-15 13:31:22 +02:00
committed by GitHub
parent d8e818283c
commit 9b5f9c3fd6
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/Cuffs/SharedCuffableSystem.cs
View File

@@ -242,13 +242,18 @@ namespace Content.Shared.Cuffs
args.Cancel();
}
private void HandleStopPull(EntityUid uid, CuffableComponent component, AttemptStopPullingEvent args)
private void HandleStopPull(EntityUid uid, CuffableComponent component, ref AttemptStopPullingEvent args)
{
if (args.User == null || !Exists(args.User.Value))
return;
if (args.User.Value == uid && !component.CanStillInteract)
{
//TODO: UX feedback. Simply blocking the normal interaction feels like an interface bug
args.Cancelled = true;
}
}
private void OnRemoveCuffsAlert(Entity<CuffableComponent> ent, ref RemoveCuffsAlertEvent args)