Fix closet skeletons spawning in nullspace (#22942)

diff --git a/Content.Server/StationEvents/Components/RandomEntityStorageSpawnRuleComponent.cs b/Content.Server/StationEvents/Components/RandomEntityStorageSpawnRuleComponent.cs
index 141ff1b55883703a9aa9b5e729fefd7c68f38c69..0da276fc6a6450ac65cf814cff883b90c313cff3 100644 (file)
--- 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 1e3320e7dbe1a051185b9d2d255e526200e7bc88..306f4aeaeedf8ee43e47904748a8d3a46b48ca20 100644 (file)
--- 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;
         }