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

Mirror: Grey Matter Addition and Slime Organ Tweak #175

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
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/flavors/flavor-profiles.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ flavor-base-clean = clean
flavor-base-alkaline = alkaline
flavor-base-holy = holy
flavor-base-horrible = horrible

# lmao
flavor-base-terrible = terrible
flavor-base-mindful = mindful

# Complex flavors. Put a flavor here when you want something that's more
# specific.
Expand Down
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/reagents/meta/biological.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ reagent-desc-fat = No matter how it was obtained, its application is important.

reagent-name-vomit = vomit
reagent-desc-vomit = You can see a few chunks of someone's last meal in it.

reagent-name-grey-matter = grey matter
reagent-desc-grey-matter = Thought juice, the stuff that leaks out of your ears.
1 change: 1 addition & 0 deletions Resources/Locale/en-US/reagents/meta/physical-desc.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,4 @@ reagent-physical-desc-alkaline = alkaline
reagent-physical-desc-reflective = reflective
reagent-physical-desc-holy = holy
reagent-physical-desc-slimy = slimy
reagent-physical-desc-neural = neural
2 changes: 1 addition & 1 deletion Resources/Prototypes/Body/Organs/diona.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
food:
maxVol: 5
reagents:
- ReagentId: UncookedAnimalProteins
- ReagentId: GreyMatter
Quantity: 5

- type: entity
Expand Down
16 changes: 15 additions & 1 deletion Resources/Prototypes/Body/Organs/human.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,21 @@
- type: Tag
tags:
- Meat

- type: SolutionContainerManager
solutions:
organ:
reagents:
- ReagentId: Nutriment
Quantity: 10
food:
maxVol: 5
reagents:
- ReagentId: GreyMatter
Quantity: 5
- type: FlavorProfile
flavors:
- people

- type: entity
id: OrganHumanEyes
parent: BaseHumanOrgan
Expand Down
10 changes: 7 additions & 3 deletions Resources/Prototypes/Body/Organs/slime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,14 @@
food:
maxVol: 5
reagents:
- ReagentId: UncookedAnimalProteins
- ReagentId: GreyMatter
Quantity: 5
organ:
reagents:
- ReagentId: Slime
Quantity: 10


- type: entity
id: OrganSlimeLungs
parent: BaseHumanOrgan
Expand All @@ -56,7 +60,7 @@
solutions:
organ:
reagents:
- ReagentId: Nutriment
- ReagentId: Slime
Quantity: 10
Lung:
maxVol: 100.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
- Material
- Pda
- IdCard
- Brain
tags:
- HighRiskItem
soundCooldown: 0
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/Flavors/flavors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,11 @@
flavorType: Base
description: flavor-base-clean

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

- type: flavor
id: mustard
flavorType: Complex
Expand Down
21 changes: 21 additions & 0 deletions Resources/Prototypes/Reagents/biological.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,3 +201,24 @@
collection: FootstepBlood
params:
volume: 6

- type: reagent
id: GreyMatter
name: reagent-name-grey-matter
group: Biological
desc: reagent-desc-grey-matter
physicalDesc: reagent-physical-desc-neural
flavor: mindful
color: "#C584B8"
slippery: false
metabolisms:
Drink:
effects:
- !type:SatiateHunger
factor: 1.5
Poison:
effects:
- !type:HealthChange
damage:
types:
Cellular: 2
Loading