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/Tabletop/SharedTabletopSystem.cs
+++ b/Content.Shared/Tabletop/SharedTabletopSystem.cs
@@ -49,7 +49,7 @@ namespace Content.Shared.Tabletop
                return false;
            }

-            return playerEntity.InRangeUnobstructed(table.Value) && _actionBlockerSystem.CanInteract(playerEntity);
+            return playerEntity.InRangeUnobstructed(table.Value) && _actionBlockerSystem.CanInteract(playerEntity, table);
        }

        protected bool StunnedOrNoHands(EntityUid playerEntity)