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

Fix for handcuffing someone more than once (#33646)

Browse Source 
* Fix for over-cuffing someone

* comment
This commit is contained in:
Plykiya
2024-11-30 07:58:56 -08:00
committed by GitHub
parent 86791583f9
commit 021c9832ef
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -461,6 +461,12 @@ namespace Content.Shared.Cuffs
if (!_interaction.InRangeUnobstructed(handcuff, target)) if (!_interaction.InRangeUnobstructed(handcuff, target))
return false; return false;
// if the amount of hands the target has is equal to or less than the amount of hands that are cuffed
// don't apply the new set of cuffs
// (how would you even end up with more cuffed hands than actual hands? either way accounting for it)
if (TryComp<HandsComponent>(target, out var hands) && hands.Count <= component.CuffedHandCount)
return false;
// Success! // Success!
_hands.TryDrop(user, handcuff); _hands.TryDrop(user, handcuff);