diff --git a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs index 8b0b1e41cf..9b5e5f476b 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs @@ -203,7 +203,15 @@ namespace Content.Server.GameObjects.Components { // Because Insert sets the local position to (0,0), and we want to keep the contents spread out, // we re-apply the world position after inserting. - var worldPos = entity.Transform.WorldPosition; + Vector2 worldPos; + if (entity.HasComponent()) + { + worldPos = Owner.Transform.WorldPosition; + } + else + { + worldPos = entity.Transform.WorldPosition; + } Contents.Insert(entity); entity.Transform.WorldPosition = worldPos; return true;