diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 5d42146f743..35de5555a29 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -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. diff --git a/Resources/Locale/en-US/reagents/meta/biological.ftl b/Resources/Locale/en-US/reagents/meta/biological.ftl index 10a9a07e08a..a320bbdcb38 100644 --- a/Resources/Locale/en-US/reagents/meta/biological.ftl +++ b/Resources/Locale/en-US/reagents/meta/biological.ftl @@ -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. diff --git a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl index 88ec3c47266..50ea5f590c7 100644 --- a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl @@ -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 diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml index 8b4b78cac06..69fc630b9e4 100644 --- a/Resources/Prototypes/Body/Organs/diona.yml +++ b/Resources/Prototypes/Body/Organs/diona.yml @@ -46,7 +46,7 @@ food: maxVol: 5 reagents: - - ReagentId: UncookedAnimalProteins + - ReagentId: GreyMatter Quantity: 5 - type: entity diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml index fe33c11029f..69081020ce0 100644 --- a/Resources/Prototypes/Body/Organs/human.yml +++ b/Resources/Prototypes/Body/Organs/human.yml @@ -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 diff --git a/Resources/Prototypes/Body/Organs/slime.yml b/Resources/Prototypes/Body/Organs/slime.yml index 46b18010770..3da76c5d4aa 100644 --- a/Resources/Prototypes/Body/Organs/slime.yml +++ b/Resources/Prototypes/Body/Organs/slime.yml @@ -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 @@ -56,7 +60,7 @@ solutions: organ: reagents: - - ReagentId: Nutriment + - ReagentId: Slime Quantity: 10 Lung: maxVol: 100.0 diff --git a/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml b/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml index 829525439ed..028e348fd49 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml @@ -77,6 +77,7 @@ - Material - Pda - IdCard + - Brain tags: - HighRiskItem soundCooldown: 0 diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index ed231e224bf..254b563affa 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -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 diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml index af6f2557ba1..c24c073f037 100644 --- a/Resources/Prototypes/Reagents/biological.yml +++ b/Resources/Prototypes/Reagents/biological.yml @@ -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