From 7cdaaf1be87de1a5d9aeeca94b204e950f17c139 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Sun, 24 Dec 2023 21:59:02 +0300 Subject: [PATCH] maybe fixed merge conflict --- .../Catalog/VendingMachines/Inventories/chapel.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml index 62d7ece967f..d93f74c31b0 100644 --- 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