diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml
index bd142771e27..2b11b1ec190 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml
@@ -12,3 +12,16 @@
     JetpackMiniFilled: 10
     EncryptionKeyTraffic: 30
     HandHeldMassScanner: 10
+# Pilot drip
+    ClothingBackpackPilot: 3
+    ClothingBackpackDuffelPilot: 3
+    ClothingBackpackSatchelPilot: 3
+    ClothingUniformJumpsuitPilot: 3
+    ClothingOuterCoatBomber: 3
+    ClothingHeadsetAltPilot: 3
+    ClothingEyesGlassesPilot: 3
+    ClothingHandsGlovesPilot: 3
+    ClothingHeadHatPilot: 3
+    ClothingNeckScarfPilot: 3
+    ClothingOuterHardsuitPilot: 3
+    ClothingShoesBootsPilot: 3
\ No newline at end of file
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 8ad7ca3c39c..00d06fc3747 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -51,3 +51,31 @@
     - state: welded
       visible: false
       map: ["enum.WeldableLayers.BaseWelded"]
+
+# Pilot
+- type: entity
+  id: LockerPilot
+  parent: LockerBaseSecure
+  name: pilot's locker
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: pilot
+    stateDoorOpen: pilot_open
+    stateDoorClosed: pilot_door
+  - type: Sprite
+    sprite: _NF/Structures/Storage/closet.rsi
+    noRot: true
+    layers:
+    - state: generic
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: generic_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: locked
+      map: ["enum.StorageVisualLayers.Lock"]
+      shader: unshaded
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+  - type: AccessReader
+    access: [["Captain"], ["Pilot"]]
diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json
index 53980c8fa3a..29037a14845 100644
--- a/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json
+++ b/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json
@@ -4,7 +4,7 @@
     "x": 32,
     "y": 32
   },
-  "copyright": "Taken from tgstation, mercenary locker is a resprited armory locker by erhardsteinhauer (discord), janitor is by SungYandy",
+  "copyright": "Taken from tgstation, mercenary and pilot lockers are resprited armory locker by erhardsteinhauer (discord), janitor is by SungYandy",
   "license": "CC-BY-SA-3.0",
   "states": [
     {
@@ -34,6 +34,15 @@
 	{
       "name": "mercenary_open"
 	},
+	{
+      "name": "pilot"
+	},
+	{
+      "name": "pilot_door"
+	},
+	{
+      "name": "pilot_open"
+	},
     {
       "name": "unlocked"
     },
diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/pilot.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/pilot.png
new file mode 100644
index 00000000000..9c64d730958
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/pilot.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/pilot_door.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/pilot_door.png
new file mode 100644
index 00000000000..3430dbe59a6
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/pilot_door.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/pilot_open.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/pilot_open.png
new file mode 100644
index 00000000000..35d9e7fd8b2
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/pilot_open.png differ