Merge branch 'master' into security-borg

DeltaV-Station · Jan 31, 2024 · 146803a · 146803a
2 parents f17b9ef + 0d31575
commit 146803a
Show file tree

Hide file tree

Showing 9 changed files with 45,085 additions and 44,168 deletions.
diff --git a/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs b/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
@@ -26,8 +26,8 @@ private void OnSpawnPlayer(PlayerSpawningEvent args)
         if (args.SpawnResult != null)
             return;
 
-        // DeltaV - Prevent spawnpoint overrides from being ignored
-        if (args.DesiredSpawnPointType != null && args.DesiredSpawnPointType != SpawnPointType.Unset)
+        // DeltaV - Ignore these two desired spawn types
+        if (args.DesiredSpawnPointType is SpawnPointType.Observer or SpawnPointType.LateJoin)
             return;
 
         var query = EntityQueryEnumerator<ContainerSpawnPointComponent, ContainerManagerComponent, TransformComponent>();
@@ -38,6 +38,16 @@ private void OnSpawnPlayer(PlayerSpawningEvent args)
             if (args.Station != null && _station.GetOwningStation(uid, xform) != args.Station)
                 continue;
 
+            // DeltaV - Custom override for override spawnpoints, only used for prisoners currently. This shouldn't run for any other jobs
+            if (args.DesiredSpawnPointType == SpawnPointType.Job)
+            {
+                if (spawnPoint.SpawnType != SpawnPointType.Job || spawnPoint.Job != args.Job?.Prototype)
+                    continue;
+
+                possibleContainers.Add((uid, spawnPoint, container, xform));
+                continue;
+            }
+
             // If it's unset, then we allow it to be used for both roundstart and midround joins
             if (spawnPoint.SpawnType == SpawnPointType.Unset)
             {

diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1447,3 +1447,17 @@ Entries:
       message: Made HCV cocktail less immediately lethal (damnation!!!)
   id: 217
   time: '2024-01-31T10:34:16.0000000+00:00'
+- author: Adrian16199
+  changes:
+    - type: Tweak
+      message: Shoukou has received the cryopods.
+  id: 218
+  time: '2024-01-31T15:34:32.0000000+00:00'
+- author: DebugOk
+  changes:
+    - type: Tweak
+      message: >-
+        Prisoners can now spawn from a special cryopod that can be put in
+        security, instead of magically appearing in a cell.
+  id: 219
+  time: '2024-01-31T22:02:05.0000000+00:00'
diff --git a/Resources/ConfigPresets/DeltaV/deltav.toml b/Resources/ConfigPresets/DeltaV/deltav.toml
@@ -1,9 +1,8 @@
 [game]
-desc                 = "Featuring loads of unique content and psionics."
-lobbyenabled         = true
-lobbyduration        = 240
-round_end_pacifist   = true
-cryo_sleep_rejoining = true
+desc               = "Featuring loads of unique content and psionics."
+lobbyenabled       = true
+lobbyduration      = 240
+round_end_pacifist = true
 
 [infolinks]
 discord    = "https://go.delta-v.org/sxzqj"