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/Nuke/NukeSystem.cs
+++ b/Content.Server/Nuke/NukeSystem.cs
@@ -117,12 +117,6 @@ namespace Content.Server.Nuke
            if (args.Handled)
                return;

-            // standard interactions check
-            if (!args.InRangeUnobstructed())
-                return;
-            if (!_actionBlocker.CanInteract(args.User) || !_actionBlocker.CanUse(args.User))
-                return;
-
            if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
                return;