From 0baffe32435341a066198805c94f38fd049395ae Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Mon, 25 Dec 2023 01:48:58 -0500
Subject: [PATCH] Fix closet skeletons spawning in nullspace (#22942)

---
 .../Components/RandomEntityStorageSpawnRuleComponent.cs       | 4 ++--
 .../Storage/EntitySystems/SharedEntityStorageSystem.cs        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Content.Server/StationEvents/Components/RandomEntityStorageSpawnRuleComponent.cs b/Content.Server/StationEvents/Components/RandomEntityStorageSpawnRuleComponent.cs
index 141ff1b558..0da276fc6a 100644
--- a/Content.Server/StationEvents/Components/RandomEntityStorageSpawnRuleComponent.cs
+++ b/Content.Server/StationEvents/Components/RandomEntityStorageSpawnRuleComponent.cs
@@ -13,6 +13,6 @@ public sealed partial class RandomEntityStorageSpawnRuleComponent : Component
     /// <summary>
     /// The entity to be spawned.
     /// </summary>
-    [DataField("prototype", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string Prototype = string.Empty;
+    [DataField(required: true)]
+    public EntProtoId Prototype;
 }
diff --git a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
index 1e3320e7db..306f4aeaee 100644
--- a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
@@ -258,7 +258,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
 
         if (component.Open)
         {
-            TransformSystem.SetWorldPosition(toInsert, TransformSystem.GetWorldPosition(container));
+            TransformSystem.DropNextTo(toInsert, container);
             return true;
         }
 
-- 
2.51.2