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/Tiles/FloorTileItemComponent.cs
+++ b/Content.Server/Tiles/FloorTileItemComponent.cs
@@ -56,7 +56,7 @@ namespace Content.Server.Tiles

        async Task<bool> IAfterInteract.AfterInteract(AfterInteractEventArgs eventArgs)
        {
-            if (!eventArgs.InRangeUnobstructed(ignoreInsideBlocker: true, popup: true))
+            if (!eventArgs.CanReach)
                return true;

            if (!_entMan.TryGetComponent(Owner, out StackComponent? stack))