Adjust interaction ordering & interaction conditions (#6387)

2022-02-05 15:39:01 +13:00
parent 442d7dbf8e
commit dd61fb46ea
28 changed files with 88 additions and 167 deletions
--- a/Content.Server/Tools/ToolSystem.TilePrying.cs
+++ b/Content.Server/Tools/ToolSystem.TilePrying.cs
@@ -25,7 +25,7 @@ public sealed partial class ToolSystem

    private void OnTilePryingAfterInteract(EntityUid uid, TilePryingComponent component, AfterInteractEvent args)
    {
-        if (args.Handled) return;
+        if (args.Handled || !args.CanReach) return;

        if (TryPryTile(args.User, component, args.ClickLocation))
            args.Handled = true;