Merge branch 'master' into prison-headset

DeltaV-Station · Feb 3, 2024 · 40ed580 · 40ed580
2 parents f4c87ae + 1e416a7
commit 40ed580
Show file tree

Hide file tree

Showing 48 changed files with 57,319 additions and 45,228 deletions.
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1496,3 +1496,9 @@ Entries:
         sort of experiment-gone-bad deep within the epistemics labs.
   id: 224
   time: '2024-02-01T19:30:23.0000000+00:00'
+- author: UnicornOnLSD
+  changes:
+    - type: Tweak
+      message: Submarine station has received adjustments after feedback from HR
+  id: 225
+  time: '2024-02-03T06:50:49.0000000+00:00'
diff --git a/Resources/Maps/Salvage/DeltaV/DV-animalfarm.yml b/Resources/Maps/Salvage/DeltaV/DV-animalfarm.yml
diff --git a/Resources/Maps/Salvage/DeltaV/DV-asteroid-base.yml b/Resources/Maps/Salvage/DeltaV/DV-asteroid-base.yml
diff --git a/Resources/Maps/Salvage/DeltaV/DV-asteroid-large-01.yml b/Resources/Maps/Salvage/DeltaV/DV-asteroid-large-01.yml
diff --git a/Resources/Maps/Salvage/DeltaV/DV-asteroid-large-02.yml b/Resources/Maps/Salvage/DeltaV/DV-asteroid-large-02.yml
diff --git a/Resources/Maps/Salvage/DeltaV/DV-asteroid-large-03.yml b/Resources/Maps/Salvage/DeltaV/DV-asteroid-large-03.yml
diff --git a/Resources/Maps/Salvage/DeltaV/DV-asteroid-mining-chemlab.yml b/Resources/Maps/Salvage/DeltaV/DV-asteroid-mining-chemlab.yml
diff --git a/Resources/Maps/Salvage/DeltaV/DV-atlas-atmos.yml b/Resources/Maps/Salvage/DeltaV/DV-atlas-atmos.yml
diff --git a/Resources/Maps/Salvage/DeltaV/DV-atlas-cargo.yml b/Resources/Maps/Salvage/DeltaV/DV-atlas-cargo.yml
diff --git a/Resources/Maps/Salvage/DeltaV/DV-atlas-conference-room.yml b/Resources/Maps/Salvage/DeltaV/DV-atlas-conference-room.yml
diff --git a/Resources/Maps/Salvage/DeltaV/DV-atlas-dorms.yml b/Resources/Maps/Salvage/DeltaV/DV-atlas-dorms.yml
diff --git a/Resources/Maps/Salvage/DeltaV/DV-atlas-epi.yml b/Resources/Maps/Salvage/DeltaV/DV-atlas-epi.yml
diff --git a/Resources/Maps/Salvage/DeltaV/DV-atlas-jailcells.yml b/Resources/Maps/Salvage/DeltaV/DV-atlas-jailcells.yml
diff --git a/Resources/Maps/Salvage/DeltaV/DV-atlas-medical.yml b/Resources/Maps/Salvage/DeltaV/DV-atlas-medical.yml
diff --git a/Resources/Maps/Salvage/DeltaV/DV-atlas-perma.yml b/Resources/Maps/Salvage/DeltaV/DV-atlas-perma.yml
diff --git a/Resources/Maps/Salvage/DeltaV/DV-atlas-salvage.yml b/Resources/Maps/Salvage/DeltaV/DV-atlas-salvage.yml
diff --git a/Resources/Maps/Salvage/DeltaV/DV-atlas-service.yml b/Resources/Maps/Salvage/DeltaV/DV-atlas-service.yml