Grey Matter Addition and Slime Organ Tweak (#25464)

* Added Grey Matter

* Update diona.yml

* Update human.yml

* Update slime.yml

* Update flavors.yml

* Update biological.yml

* Update physical-desc.ftl

* Update biological.ftl

* Make Slime Brain Grindable

* Slime Organs Grind into Slime

* Update flavor-profiles.ftl

* Added Brain to Blacklist

diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index 5d42146f7439e102b23e5237ec7e35898d329d2c..35de5555a29bcd32e92c71d65c826eeba9eacf6c 100644 (file)
--- 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 10a9a07e08a670c00c273297c9dca6ddb1efae03..a320bbdcb384c6d3917d48cecfe982565202a023 100644 (file)
--- 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 24340e63a61fd0d7b1eb5bb669dcba8b15e35250..2e959bf14e04467ec016225ea9fea44818787c32 100644 (file)
--- a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
+++ b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
@@ -96,3 +96,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 8b4b78cac0691f92f54a984b29ce3410ba63cb5a..69fc630b9e4d5b9f6bde55023cccf1fffaa717c9 100644 (file)
--- 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 fe33c11029f00c9d9160054fe085366396ffab0d..69081020ce0bcdcc4002e34b221c6f9d3bd6be95 100644 (file)
--- 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 46b18010770e5584ad912825a80225dc645fafee..3da76c5d4aacc4b7e64c9546cdda3fc1fd6ff649 100644 (file)
--- 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 829525439ed384f817a7a37bf5b676ec77bc69d5..028e348fd49beae38c4d19dae0707e026600a985 100644 (file)
--- 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 44d8847bae967f39eb34146e9ec3f1201574ce97..446abf99ed4f441e303697f8b3ca64b14faca2ec 100644 (file)
--- 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 af6f2557ba1171572bae92f948edac2f55737720..c24c073f03786e28ba54f466490fc2317cca271b 100644 (file)
--- 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