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/Traitor/Uplink/UplinkSystem.cs
+++ b/Content.Server/Traitor/Uplink/UplinkSystem.cs
@@ -89,10 +89,6 @@ namespace Content.Server.Traitor.Uplink
            if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
                return;

-            var actionBlocker = EntitySystem.Get<ActionBlockerSystem>();
-            if (!actionBlocker.CanInteract(uid) || !actionBlocker.CanUse(uid))
-                return;
-
            ToggleUplinkUI(component, actor.PlayerSession);
            args.Handled = true;
        }