Revert "Upstream (#148)"

This reverts commit 9f00d4b9aa.
2024-10-22 22:47:57 +03:00
parent 9f00d4b9aa
commit dbc492f3f3
96 changed files with 1080 additions and 1047 deletions
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -508,7 +508,13 @@ public abstract class SharedActionsSystem : EntitySystem
            return distance <= action.Range;
        }

-        return _interactionSystem.InRangeAndAccessible(user, target, range: action.Range);
+        if (_interactionSystem.InRangeUnobstructed(user, target, range: action.Range)
+            && _containerSystem.IsInSameOrParentContainer(user, target))
+        {
+            return true;
+        }
+
+        return _interactionSystem.CanAccessViaStorage(user, target);
    }

    public bool ValidateWorldTarget(EntityUid user, EntityCoordinates coords, Entity<WorldTargetActionComponent> action)