Merge branch 'master' into prison-headset

DeltaV-Station · Jan 31, 2024 · 9a8d087 · 9a8d087
2 parents 5f0e2de + 369109d
commit 9a8d087
Show file tree

Hide file tree

Showing 6 changed files with 45,053 additions and 44,163 deletions.
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1447,3 +1447,9 @@ 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'
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"