maybe fixed merge conflict

new-frontiers-14 · Dec 24, 2023 · 7cdaaf1 · 7cdaaf1
1 parent 4759798
commit 7cdaaf1
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
@@ -15,6 +15,9 @@
     ClothingHeadHatWitch1: 3
     ClothingOuterPlagueSuit: 3
     ClothingMaskPlague: 3
+    ClothingHeadsetService: 4
+    RubberStampChaplain: 3
+    Bible: 3
     ClothingHeadHatKippah: 3
     ClothingHeadHatWideBrimmed: 3
     ClothingHeadHatPilgrim: 3
@@ -27,14 +30,11 @@
     ClothingOuterCoatWitchHunter: 3
     ClothingNeckScarfChaplainStole: 3
     ClothingBeltChaplainSash: 3
-    ClothingHeadsetService: 4
-    RubberStampChaplain: 3
     UrnMortuary: 4
-    Bible: 3
     Censer: 2
     ClothingNeckCrucifix: 3
   emaggedInventory:
-    WoodenStake: 2
+    WoodenStake: 6
     ClothingOuterArmorCult: 1
     ClothingHeadHelmetCult: 1
     ClothingOuterRobesCult: 3