fix cryosleepers deleting the station (#24143)

* fix cryogenic units deleting the station

* ship it

diff --git a/Content.Server/Spawners/Components/ContainerSpawnPointComponent.cs b/Content.Server/Spawners/Components/ContainerSpawnPointComponent.cs
index 5cd2ac3048e400c33497904178b84ad1670f3e68..9782becc2714d393068ed427cbf1365a62f3e353 100644 (file)
--- a/Content.Server/Spawners/Components/ContainerSpawnPointComponent.cs
+++ b/Content.Server/Spawners/Components/ContainerSpawnPointComponent.cs
@@ -13,8 +13,8 @@ public sealed partial class ContainerSpawnPointComponent : Component
     /// <summary>
     /// The ID of the container that this entity will spawn players into
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public string ContainerId;
+    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
+    public string ContainerId = string.Empty;
 
     /// <summary>
     /// An optional job specifier

diff --git a/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs b/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
index 65f107670071eaabceb567eccd5effd91d3ff916..15c4031d585ac69f5d0b3441d06ce851644afb7c 100644 (file)
--- a/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
+++ b/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
@@ -79,7 +79,7 @@ public sealed class ContainerSpawnPointSystem : EntitySystem
             return;
         }
 
-        Del(args.Station);
+        Del(args.SpawnResult);
         args.SpawnResult = null;
     }
 }

diff --git a/Resources/Prototypes/Entities/Structures/cryopod.yml b/Resources/Prototypes/Entities/Structures/cryopod.yml
index c4d13887003319b0dcee4fe4f429e36c3d60f474..9063e8b1385c02ac61f1fdec256d000fe6d6b84f 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/cryopod.yml
+++ b/Resources/Prototypes/Entities/Structures/cryopod.yml
@@ -21,7 +21,8 @@
     access: [["Cryogenics"]]
   - type: InteractionOutline
   - type: Cryostorage
-  - type: Climbable
+  - type: Physics
+    canCollide: false
   - type: DragInsertContainer
     containerId: storage
   - type: ExitContainerOnMove
@@ -46,7 +47,7 @@
 - type: entity
   parent: CryogenicSleepUnit
   id: CryogenicSleepUnitSpawner
-  suffix: Spawner, All
+  suffix: Spawner, Roundstart AllJobs
   components:
   - type: ContainerSpawnPoint
     containerId: storage