Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

9/11 for vocaloid fans #1614

Merged
merged 2 commits into from
Feb 8, 2025
Merged

9/11 for vocaloid fans #1614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7db332
death to hatsune miku
hivehum Feb 8, 2025
414da3e
reorganized pietyvend
hivehum Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Resources/Prototypes/Catalog/Fills/Boxes/general.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
amount: 12
- type: Tag
tags:
- DroneUsable
- DroneUsable

- type: entity
name: mixed lights box
Expand All @@ -101,7 +101,7 @@
amount: 6
- type: Tag
tags:
- DroneUsable
- DroneUsable

- type: entity
name: holiday lighttube box
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -281,7 +281,7 @@
- state: trashbag
- type: Tag
tags:
- DroneUsable
- DroneUsable

- type: entity
name: passenger encryption key box
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Catalog/Fills/Crates/service.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 6 additions & 3 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading