Not exclusive whitelist diet. Vox regain access to old food. (#37497)

* Creates a secondary digestible whitelist that is not exclusive. Additionally reworks the Vox stomach.

* Update FoodSystem.cs

Remnants of an old attempt. Cleaning it.

* Update vox.yml

Remnants of an old attempt. Cleaning up.

* Whitelist no longer, now the diet exclusion var is a bool.

* Clean-up

* Update Content.Server/Body/Components/StomachComponent.cs

Typo fixing

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update Content.Server/Body/Components/StomachComponent.cs

Clarifications.

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update Content.Server/Nutrition/EntitySystems/FoodSystem.cs

Typo fixing

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update Resources/Prototypes/Body/Organs/vox.yml

Typo fixes

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

Content.Server/Body/Components/StomachComponent.cs

@@ -47,6 +47,12 @@ namespace Content.Server.Body.Components
         [DataField]
         public EntityWhitelist? SpecialDigestible = null;
 
+        /// <summary>
+        /// Controls whitelist behavior. If true, this stomach can digest <i>only</i> food that passes the whitelist. If false, it can digest normal food <i>and</i> any food that passes the whitelist.
+        /// </summary>
+        [DataField]
+        public bool IsSpecialDigestibleExclusive = true;
+
         /// <summary>
         ///     Used to track how long each reagent has been in the stomach
         /// </summary>

Content.Server/Nutrition/EntitySystems/FoodSystem.cs

@@ -442,7 +442,9 @@ public sealed class FoodSystem : EntitySystem
             // Check if the food is in the whitelist
             if (_whitelistSystem.IsWhitelistPass(ent.Comp1.SpecialDigestible, food))
                 return true;
-            // They can only eat whitelist food and the food isn't in the whitelist. It's not edible.
+
+            // If their diet is whitelist exclusive, then they cannot eat anything but what follows their whitelisted tags. Else, they can eat their tags AND human food.
+            if (ent.Comp1.IsSpecialDigestibleExclusive)
                 return false;
         }
 

Resources/Prototypes/Body/Organs/vox.yml

@@ -27,14 +27,7 @@
     specialDigestible:
       tags:
       - Trash
-      - Fruit
+    isSpecialDigestibleExclusive: false
-      - ReptilianFood
-      - Meat
-      - Pill
-      - Crayon
-      - Paper
-      - VoxFood
-      - Vegetable
 
 - type: entity
   parent: OrganHumanLiver

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml

@@ -20,9 +20,6 @@
         reagents:
         - ReagentId: Nutriment
           Quantity: 5
-  - type: Tag
-    tags:
-    - VoxFood
 
 - type: entity
   id: FoodBagel

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml

@@ -15,7 +15,6 @@
   - type: Tag
     tags:
     - Bread
-    - VoxFood
   - type: SolutionContainerManager
     solutions:
       food:

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml

@@ -26,7 +26,6 @@
   - type: Tag
     tags:
     - Cake
-    - VoxFood
   - type: SecretStash
     maxItemSize: "Normal"
     secretStashName: secret-stash-cake

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml

@@ -10,7 +10,6 @@
   - type: Tag
     tags:
     - Donut
-    - VoxFood
   - type: Sprite
     sprite: Objects/Consumable/Food/Baked/donut.rsi
   - type: SolutionContainerManager

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml

@@ -18,9 +18,6 @@
           Quantity: 5
   - type: Item
     size: Tiny
-  - type: Tag
-    tags:
-    - VoxFood
 
 # Muffins
 

Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml

@@ -30,7 +30,6 @@
   - type: Tag
     tags:
     - Pie
-    - VoxFood
 
 - type: entity
   parent: FoodInjectableBase # Not sliceable

Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml

@@ -22,9 +22,6 @@
         reagents:
         - ReagentId: Nutriment
           Quantity: 20
-  - type: Tag
-    tags:
-    - VoxFood
 
 # Meals
 

Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml

@@ -18,9 +18,6 @@
         reagents:
         - ReagentId: Nutriment
           Quantity: 20
-  - type: Tag
-    tags:
-    - VoxFood
 
 # Noodles
 

Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml

@@ -10,7 +10,6 @@
   - type: Tag
     tags:
       - FoodSnack
-      - VoxFood
   - type: Sprite
     sprite: Objects/Consumable/Food/snacks.rsi
   - type: SolutionContainerManager
@@ -498,9 +497,6 @@
           Quantity: 10
         - ReagentId: Theobromine
           Quantity: 3
-  - type: Tag
-    tags:
-    - VoxFood
 
 # Trash
 

Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml

@@ -42,7 +42,6 @@
   - type: Tag
     tags:
     - Soup
-    - VoxFood
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/tags.yml

@@ -1364,9 +1364,6 @@
 - type: Tag
   id: VoiceTrigger
 
-- type: Tag # Eating fix tag
-  id: VoxFood
-
 - type: Tag
   id: Wall