diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
index b5c34c4f7f..0e141b3894 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -37,6 +37,8 @@
         prob: 0.3
       - id: CableApcStack
         prob: 0.3
+      - id: AirlockPainter
+        prob: 0.7
 
 - type: entity
   id: LockerElectricalSuppliesFilled
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml
index c734328417..eff047abcc 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml
@@ -14,3 +14,4 @@
     GasAnalyzer: 5
     ClothingHandsGlovesColorYellowBudget: 5
     ClothingBeltUtility: 3
+    AirlockPainter: 3
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index fd83dd51bd..25edf036d7 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -64,6 +64,7 @@
       - Wrench
       - Crowbar
       - Multitool
+      - AirlockPainter
       - MiniHoe
       - Shovel
       - Spade
diff --git a/Resources/Prototypes/Recipes/Lathes/tools.yml b/Resources/Prototypes/Recipes/Lathes/tools.yml
index 2c91e78347..736b371735 100644
--- a/Resources/Prototypes/Recipes/Lathes/tools.yml
+++ b/Resources/Prototypes/Recipes/Lathes/tools.yml
@@ -143,3 +143,12 @@
   materials:
     Steel: 800
     Glass: 300
+
+- type: latheRecipe
+  id: AirlockPainter
+  icon: /Textures/Objects/Tools/airlock_painter.rsi/airlock_painter.png
+  result: AirlockPainter
+  completetime: 2
+  materials:
+    Steel: 300
+    Plastic: 100