From 4414a653016df15746d4e58cab30ccc039d36d4d Mon Sep 17 00:00:00 2001
From: Debug <49997488+DebugOk@users.noreply.github.com>
Date: Wed, 31 Jan 2024 10:42:57 +0100
Subject: [PATCH] Fix prisoners spawning at latejoin cryopods (#743)

---
 .../Spawners/EntitySystems/ContainerSpawnPointSystem.cs       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs b/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
index 8e1b6273f6..fcb6fdb039 100644
--- a/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
+++ b/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
@@ -26,6 +26,10 @@ public sealed class ContainerSpawnPointSystem : EntitySystem
         if (args.SpawnResult != null)
             return;
 
+        // DeltaV - Prevent spawnpoint overrides from being ignored
+        if (args.DesiredSpawnPointType != null && args.DesiredSpawnPointType != SpawnPointType.Unset)
+            return;
+
         var query = EntityQueryEnumerator<ContainerSpawnPointComponent, ContainerManagerComponent, TransformComponent>();
         var possibleContainers = new List<Entity<ContainerSpawnPointComponent, ContainerManagerComponent, TransformComponent>>();