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/Arcade/Components/SpaceVillainArcadeComponent.cs
+++ b/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
@@ -77,9 +77,6 @@ namespace Content.Server.Arcade.Components
            if (!Powered || !IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.User, out ActorComponent? actor))
                return;

-            if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(eventArgs.User))
-                return;
-
            _game ??= new SpaceVillainGame(this);

            if (_entityManager.TryGetComponent<WiresComponent>(Owner, out var wiresComponent) && wiresComponent.IsPanelOpen)