diff --git a/Resources/Audio/_NF/Jukebox/attributions.yml b/Resources/Audio/_NF/Jukebox/attributions.yml
index ef3aa977ff3..02c82f01e09 100644
--- a/Resources/Audio/_NF/Jukebox/attributions.yml
+++ b/Resources/Audio/_NF/Jukebox/attributions.yml
@@ -1,3 +1,13 @@
+- files: ["victory.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Victory by Koruu Chan. Rights reserved by Checkraze. Converted from WAV to OGG."
+  source: "https://github.com/Cheackraze"
+
+- files: ["shibamata.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Shibamata midi remake. Likely original: https://www.nicovideo.jp/watch/sm32841166"
+  source: "https://github.com/Elijahrane/arcadia-station/blob/c2ea3f44d4de4c0a337aeddb12f167a89c5ed3ef/Resources/Audio/Lobby/shibamata.ogg"
+
 - files: ["lateraligator.ogg"]
   license: "CC-BY-3.0"
   copyright: "Later Alligator By Silverman Sound Studios. Converted to mono OGG."
diff --git a/Resources/Audio/_NF/Jukebox/shibamata.ogg b/Resources/Audio/_NF/Jukebox/shibamata.ogg
new file mode 100644
index 00000000000..6633037f310
Binary files /dev/null and b/Resources/Audio/_NF/Jukebox/shibamata.ogg differ
diff --git a/Resources/Audio/_NF/Jukebox/victory.ogg b/Resources/Audio/_NF/Jukebox/victory.ogg
new file mode 100644
index 00000000000..312e7441668
Binary files /dev/null and b/Resources/Audio/_NF/Jukebox/victory.ogg differ
diff --git a/Resources/Audio/_NF/Lobby/attributions.yml b/Resources/Audio/_NF/Lobby/attributions.yml
deleted file mode 100644
index 65365a341b8..00000000000
--- a/Resources/Audio/_NF/Lobby/attributions.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- files: ["victory.ogg"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "Victory by Koruu Chan. Rights reserved by Checkraze. Converted from WAV to OGG."
-  source: "https://github.com/Cheackraze"
-
-- files: ["shibamata.ogg"]
-  license: "CC-BY-3.0"
-  copyright: "Shibamata midi remake. Likely original: https://www.nicovideo.jp/watch/sm32841166"
-  source: "https://github.com/Elijahrane/arcadia-station/blob/c2ea3f44d4de4c0a337aeddb12f167a89c5ed3ef/Resources/Audio/Lobby/shibamata.ogg"
\ No newline at end of file
diff --git a/Resources/Audio/_NF/Lobby/shibamata.ogg b/Resources/Audio/_NF/Lobby/shibamata.ogg
deleted file mode 100644
index e116449a5bd..00000000000
Binary files a/Resources/Audio/_NF/Lobby/shibamata.ogg and /dev/null differ
diff --git a/Resources/Audio/_NF/Lobby/victory.ogg b/Resources/Audio/_NF/Lobby/victory.ogg
deleted file mode 100644
index 482cbc83f82..00000000000
Binary files a/Resources/Audio/_NF/Lobby/victory.ogg and /dev/null differ
diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index 960b27116ff..a3b8e99fe18 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -6292,3 +6292,21 @@ Entries:
   changes: []
   id: 5639
   time: '2025-01-08T10:17:27.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Dresses added to contractor loadout.
+  id: 5640
+  time: '2025-01-09T19:55:37.0000000+00:00'
+- author: Alkheemist
+  changes:
+    - type: Fix
+      message: Accentless now works on goblins.
+  id: 5641
+  time: '2025-01-10T11:01:45.0000000+00:00'
+- author: dvir001
+  changes:
+    - type: Tweak
+      message: Moved Victory and Shibamata from the lobby music to the jukebox.
+  id: 5642
+  time: '2025-01-10T17:58:03.0000000+00:00'
diff --git a/Resources/Maps/_NF/Shuttles/Scrap/tide.yml b/Resources/Maps/_NF/Shuttles/Scrap/tide.yml
index 9f46292a949..ff708046030 100644
--- a/Resources/Maps/_NF/Shuttles/Scrap/tide.yml
+++ b/Resources/Maps/_NF/Shuttles/Scrap/tide.yml
@@ -1249,6 +1249,13 @@ entities:
     - type: Transform
       pos: 0.5,7.5
       parent: 2
+- proto: SpawnPointLatejoin
+  entities:
+  - uid: 137
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 2
 - proto: Stool
   entities:
   - uid: 170
diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml
index 56062995a3a..914b2eca285 100644
--- a/Resources/Prototypes/SoundCollections/lobby.yml
+++ b/Resources/Prototypes/SoundCollections/lobby.yml
@@ -14,5 +14,3 @@
     - /Audio/Lobby/pwmur.ogg
 #    - /Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg
     - /Audio/Lobby/every_light_is_blinking_at_once.ogg
-    - /Audio/_NF/Lobby/victory.ogg # Frontier
-    - /Audio/_NF/Lobby/shibamata.ogg # Frontier
diff --git a/Resources/Prototypes/Traits/speech.yml b/Resources/Prototypes/Traits/speech.yml
index 98d0368ed6e..dca599eb1ff 100644
--- a/Resources/Prototypes/Traits/speech.yml
+++ b/Resources/Prototypes/Traits/speech.yml
@@ -9,6 +9,7 @@
   components:
   - type: Accentless
     removes:
+    - type: GoblinAccent # Frontier
     - type: LizardAccent
     - type: MothAccent
     - type: ReplacementAccent
diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_materials.yml
index eee8c97f24e..e78102bc6e1 100644
--- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_materials.yml
+++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_materials.yml
@@ -1,14 +1,3 @@
-- type: cargoProduct
-  id: Materials
-  abstract: true
-  icon:
-    sprite: Objects/Materials/Sheets/metal.rsi
-    state: steel_3
-  product: CrateMaterials
-  cost: 8400 # TODO: Lower the cost back when possible
-  category: cargoproduct-category-name-materials
-  group: market
-
 - type: cargoProduct
   id: MaterialUranium
   abstract: true
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml
index 9d16c9afbde..5f0c4e4a073 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml
@@ -1,17 +1,3 @@
-- type: entity
-  id: CrateMaterials
-  parent: CrateGenericSteel
-  name: materials crate
-  description: 1 stack of glass, plastic, steel, plasma and plasteel.
-  components:
-  - type: StorageFill
-    contents:
-      - id: SheetGlass
-      - id: SheetPlastic
-      - id: SheetSteel
-      - id: SheetPlasma
-      - id: SheetPlasteel
-
 - type: entity
   id: CrateMaterialMetalRods
   parent: CrateGenericSteel
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/misc.yml
new file mode 100644
index 00000000000..c0d8ac39bb6
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/misc.yml
@@ -0,0 +1,11 @@
+# region Materials
+- type: entity
+  parent: [ LockerMaterials, StorageFillMaterialsBasic ]
+  id: LockerMaterialsBasicFilled
+  suffix: Filled, Basic Materials (full)
+
+- type: entity
+  parent: [ LockerMaterials, StorageFillMaterialsBasic10 ]
+  id: LockerMaterialsBasic10Filled
+  suffix: Filled, Basic Materials (10)
+# endregion Materials
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Catalog/Jukebox/Standard.yml b/Resources/Prototypes/_NF/Catalog/Jukebox/Standard.yml
index 65c475f5e2b..a7f17842243 100644
--- a/Resources/Prototypes/_NF/Catalog/Jukebox/Standard.yml
+++ b/Resources/Prototypes/_NF/Catalog/Jukebox/Standard.yml
@@ -1,3 +1,15 @@
+- type: jukebox
+  id: victory
+  name: Koruu Chan - Victory
+  path:
+    path: /Audio/_NF/Jukebox/victory.ogg
+
+- type: jukebox
+  id: shibamata
+  name: Shibamata
+  path:
+    path: /Audio/_NF/Jukebox/shibamata.ogg
+
 - type: jukebox
   id: lateraligator
   name: Silverman Sound Studios - Later Alligator
@@ -8,4 +20,4 @@
   id: frontierarrivals
   name: Troglodyte71 - Frontier Arrivals
   path:
-    path: /Audio/_NF/Jukebox/frontier-arrivals.ogg
\ No newline at end of file
+    path: /Audio/_NF/Jukebox/frontier-arrivals.ogg
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/cargo.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/cargo.yml
index 5708a6d85b9..e423f4c643d 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/cargo.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/cargo.yml
@@ -30,7 +30,6 @@
           state: icon
     - type: RandomSpawner
       prototypes:
-        - CrateMaterials
         - CrateMaterialGlass
         - CrateMaterialPlastic
         - CrateMaterialPlasteel
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml
index 00897e2159e..000f56191f5 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml
@@ -280,7 +280,6 @@
     - CrateMaterialPlasma
     - CrateMaterialUranium
     - CrateMaterialTextiles
-    - CrateMaterials
     - CrateMaterialBrass
     - WeldingFuelTankFull
     # Filled crates
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml
index 4e2e68ff8e3..d775f5ad52f 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml
@@ -327,7 +327,6 @@
     - CrateMaterialPlasma
     - CrateMaterialUranium
     - CrateMaterialTextiles
-    - CrateMaterials
     - CrateMaterialBrass
     - CrateMaterialMetalRods
     - CrateMaterialPaper
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml
index cf4e39b2190..f82e6d22d52 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml
@@ -142,7 +142,6 @@
     - CrateMaterialPlasma
     - CrateMaterialUranium
     - CrateMaterialTextiles
-    - CrateMaterials
     - CrateMaterialBrass
     - CrateMaterialMetalRods
     - CrateMaterialPaper
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_syndicate.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_syndicate.yml
index b942b4e59e0..3186f565dc5 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_syndicate.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_syndicate.yml
@@ -485,6 +485,7 @@
   parent:
   - MobHumanoidHostileBase
   - MobHumanoidHostileAISimpleMelee
+  - NFMobRestrictions
   id: MobExperimentationVictim
   categories: [ HideSpawnMenu ]
   components:
@@ -501,6 +502,10 @@
     - type: HTN
       rootTask:
         task: SimpleHumanoidHostileCompound
+    - type: NFSalvageMobRestrictions
+      despawnIfOffLinkedGrid: false
+      addComponentsOnDeath: []
+      removeComponentsOnDeath: []
 
 # Syndicate Commander, "armed" with AK
 - type: entity
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml
index d7ef2fd5e6c..a5e71d7b380 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/silicon.yml
@@ -47,6 +47,7 @@
   parent:
   - MobCleanBot
   - BaseC3SyndicateContrabandNoValue
+  - NFMobRestrictions
   id: MobCleanBotSyndie
   name: syndicate cleanbot
   description: The creep of automation now threatening space janitors with a knife.
@@ -59,3 +60,7 @@
   - type: HTN
     rootTask:
       task: CleanbotCompound
+  - type: NFSalvageMobRestrictions
+    despawnIfOffLinkedGrid: false
+    addComponentsOnDeath: []
+    removeComponentsOnDeath: []
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index 80c4fd64ad8..1e94e935ee8 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -56,6 +56,41 @@
     stateDoorOpen: pilot_open
     stateDoorClosed: pilot_door
 
+# Materials
+- type: entity
+  id: LockerMaterials
+  parent: NFLockerBaseSecure
+  name: materials locker
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: secure
+    stateDoorOpen: secure_open
+    stateDoorClosed: secure_door
+  - type: GenericVisualizer
+    visuals:
+      enum.StorageVisuals.Open:
+        decal1:
+          True: { visible: false }
+          False: { visible: true }
+        decal2:
+          True: { visible: false }
+          False: { visible: true }
+  - type: Sprite
+    layers:
+    - state: secure
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: secure_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: door-decal-engi-01
+      map: [ decal1 ]
+      color: "#ad8c27"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
 # Wooden Cabinet
 - type: entity
   id: LockerWoodenGeneric
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml
index 9c0a0d4b5f4..82a4096eadb 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml
@@ -908,6 +908,166 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtLawyerGood
 
+- type: loadout
+  id: ContractorClothingUniformJumpskirtBlackElegantDress
+  name: black elegant dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtBlackElegantDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtRedElegantDress
+  name: red elegant dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtRedElegantDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtGreenElegantDress
+  name: green elegant dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtGreenElegantDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtBlueElegantDress
+  name: blue elegant dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtBlueElegantDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtPurpleElegantDress
+  name: purple elegant dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtPurpleElegantDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtCyanStripedDress
+  name: cyan striped dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtCyanStripedDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtRedStripedDress
+  name: red striped dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtRedStripedDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtGreenStripedDress
+  name: green striped dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtGreenStripedDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtPinkStripedDress
+  name: pink striped dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtPinkStripedDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtOrangeStripedDress
+  name: orange striped dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtOrangeStripedDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtPurpleTurtleneckDress
+  name: purple turtleneck dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtPurpleTurtleneckDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtRedTurtleneckDress
+  name: red turtleneck dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtRedTurtleneckDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtGreenTurtleneckDress
+  name: green turtleneck dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtGreenTurtleneckDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtBlueTurtleneckDress
+  name: blue turtleneck dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtBlueTurtleneckDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtYellowTurtleneckDress
+  name: yellow turtleneck dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtYellowTurtleneckDress
+
+- type: loadout
+  id: ContractorClothingUniformJumpskirtYellowOldDress
+  name: yellow old dress
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtYellowOldDress
+
 # Punk stuff
 - type: loadout
   id: ContractorClothingUniformRandomPunkCroptop
diff --git a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml
index 689dec9ac50..e3112b8fa0f 100644
--- a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml
+++ b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml
@@ -176,6 +176,23 @@
   - ContractorClothingUniformJumpsuitMilitaryColorPurple
   - ContractorClothingUniformJumpsuitMilitaryColorLightBrown
   - ContractorClothingUniformJumpsuitMilitaryColorBrown
+  - ContractorClothingUniformJumpskirtBlackElegantDress
+  - ContractorClothingUniformJumpskirtRedElegantDress
+  - ContractorClothingUniformJumpskirtGreenElegantDress
+  - ContractorClothingUniformJumpskirtBlueElegantDress
+  - ContractorClothingUniformJumpskirtPurpleElegantDress
+  - ContractorClothingUniformJumpskirtCyanStripedDress
+  - ContractorClothingUniformJumpskirtRedStripedDress
+  - ContractorClothingUniformJumpskirtGreenStripedDress
+  - ContractorClothingUniformJumpskirtPinkStripedDress
+  - ContractorClothingUniformJumpskirtOrangeStripedDress
+  - ContractorClothingUniformJumpskirtPurpleTurtleneckDress
+  - ContractorClothingUniformJumpskirtRedTurtleneckDress
+  - ContractorClothingUniformJumpskirtGreenTurtleneckDress
+  - ContractorClothingUniformJumpskirtBlueTurtleneckDress
+  - ContractorClothingUniformJumpskirtYellowTurtleneckDress
+  - ContractorClothingUniformJumpskirtYellowOldDress
+
   fallbacks:
   - ContractorClothingUniformJumpsuitColorGrey
   - ContractorClothingUniformJumpskirtColorGrey
diff --git a/Resources/Prototypes/_NF/Shipyard/tyne.yml b/Resources/Prototypes/_NF/Shipyard/tyne.yml
index f8be91c4700..395dc574e7d 100644
--- a/Resources/Prototypes/_NF/Shipyard/tyne.yml
+++ b/Resources/Prototypes/_NF/Shipyard/tyne.yml
@@ -13,7 +13,7 @@
   parent: BaseVessel
   name: SBB Tyne
   description: A small, agile lifeboat with an exterior deck and survivor cabin for search and rescue operations.
-  price: 22250 #~5% markup as it's a med ship. Appraises at ~21001.
+  price: 23000 #~5% markup as it's a med ship. Appraises at ~22474.
   category: Small
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/tyne.yml
diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/door-decal-engi-01.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/door-decal-engi-01.png
new file mode 100644
index 00000000000..9deb0952451
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/door-decal-engi-01.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/door-decal-null.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/door-decal-null.png
new file mode 100644
index 00000000000..2975c479be7
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/door-decal-null.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/generic_open.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/generic_open.png
new file mode 100644
index 00000000000..01ed5bf73b6
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/generic_open.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json
index 916317fe5b4..e72f740dbf3 100644
--- a/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json
+++ b/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json
@@ -19,9 +19,21 @@
     {
       "name": "generic"
     },
+    {
+      "name": "secure_door"
+    },
+    {
+      "name": "secure_open"
+    },
+    {
+      "name": "secure"
+    },
     {
       "name": "generic_door"
     },
+    {
+      "name": "generic_open"
+    },
     {
       "name": "locked"
     },
@@ -135,6 +147,12 @@
     },
     {
       "name": "o2n2_door"
+    },
+    {
+      "name": "door-decal-engi-01"
+    },
+    {
+      "name": "door-decal-null"
     }
   ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/secure.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/secure.png
new file mode 100644
index 00000000000..1c1a305ebe3
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/secure.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/secure_door.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/secure_door.png
new file mode 100644
index 00000000000..6e2507406eb
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/secure_door.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/secure_open.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/secure_open.png
new file mode 100644
index 00000000000..8437fe8a986
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/secure_open.png differ
diff --git a/Resources/_NF/migration.yml b/Resources/_NF/migration.yml
index f17c5ceb6af..012b6d148dc 100644
--- a/Resources/_NF/migration.yml
+++ b/Resources/_NF/migration.yml
@@ -182,6 +182,9 @@ ScienceTechFab: UnfinishedMachineFrame
 ScienceTechFabCircuitboard: ProtolatheMachineCircuitboard
 ScienceTechFabFlatpack: ProtolatheFlatpack
 
+# 2024-12-27 Materials crate
+CrateMaterials: LockerMaterialsBasicFilled
+
 # 2025-01-05 Lights
 ColoredLightTubeRed: LightTubeCrystalRed
 ColoredBlueLightTube: LightTubeCrystalBlue