organs edible to lizards, and make their food contents uncooked proteins (#20882)

* organs edible to lizards, and make their food contents uncooked proteins

* npc mobs avoid eating brains for player QOL

diff --git a/Resources/Prototypes/Body/Organs/Animal/animal.yml b/Resources/Prototypes/Body/Organs/Animal/animal.yml
index db7793210b556fa6af0dc2c271e6c4ac5952e729..083d596152a047b2ec1674042f87eb25d66867f7 100644 (file)
--- a/Resources/Prototypes/Body/Organs/Animal/animal.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/animal.yml
@@ -14,11 +14,14 @@
       food:
         maxVol: 5
         reagents:
-        - ReagentId: Nutriment
+        - ReagentId: UncookedAnimalProteins
           Quantity: 5
   - type: FlavorProfile
     flavors:
       - chicken # everything kinda tastes like chicken
+  - type: Tag
+    tags:
+      - Meat
 
 
 - type: entity
@@ -49,7 +52,7 @@
       food:
         maxVol: 5
         reagents:
-        - ReagentId: Nutriment
+        - ReagentId: UncookedAnimalProteins
           Quantity: 5
 
 - type: entity
@@ -68,7 +71,7 @@
       food:
         maxVol: 5
         reagents:
-        - ReagentId: Nutriment
+        - ReagentId: UncookedAnimalProteins
           Quantity: 5
   - type: Stomach
   - type: Metabolizer

diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml
index 3ec991af865f3f93a493f7de037016766c424b32..b4eb11b623be6c5cc617385d400ba43b79e4a73d 100644 (file)
--- a/Resources/Prototypes/Body/Organs/arachnid.yml
+++ b/Resources/Prototypes/Body/Organs/arachnid.yml
@@ -19,8 +19,11 @@
       food:
         maxVol: 5
         reagents:
-        - ReagentId: Nutriment
+        - ReagentId: UncookedAnimalProteins
           Quantity: 5
+  - type: Tag
+    tags:
+      - Meat
 
 - type: entity
   id: OrganArachnidStomach
@@ -40,7 +43,7 @@
       food:
         maxVol: 5
         reagents:
-        - ReagentId: Nutriment
+        - ReagentId: UncookedAnimalProteins
           Quantity: 5
   - type: Metabolizer
     updateFrequency: 1.5
@@ -77,7 +80,7 @@
       food:
         maxVol: 5
         reagents:
-        - ReagentId: Nutriment
+        - ReagentId: UncookedAnimalProteins
           Quantity: 5
 
 - type: entity

diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml
index 482ec42927bda69040de3e027a8d71087ce8eb2a..282bb224d81bdc295e4e3bc2d2d2246fae43f4b5 100644 (file)
--- a/Resources/Prototypes/Body/Organs/diona.yml
+++ b/Resources/Prototypes/Body/Organs/diona.yml
@@ -19,7 +19,7 @@
       food:
         maxVol: 5
         reagents:
-        - ReagentId: Nutriment
+        - ReagentId: UncookedAnimalProteins
           Quantity: 5
   - type: FlavorProfile
     flavors:
@@ -46,7 +46,7 @@
       food:
         maxVol: 5
         reagents:
-        - ReagentId: Nutriment
+        - ReagentId: UncookedAnimalProteins
           Quantity: 5
   - type: Brain
   - type: InputMover
@@ -87,7 +87,7 @@
       food:
         maxVol: 5
         reagents:
-        - ReagentId: Nutriment
+        - ReagentId: UncookedAnimalProteins
           Quantity: 5
   - type: Stomach
   - type: Metabolizer

diff --git a/Resources/Prototypes/Body/Organs/dwarf.yml b/Resources/Prototypes/Body/Organs/dwarf.yml
index afe2c66b26ba4443a1d8838084183e25ed340d9d..8da0cb1666f92fa90a609c46ba13228c8dedcb48 100644 (file)
--- a/Resources/Prototypes/Body/Organs/dwarf.yml
+++ b/Resources/Prototypes/Body/Organs/dwarf.yml
@@ -29,7 +29,7 @@
       food:
         maxVol: 5
         reagents:
-        - ReagentId: Nutriment
+        - ReagentId: UncookedAnimalProteins
           Quantity: 5
   - type: Stomach
   - type: Metabolizer

diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml
index 1ece318f1d9ca41775dff51059dacbd2c813b480..6abf168a9e75ba4594b210b16b0300502123e12d 100644 (file)
--- a/Resources/Prototypes/Body/Organs/human.yml
+++ b/Resources/Prototypes/Body/Organs/human.yml
@@ -18,11 +18,14 @@
       food:
         maxVol: 5
         reagents:
-        - ReagentId: Nutriment
+        - ReagentId: UncookedAnimalProteins
           Quantity: 5
   - type: FlavorProfile
     flavors:
       - people
+  - type: Tag
+    tags:
+      - Meat
 
 - type: entity
   id: OrganHumanBrain
@@ -39,6 +42,10 @@
   - type: InputMover
   - type: Examiner
   - type: BlockMovement
+  - type: BadFood
+  - type: Tag
+    tags:
+      - Meat
 
 - type: entity
   id: OrganHumanEyes
@@ -111,7 +118,7 @@
       food:
         maxVol: 5
         reagents:
-        - ReagentId: Nutriment
+        - ReagentId: UncookedAnimalProteins
           Quantity: 5
 
 - type: entity
@@ -148,7 +155,7 @@
       food:
         maxVol: 5
         reagents:
-        - ReagentId: Nutriment
+        - ReagentId: UncookedAnimalProteins
           Quantity: 5
   - type: Stomach
   # The stomach metabolizes stuff like foods and drinks.

diff --git a/Resources/Prototypes/Body/Organs/moth.yml b/Resources/Prototypes/Body/Organs/moth.yml
index a19c6a4ee337bcd60a224bb4b43b586849ceacbe..55fb517c552a207319c6e552ffe4ba96fadc535d 100644 (file)
--- a/Resources/Prototypes/Body/Organs/moth.yml
+++ b/Resources/Prototypes/Body/Organs/moth.yml
@@ -14,7 +14,7 @@
       food:
         maxVol: 5
         reagents:
-        - ReagentId: Nutriment
+        - ReagentId: UncookedAnimalProteins
           Quantity: 5
   - type: Metabolizer
     maxReagents: 3

diff --git a/Resources/Prototypes/Body/Organs/rat.yml b/Resources/Prototypes/Body/Organs/rat.yml
index fb93012d97ba45e2c777ba73d9dd6c4a1333d205..9d1352c72f5e9ba949d3aedc2e32a8d60d73e38b 100644 (file)
--- a/Resources/Prototypes/Body/Organs/rat.yml
+++ b/Resources/Prototypes/Body/Organs/rat.yml
@@ -18,7 +18,7 @@
       food:
         maxVol: 5
         reagents:
-        - ReagentId: Nutriment
+        - ReagentId: UncookedAnimalProteins
           Quantity: 5
   - type: Sprite
     state: stomach

diff --git a/Resources/Prototypes/Body/Organs/reptilian.yml b/Resources/Prototypes/Body/Organs/reptilian.yml
index 83139f3eca07152e50ff6f8e8d728756e53f4df7..b2233a9207067489aeac5523f55a733869bdf852 100644 (file)
--- a/Resources/Prototypes/Body/Organs/reptilian.yml
+++ b/Resources/Prototypes/Body/Organs/reptilian.yml
@@ -16,5 +16,5 @@
       food:
         maxVol: 5
         reagents:
-        - ReagentId: Nutriment
+        - ReagentId: UncookedAnimalProteins
           Quantity: 5

diff --git a/Resources/Prototypes/Body/Organs/slime.yml b/Resources/Prototypes/Body/Organs/slime.yml
index e6ce18b335d2556c52bae160db07bee81cbaed91..a532c1223a3fdbe21aecdcf5fff9a04cbae4df1e 100644 (file)
--- a/Resources/Prototypes/Body/Organs/slime.yml
+++ b/Resources/Prototypes/Body/Organs/slime.yml
@@ -27,7 +27,7 @@
         food:
           maxVol: 5
           reagents:
-          - ReagentId: Nutriment
+          - ReagentId: UncookedAnimalProteins
             Quantity: 5
 
 
@@ -63,5 +63,5 @@
       food:
         maxVol: 5
         reagents:
-        - ReagentId: Nutriment
+        - ReagentId: UncookedAnimalProteins
           Quantity: 5