diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs index b9f287f1ce45..5bbe01899d72 100644 --- a/Content.Shared/Cuffs/SharedCuffableSystem.cs +++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs @@ -474,7 +474,6 @@ public bool TryCuffing(EntityUid user, EntityUid target, EntityUid handcuff, Han { if (!Resolve(handcuff, ref handcuffComponent) || !Resolve(target, ref cuffable, false)) return false; - if (!TryComp(target, out var hands)) { _popup.PopupClient(Loc.GetString("handcuff-component-target-has-no-hands-error", @@ -489,6 +488,10 @@ public bool TryCuffing(EntityUid user, EntityUid target, EntityUid handcuff, Han return true; } + if (!_hands.CanDrop(user, handcuff)) + // TODO: Add a popup explaining why cuffing failed + return false; + var cuffTime = handcuffComponent.CuffTime; if (HasComp(target))