Merge remote-tracking branch 'upstream/master' into ed-22-05-2024-upstream

2024-05-22 13:29:42 +03:00
parent 26f91c3a5a 6a9139b4e1
commit 6d51ea95a1
109 changed files with 640 additions and 196 deletions
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -468,7 +468,7 @@ public abstract class SharedStorageSystem : EntitySystem
                return;
            }

-            if (_xformQuery.TryGetComponent(uid, out var transformOwner) && TryComp<TransformComponent>(target, out var transformEnt))
+            if (TryComp(uid, out TransformComponent? transformOwner) && TryComp(target, out TransformComponent? transformEnt))
            {
                var parent = transformOwner.ParentUid;