Reduce action blocker uses and add target entity to CanInteract (#6655)

2022-02-15 17:06:52 +13:00
parent 334568dad2
commit ad9ddf1552
60 changed files with 286 additions and 402 deletions
--- a/Content.Server/Cuffs/Components/HandcuffComponent.cs
+++ b/Content.Server/Cuffs/Components/HandcuffComponent.cs
@@ -149,7 +149,6 @@ namespace Content.Server.Cuffs.Components
            if (_cuffing) return true;

            if (eventArgs.Target is not {Valid: true} target ||
-                !EntitySystem.Get<ActionBlockerSystem>().CanUse(eventArgs.User) ||
                !_entities.TryGetComponent<CuffableComponent?>(eventArgs.Target.Value, out var cuffed))
            {
                return false;