Merge pull request #1614 from hivehum/vocaloid-is-over

9/11 for vocaloid fans
impstation · Feb 8, 2025 · 7b6025f · 7b6025f
2 parents ef64bc9 + 414da3e
commit 7b6025f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git 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
@@ -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
@@ -12,20 +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
   contrabandInventory:
     ClothingMaskClownChaplin: 1
     ClothingOuterClownPriest: 1

diff --git 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
@@ -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