diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
index 196ef2fae71..0a0ed6c40df 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -448,7 +448,7 @@
     stateDoorClosed: crate_door
 
 - type: entity
-  parent: CrateGeneric
+  parent: CratePirate
   id: CratePirateGrey
   name: pirate chest
   description: A space pirate chest, not for station lubbers.
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml
index 5679150b0ff..6216cc285f9 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml
@@ -195,4 +195,32 @@
   - type: Sprite
     sprite: _NF/Structures/Storage/Crates/nfsd_secure2.rsi
   - type: AccessReader
-    access: [["Security"]]
\ No newline at end of file
+    access: [["Security"]]
+
+- type: entity
+  parent: CratePirate
+  id: CratePirateGrey
+  name: pirate chest
+  description: A space pirate chest, not for station lubbers.
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Storage/Crates/piratechestgrey.rsi
+    layers:
+    - state: crate
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: crate_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: paper
+      sprite: Structures/Storage/Crates/labels.rsi
+      offset: "0.0,-0.09375"
+      map: ["enum.PaperLabelVisuals.Layer"]
+  - type: Icon
+    sprite: _NF/Structures/Storage/Crates/piratechestgrey.rsi
+    state: crate_icon
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateDoorOpen: crate_open
+    stateDoorClosed: crate_door
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/Crates/piratechestgrey.rsi/crate.png b/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate.png
similarity index 100%
rename from Resources/Textures/Structures/Storage/Crates/piratechestgrey.rsi/crate.png
rename to Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate.png
diff --git a/Resources/Textures/Structures/Storage/Crates/piratechestgrey.rsi/crate_door.png b/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate_door.png
similarity index 100%
rename from Resources/Textures/Structures/Storage/Crates/piratechestgrey.rsi/crate_door.png
rename to Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate_door.png
diff --git a/Resources/Textures/Structures/Storage/Crates/piratechestgrey.rsi/crate_icon.png b/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate_icon.png
similarity index 100%
rename from Resources/Textures/Structures/Storage/Crates/piratechestgrey.rsi/crate_icon.png
rename to Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate_icon.png
diff --git a/Resources/Textures/Structures/Storage/Crates/piratechestgrey.rsi/crate_open.png b/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate_open.png
similarity index 100%
rename from Resources/Textures/Structures/Storage/Crates/piratechestgrey.rsi/crate_open.png
rename to Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/crate_open.png
diff --git a/Resources/Textures/Structures/Storage/Crates/piratechestgrey.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Structures/Storage/Crates/piratechestgrey.rsi/meta.json
rename to Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/meta.json
diff --git a/Resources/Textures/Structures/Storage/Crates/piratechestgrey.rsi/sparking.png b/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/sparking.png
similarity index 100%
rename from Resources/Textures/Structures/Storage/Crates/piratechestgrey.rsi/sparking.png
rename to Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/sparking.png
diff --git a/Resources/Textures/Structures/Storage/Crates/piratechestgrey.rsi/welded.png b/Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/welded.png
similarity index 100%
rename from Resources/Textures/Structures/Storage/Crates/piratechestgrey.rsi/welded.png
rename to Resources/Textures/_NF/Structures/Storage/Crates/piratechestgrey.rsi/welded.png