merge conflicts

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

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml
@@ -210,6 +210,11 @@
     Silver: 100
     Plasma: 500
 
+- type: latheRecipe
+  parent: ClothingShoesBootsMagSci
+  id: ClothingShoesBootsSecurityMagboots
+  result: ClothingShoesBootsSecurityMagboots
+
 - type: latheRecipe
   parent: BaseWeaponRecipe
   id: AdvancedTruncheon
@@ -218,8 +223,3 @@
   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
@@ -938,8 +938,8 @@
       - MagazineBoxSpecialMindbreaker
       - ClothingOuterHardsuitJuggernautReverseEngineered
       - ClothingOuterHardsuitSyndieReverseEngineered
-      - AdvancedTruncheon
       - ClothingShoesBootsSecurityMagboots
+      - AdvancedTruncheon
       # End DeltaV additions
   - type: MaterialStorage
     whitelist: