Merge branch 'master' into pomegranate

Author: ray-boop

Resources/Changelog/Frontier.yml

@@ -7335,3 +7335,47 @@ Entries:
   id: 6539
   time: '2026-02-02T09:08:22.0000000+00:00'
   url: https://github.com/new-frontiers-14/frontier-station-14/pull/4243
+- author: dustylens
+  changes:
+    - type: Tweak
+      message: Caladrius receives a hull update and modernization pass.
+  id: 6540
+  time: '2026-02-03T02:49:28.0000000+00:00'
+  url: https://github.com/new-frontiers-14/frontier-station-14/pull/4271
+- author: dustylens
+  changes:
+    - type: Tweak
+      message: Crescent hull update. New sec room.
+  id: 6541
+  time: '2026-02-03T04:27:38.0000000+00:00'
+  url: https://github.com/new-frontiers-14/frontier-station-14/pull/4273
+- author: Minerva
+  changes:
+    - type: Tweak
+      message: >-
+        The Hauler has been given the Salvage and Cargo techfabs, as well as a
+        price increase to $75000.
+  id: 6542
+  time: '2026-02-03T04:43:07.0000000+00:00'
+  url: https://github.com/new-frontiers-14/frontier-station-14/pull/4277
+- author: dustylens
+  changes:
+    - type: Tweak
+      message: Stasis minor hull update and atmos pass.
+  id: 6543
+  time: '2026-02-03T06:04:42.0000000+00:00'
+  url: https://github.com/new-frontiers-14/frontier-station-14/pull/4267
+- author: Minerva
+  changes:
+    - type: Fix
+      message: Cleanades are no longer C2 contraband, and are now only C1 contraband.
+  id: 6544
+  time: '2026-02-03T07:19:55.0000000+00:00'
+  url: https://github.com/new-frontiers-14/frontier-station-14/pull/4291
+- author: SemperVictor
+  changes:
+    - type: Add
+      message: Added the Firefighter to the Edison shipyard console.
+  id: 6545
+  time: '2026-02-03T07:42:05.0000000+00:00'
+  url: https://github.com/new-frontiers-14/frontier-station-14/pull/4284

Resources/Maps/_NF/Shuttles/caladrius.yml

@@ -1,6 +1,17 @@
 meta:
-  format: 6
-  postmapinit: false
+  format: 7
+  category: Grid
+  engineVersion: 267.3.0
+  forkId: ""
+  forkVersion: ""
+  time: 01/24/2026 23:46:34
+  entityCount: 429
+maps: []
+grids:
+- 1
+orphans:
+- 1
+nullspace: []
 tilemap:
   0: Space
   30: FloorDark
@@ -1245,7 +1256,7 @@ entities:
     - type: Transform
       pos: -1.2326875,8.501068
       parent: 1
-- proto: ClosetWallO2N2FilledRandom
+- proto: ClosetWallO2N2Filled
   entities:
   - uid: 149
     components: