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.Shared/Strip/Components/SharedStrippableComponent.cs
+++ b/Content.Shared/Strip/Components/SharedStrippableComponent.cs
@@ -15,7 +15,7 @@ namespace Content.Shared.Strip.Components
        {
            return by != Owner
                   && IoCManager.Resolve<IEntityManager>().HasComponent<SharedHandsComponent>(@by)
-                   && EntitySystem.Get<ActionBlockerSystem>().CanInteract(@by);
+                   && EntitySystem.Get<ActionBlockerSystem>().CanInteract(@by, Owner);
        }

        bool IDraggable.CanDrop(CanDropEvent args)