Merge branch 'master' into Bureaucratic_Efficiency

Author: SemperVictor

Resources/Changelog/Frontier.yml

@@ -7296,3 +7296,86 @@ Entries:
   id: 6534
   time: '2026-01-28T15:14:32.0000000+00:00'
   url: https://github.com/new-frontiers-14/frontier-station-14/pull/4248
+- author: BlueMoon059
+  changes:
+    - type: Fix
+      message: >-
+        Pride Pins have been moved to the backpack items section of the loadout
+        screen, to prevent an issue where they wouldn't spawn in correctly.
+  id: 6535
+  time: '2026-02-02T06:11:41.0000000+00:00'
+  url: https://github.com/new-frontiers-14/frontier-station-14/pull/4279
+- author: Bartholemew Dingleberry
+  changes:
+    - type: Add
+      message: >-
+        Added a Keg of Rum to the Pirate uplink, drink yourself to death to
+        celebrate pirates!
+  id: 6536
+  time: '2026-02-02T06:24:58.0000000+00:00'
+  url: https://github.com/new-frontiers-14/frontier-station-14/pull/4280
+- author: Minerva
+  changes:
+    - type: Tweak
+      message: Interview holograms now emit light and always have gravity.
+  id: 6537
+  time: '2026-02-02T06:47:05.0000000+00:00'
+  url: https://github.com/new-frontiers-14/frontier-station-14/pull/4275
+- author: Minerva
+  changes:
+    - type: Fix
+      message: Captain ID cards are no longer contraband.
+  id: 6538
+  time: '2026-02-02T06:49:44.0000000+00:00'
+  url: https://github.com/new-frontiers-14/frontier-station-14/pull/4258
+- author: Bonaout
+  changes:
+    - type: Tweak
+      message: Wireless cameras can now be toggled on/off (Thanks to Marlyn!)
+  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/Locale/en-US/_NF/store/uplink-catalog.ftl

@@ -246,6 +246,9 @@ uplink-pirate-crate-captain-desc = A chest filled with the necessary goodies for
 uplink-pirate-crate-name = Pirate Chest
 uplink-pirate-crate-desc = A chest filled with the necessary goodies for a pirate.
 
+uplink-pirate-wooden-keg-rum-name = A Keg of Rum
+uplink-pirate-wooden-keg-rum-desc = A Keg filled with all the rum a Pirate needs, be sure to drink yourself dead to celebrate!
+
 uplink-pirate-magboots-name = Pirate Magboots
 uplink-pirate-magboots-desc = Pirate magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
 

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: