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.

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

Adds flavors to a bunch of things without them #31685

Merged
merged 4 commits into from
Sep 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/flavors/flavor-profiles.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ flavor-base-horrible = horrible
# lmao
flavor-base-terrible = terrible
flavor-base-mindful = mindful
flavor-base-chewy = chewy

# Complex flavors. Put a flavor here when you want something that's more
# specific.
Expand Down Expand Up @@ -173,6 +174,8 @@ flavor-complex-violets = like violets
flavor-complex-pyrotton = like a burning mouth
flavor-complex-mothballs = like mothballs
flavor-complex-paint-thinner = like paint thinner
flavor-complex-paper = like mushy pulp
flavor-complex-compressed-meat = like compressed meat

# Drink-specific flavors.

Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Clothing/base_clothing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
- WhitelistChameleon
- type: StaticPrice
price: 10
- type: FlavorProfile #yes not every peice of clothing is edible, but this way every edible piece of clothing should have the flavor without me having to track down what specific clothing can and cannot be eaten.
flavors:
- fiber

- type: entity
abstract: true
Expand Down
14 changes: 14 additions & 0 deletions Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,11 @@
bloodReagent: InsectBlood
bloodMaxVolume: 20
- type: Food
- type: FlavorProfile
flavors:
- horrible
- terrible
- chewy
- type: Hunger
baseDecayRate: 0.25
- type: Extractable
Expand Down Expand Up @@ -957,6 +962,9 @@
requiresSpecialDigestion: true
# Wooly prevents eating wool deleting the goat so its fine
requireDead: false
- type: FlavorProfile
flavors:
- fiber
- type: Butcherable
spawned:
- id: FoodMeat
Expand Down Expand Up @@ -1635,6 +1643,9 @@
Dead:
Base: splat-0
- type: Food
- type: FlavorProfile
flavors:
- meaty
- type: Thirst
startingThirst: 25 # spawn with Okay thirst state
thresholds:
Expand Down Expand Up @@ -3179,6 +3190,9 @@
Dead:
Base: splat-0
- type: Food
- type: FlavorProfile
flavors:
- meaty
- type: Hunger
baseDecayRate: 0.3
- type: Extractable
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,10 @@
- Hamster
- VimPilot
- ChefPilot
- type: FlavorProfile
flavors:
- meaty
- sadness

- type: entity
name: Shiva
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Entities/Objects/Fun/crayons.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
- type: Crayon
capacity: 15
- type: Food
- type: FlavorProfile
flavors:
- chewy
- bitter
- type: SolutionContainerManager
solutions:
food:
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Entities/Objects/Materials/materials.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@
- type: Appearance
- type: Food
requiresSpecialDigestion: true
- type: FlavorProfile
flavors:
- fiber
- type: SolutionContainerManager
solutions:
food:
Expand Down Expand Up @@ -405,6 +408,9 @@
- type: Appearance
- type: Food
requiresSpecialDigestion: true
- type: FlavorProfile
flavors:
- fiber
- type: SolutionContainerManager
solutions:
food:
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Objects/Misc/paper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@
solution: food
delay: 7
forceFeedDelay: 7
- type: FlavorProfile
flavors:
- paper
- type: BadFood
- type: SolutionContainerManager
solutions:
Expand Down
14 changes: 12 additions & 2 deletions Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
Quantity: 10
- type: Food
solution: cube
- type: FlavorProfile
flavors:
- chewy
- horrible
- compressed-meat
- type: RefillableSolution
solution: cube
- type: Sprite
Expand Down Expand Up @@ -161,7 +166,7 @@
plushie:
maxVol: 11 # needs room for water
reagents:
- ReagentId: Nutriment
- ReagentId: Nutriment #contains nutriment like other dehydrated animals, but isn't edible? Who is grinding dehydrated carp to eat them??
Quantity: 10
- type: RefillableSolution
solution: plushie
Expand Down Expand Up @@ -205,7 +210,7 @@
sound:
path: /Audio/Effects/bite.ogg

- type: entity
- type: entity #why is this all redefined down here as a parent of base object instead of just being parented to monkeycube?? TODO: Fix this shit
parent: BaseItem
id: SyndicateSponge
name: monkey cube
Expand All @@ -223,6 +228,11 @@
Quantity: 10
- type: Food
solution: cube
- type: FlavorProfile
flavors:
- chewy
- horrible
- compressed-meat
- type: RefillableSolution
solution: cube
- type: Sprite
Expand Down
16 changes: 16 additions & 0 deletions Resources/Prototypes/Flavors/flavors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,11 @@
flavorType: Base
description: flavor-base-mindful

- type: flavor
id: chewy
flavorType: Base
description: flavor-base-chewy

- type: flavor
id: mustard
flavorType: Complex
Expand Down Expand Up @@ -1113,3 +1118,14 @@
id: cherry
flavorType: Complex
description: flavor-complex-cherry

- type: flavor
id: paper
flavorType: Complex
description: flavor-complex-paper

- type: flavor
id: compressed-meat
flavorType: Complex
description: flavor-complex-compressed-meat

Loading