Adjust interaction ordering & interaction conditions (#6387)

2022-02-05 15:39:01 +13:00
parent 442d7dbf8e
commit dd61fb46ea
28 changed files with 88 additions and 167 deletions
--- a/Content.Server/Cuffs/Components/HandcuffComponent.cs
+++ b/Content.Server/Cuffs/Components/HandcuffComponent.cs
@@ -179,7 +179,7 @@ namespace Content.Server.Cuffs.Components
                return true;
            }

-            if (!eventArgs.InRangeUnobstructed(ignoreInsideBlocker: true))
+            if (!eventArgs.CanReach)
            {
                eventArgs.User.PopupMessage(Loc.GetString("handcuff-component-too-far-away-error"));
                return true;