Merge branch 'master' into prison-headset

DeltaV-Station · Feb 4, 2024 · ecefb91 · ecefb91
2 parents dac3e1b + 8d7b2f0
commit ecefb91
Show file tree

Hide file tree

Showing 4 changed files with 2,782 additions and 2,393 deletions.
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1502,3 +1502,15 @@ Entries:
       message: Submarine station has received adjustments after feedback from HR
   id: 225
   time: '2024-02-03T06:50:49.0000000+00:00'
+- author: Colin-Tel
+  changes:
+    - type: Tweak
+      message: Updated Edge Station.
+  id: 226
+  time: '2024-02-04T02:30:44.0000000+00:00'
+- author: UnicornOnLSD
+  changes:
+    - type: Tweak
+      message: Submarine has been made better, stronger, and not faster.
+  id: 227
+  time: '2024-02-04T02:31:24.0000000+00:00'
diff --git a/Resources/Maps/asterisk.yml b/Resources/Maps/asterisk.yml
@@ -6193,7 +6193,7 @@ entities:
   - uid: 4782
     components:
     - type: MetaData
-      name: APC  (Medical, North)
+      name: APC (Medical, North)
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 23.5,-15.5