From e7db332e5cb804f0fd65ac94d66cd410a6e14bb1 Mon Sep 17 00:00:00 2001 From: hivehum Date: Sat, 8 Feb 2025 13:25:00 -0500 Subject: [PATCH 1/2] death to hatsune miku --- Resources/Prototypes/Catalog/Fills/Boxes/general.yml | 10 +++++----- Resources/Prototypes/Catalog/Fills/Crates/service.yml | 4 ++-- .../Catalog/VendingMachines/Inventories/chapel.yml | 3 +++ .../Catalog/VendingMachines/Inventories/theater.yml | 6 +++--- .../Entities/Objects/Weapons/Melee/gohei.yml | 2 +- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index 75bbe7a48327..de6f4f7d6cb7 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -82,7 +82,7 @@ amount: 12 - type: Tag tags: - - DroneUsable + - DroneUsable - type: entity name: mixed lights box @@ -101,7 +101,7 @@ amount: 6 - type: Tag tags: - - DroneUsable + - DroneUsable - type: entity name: holiday lighttube box @@ -238,8 +238,8 @@ components: - type: StorageFill contents: - - id: ClothingShoesBootsPerformer - - id: ClothingUniformJumpskirtPerformer + # - id: ClothingShoesBootsPerformer # imp - death to vocaloid + # - id: ClothingUniformJumpskirtPerformer # imp - death to vocaloid - id: FoodMealMemoryleek amount: 2 @@ -281,7 +281,7 @@ - state: trashbag - type: Tag tags: - - DroneUsable + - DroneUsable - type: entity name: passenger encryption key box diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index 59a1ed476d78..dd0f9963d306 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -87,8 +87,8 @@ components: - type: StorageFill contents: - - id: ClothingUniformJumpskirtPerformer - - id: ClothingShoesBootsPerformer + # - id: ClothingUniformJumpskirtPerformer # imp - death to vocaloid + # - id: ClothingShoesBootsPerformer # imp - death to vocaloid - id: ClothingOuterSuitMonkey - id: ClothingHeadHatAnimalMonkey - id: ClothingNeckCloakMoth diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml index 144bc7b8a78b..a189f9672926 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml @@ -26,6 +26,9 @@ ClothingHeadHatKippahSimple: 3 #imp ClothingHeadHatKippahWhiteAndBlue: 1 #imp ClothingHeadHatKippahBlueAndGold: 1 #imp + ClothingHeadHatShrineMaidenWig: 2 # imp edit - giving this religious outfit the sanctity it deserves + ClothingOuterSuitShrineMaiden: 2 + Gohei: 2 contrabandInventory: ClothingMaskClownChaplin: 1 ClothingOuterClownPriest: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index d3c4395cedba..836abee42b2c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -36,9 +36,9 @@ ClothingHeadHatChickenhead: 2 ClothingOuterSuitMonkey: 2 ClothingHeadHatPumpkin: 2 - ClothingHeadHatShrineMaidenWig: 2 - ClothingOuterSuitShrineMaiden: 2 - Gohei: 2 + # ClothingHeadHatShrineMaidenWig: 2 # imp edit - giving this religious outfit the sanctity it deserves + # ClothingOuterSuitShrineMaiden: 2 + # Gohei: 2 ClothingOuterSuitWitchRobes: 2 ClothingHeadHatWitch1: 2 ClothingHeadHatRedRacoon: 2 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml index ff39bc7a576a..f3b6fee7923c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml @@ -2,7 +2,7 @@ name: gohei parent: BaseItem id: Gohei - description: A wooden stick with white streamers at the end. Originally used by shrine maidens to purify things. Now used by the station's weeaboos. + description: A wooden stick with white streamers at the end. Originally used by shrine maidens to purify things. # Now used by the station's weeaboos. components: - type: Sprite sprite: Objects/Weapons/Melee/gohei.rsi From 414da3ee5f72434a77d79c118245512f583a9aa4 Mon Sep 17 00:00:00 2001 From: hivehum Date: Sat, 8 Feb 2025 13:52:30 -0500 Subject: [PATCH 2/2] reorganized pietyvend --- .../Catalog/VendingMachines/Inventories/chapel.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml index a189f9672926..ddc982090c11 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml @@ -12,23 +12,23 @@ ClothingOuterHoodieBlack: 1 ClothingHeadHatHoodNunHood: 1 ClothingOuterNunRobe: 1 + ClothingHeadHatKippahSimple: 3 #imp + ClothingHeadHatKippahWhiteAndBlue: 1 #imp + ClothingHeadHatKippahBlueAndGold: 1 #imp ClothingHeadHatFez: 1 ClothingHeadHatPlaguedoctor: 1 ClothingHeadHatWitch: 1 ClothingHeadHatWitch1: 1 ClothingOuterPlagueSuit: 1 ClothingMaskPlague: 1 + ClothingHeadHatShrineMaidenWig: 2 # imp edit - giving this religious outfit the sanctity it deserves + ClothingOuterSuitShrineMaiden: 2 # imp ClothingHeadsetService: 2 + Gohei: 2 Bible: 1 BoxCandle: 2 BoxCandleSmall: 2 Urn: 5 - ClothingHeadHatKippahSimple: 3 #imp - ClothingHeadHatKippahWhiteAndBlue: 1 #imp - ClothingHeadHatKippahBlueAndGold: 1 #imp - ClothingHeadHatShrineMaidenWig: 2 # imp edit - giving this religious outfit the sanctity it deserves - ClothingOuterSuitShrineMaiden: 2 - Gohei: 2 contrabandInventory: ClothingMaskClownChaplin: 1 ClothingOuterClownPriest: 1