should fix conflicts

DeltaV-Station · Nov 6, 2024 · a822e94 · a822e94
1 parent fa7233b
commit a822e94
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml
@@ -218,3 +218,8 @@
   materials:
     Steel: 1000
     Plastic: 800
+
+- type: latheRecipe
+  parent: ClothingShoesBootsMagSci
+  id: ClothingShoesBootsSecurityMagboots
+  result: ClothingShoesBootsSecurityMagboots
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -939,6 +939,7 @@
       - ClothingOuterHardsuitJuggernautReverseEngineered
       - ClothingOuterHardsuitSyndieReverseEngineered
       - AdvancedTruncheon
+      - ClothingShoesBootsSecurityMagboots
       # End DeltaV additions
   - type: MaterialStorage
     whitelist: