Merge branch 'master' into security-borg

Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs

@@ -26,6 +26,10 @@ 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)
+            return;
+
         var query = EntityQueryEnumerator<ContainerSpawnPointComponent, ContainerManagerComponent, TransformComponent>();
         var possibleContainers = new List<Entity<ContainerSpawnPointComponent, ContainerManagerComponent, TransformComponent>>();
 

Resources/Changelog/DeltaVChangelog.yml

@@ -1413,3 +1413,37 @@ Entries:
       message: Added gridinv, sorry.
   id: 212
   time: '2024-01-21T18:58:28.0000000+00:00'
+- author: TadJohnson00
+  changes:
+    - type: Tweak
+      message: >-
+        Pride vend has received an adjusted inventory. Make sure to check out
+        the new cloaks available!
+  id: 213
+  time: '2024-01-30T14:22:13.0000000+00:00'
+- author: Colin-Tel
+  changes:
+    - type: Tweak
+      message: Updated Asterisk Station.
+  id: 214
+  time: '2024-01-30T21:09:41.0000000+00:00'
+- author: DebugOk
+  changes:
+    - type: Tweak
+      message: >-
+        You should be able to exit cryo even after leaving now, meaning it just
+        keeps your body safe?
+  id: 215
+  time: '2024-01-31T07:41:58.0000000+00:00'
+- author: DebugOk
+  changes:
+    - type: Fix
+      message: Prisoners will no longer spawn in cryopods instead of in the brig.
+  id: 216
+  time: '2024-01-31T09:42:57.0000000+00:00'
+- author: leonardo-dabepis
+  changes:
+    - type: Tweak
+      message: Made HCV cocktail less immediately lethal (damnation!!!)
+  id: 217
+  time: '2024-01-31T10:34:16.0000000+00:00'

Resources/ConfigPresets/DeltaV/deltav.toml

@@ -1,8 +1,9 @@
 [game]
-desc               = "Featuring loads of unique content and psionics."
-lobbyenabled       = true
-lobbyduration      = 240
-round_end_pacifist = true
+desc                 = "Featuring loads of unique content and psionics."
+lobbyenabled         = true
+lobbyduration        = 240
+round_end_pacifist   = true
+cryo_sleep_rejoining = true
 
 [infolinks]
 discord    = "https://go.delta-v.org/sxzqj"

Resources/Locale/en-US/deltav/reagents/generic.ftl

@@ -0,0 +1,3 @@
+### Messages that can be utilized by multiple reagents.
+
+generic-reagent-effect-damnation = Your liver cries out in agony! Damnation!