Vox Diet + Organ Mechanics Slop [PORT] (#4016)

Co-authored-by: MissKay1994 <15877268+MissKay1994@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: Qerd <73325910+BigfootBravo@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: Dogbone10 <falcolom1@outlook.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

@@ -450,8 +450,10 @@ 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.
-            return false;
+
+            // 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;
         }
 
         if (component.RequiresSpecialDigestion)

Resources/Locale/en-US/flavors/flavor-profiles.ftl

@@ -52,6 +52,7 @@ flavor-base-horrible = horrible
 flavor-base-terrible = terrible
 flavor-base-mindful = mindful
 flavor-base-chewy = chewy
+flavor-base-trashy = trashy
 
 # Complex flavors. Put a flavor here when you want something that's more
 # specific.

Resources/Locale/en-US/reagents/meta/toxins.ftl

@@ -81,3 +81,6 @@ reagent-desc-lipolicide = A powerful toxin that will destroy fat cells, massivel
 
 reagent-name-mechanotoxin = mechanotoxin
 reagent-desc-mechanotoxin = A neurotoxin used as venom by some species of spider. Degrades movement when built up.
+
+reagent-name-toxintrash = trash 
+reagent-desc-toxintrash = An awful-smelling fluid. Deadly to non-vox.

Resources/Prototypes/Body/Organs/vox.yml

@@ -14,3 +14,111 @@
   - type: Item
     size: Small
     heldPrefix: lungs
+
+- type: entity
+  parent: OrganHumanStomach
+  id: OrganVoxStomach
+  name: stomach
+  description: "A stomach that smells of ammonia."
+  components:
+  - type: Metabolizer #Skreeeee!
+    metabolizerTypes: [ Vox ]
+  - type: Stomach
+#Bird vs tags
+    specialDigestible:
+      tags:
+      - Trash
+      - ClothMade # terrible efficiency from cloth eating
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
+
+- type: entity
+  parent: OrganHumanBrain
+  id: OrganVoxBrain
+  name: cortical stack
+  description: A stack containing all the memories and experiences of a vox with some mushy brains still sticking to it. Skreeeee!
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
+    state: brain
+  - type: Organ
+  - type: Food
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Silicon
+          Quantity: 10
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: GreyMatter
+          Quantity: 5
+  - type: BorgBrain
+
+- type: entity
+  parent: OrganHumanLiver
+  id: OrganVoxLiver
+  name: liver
+  description: "Smells flammable."
+  components:
+  - type: Metabolizer
+    metabolizerTypes: [Vox]
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
+
+- type: entity
+  parent: OrganHumanHeart
+  id: OrganVoxHeart
+  name: heart
+  description: "The strange heart of a vox."
+  components:
+  - type: Metabolizer
+    metabolizerTypes: [Vox]
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
+    state: heart-on
+
+- type: entity
+  parent: OrganHumanKidneys
+  id: OrganVoxKidneys
+  name: kidney
+  description: "Smells flammable."
+  components:
+  - type: Metabolizer
+    metabolizerTypes: [Vox]
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
+
+- type: entity
+  id: OrganVoxEyes
+  parent: OrganHumanEyes
+  name: eyes
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
+  - type: Item
+    size: Small
+    heldPrefix: eyeballs
+
+- type: entity
+  id: OrganVoxTongueA
+  parent: OrganHumanTongue
+  name: tongue
+  description: "A fleshy muscle mostly used for screaming."
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
+  - type: Item
+    size: Small
+
+- type: entity
+  id: OrganVoxTongueB
+  parent: OrganHumanTongue
+  name: tongue
+  description: "A fleshy muscle mostly used for screaming."
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Vox/organs.rsi
+  - type: Item
+    size: Small

Resources/Prototypes/Body/Prototypes/vox.yml

@@ -8,8 +8,8 @@
       connections:
       - torso
       organs:
-        brain: OrganHumanBrain
-        eyes: OrganHumanEyes
+        brain: OrganVoxBrain
+        eyes: OrganVoxEyes
     torso:
       part: TorsoVox
       connections:
@@ -19,11 +19,11 @@
       - left leg
       - head # Shitmed
       organs:
-        heart: OrganHumanHeart
+        heart: OrganVoxHeart
         lungs: OrganVoxLungs
-        stomach: OrganHumanStomach
-        liver: OrganHumanLiver
-        kidneys: OrganHumanKidneys
+        stomach: OrganVoxStomach
+        liver: OrganVoxLiver
+        kidneys: OrganVoxKidneys
     right arm:
       part: RightArmVox
       connections:

Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml

@@ -75,9 +75,18 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/bowl.rsi
     state: bowl-trash
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5
   - type: Tag
     tags:
     - Trash
+  - type: Food
+    requiresSpecialDigestion: true
   - type: PhysicalComposition
     materialComposition:
       Glass: 50

Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml

@@ -503,10 +503,19 @@
     maxItemSize: Normal
     grid:
     - 0,0,3,3
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5
   - type: Tag
     tags:
     - Trash
     - HappyHonk
+  - type: Food
+    requiresSpecialDigestion: true
   - type: StorageFill
     contents:
       - id: ToyMouse

Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml

@@ -71,9 +71,18 @@
     shape:
     - 0,0,1,0
     storedOffset: 0,-6
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5
   - type: Tag
     tags:
     - Trash
+  - type: Food
+    requiresSpecialDigestion: true
   - type: SpaceGarbage
   - type: StaticPrice # Frontier
     price: 1 # Frontier
@@ -91,7 +100,7 @@
     state: plate-small
   - type: Item
     storedOffset: 0,-3
-# Needs the full thing because inherting is dumb sometimes.
+# Needs the full thing because inheriting is dumb sometimes.
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml

@@ -67,11 +67,20 @@
   - type: PhysicalComposition
     materialComposition:
       Steel: 100
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5
   - type: Tag
     tags:
     - Trash
   - type: StaticPrice # Frontier
     price: 6 # Frontier
+  - type: Food
+    requiresSpecialDigestion: true
 
 # Tins
 
@@ -90,7 +99,7 @@
     - sweet
     - funny
   - type: Food
-    trash: 
+    trash:
     - FoodTinPeachesTrash
   - type: Tag
     tags:
@@ -113,7 +122,7 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/Tins/maint_peaches.rsi
   - type: Food
-    trash: 
+    trash:
     - FoodTinPeachesMaintTrash
 
 # only exists for backwards compatibility with a few maps, nothing else uses it
@@ -151,7 +160,7 @@
     - salty
     - cheap
   - type: Food
-    trash: 
+    trash:
     - FoodTinBeansTrash
 
 - type: entity
@@ -181,7 +190,7 @@
     - salty
     - cheap
   - type: Food
-    trash: 
+    trash:
     - FoodTinMRETrash
   - type: Tag
     tags:

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

@@ -88,7 +88,7 @@
     - state: popsicle
       color: orange
   - type: Food
-    trash: 
+    trash:
     - FoodFrozenPopsicleTrash
 
 - type: entity
@@ -104,7 +104,7 @@
     - state: popsicle
       color: red
   - type: Food
-    trash: 
+    trash:
     - FoodFrozenPopsicleTrash
   - type: Tag
     tags:
@@ -121,7 +121,7 @@
     - state: stick
     - state: jumbo
   - type: Food
-    trash: 
+    trash:
     - FoodFrozenPopsicleTrash
   - type: SolutionContainerManager
     solutions:
@@ -152,7 +152,7 @@
         - state: alpha-filling
     #      color: foo
     - type: Food
-      trash: 
+      trash:
       - FoodFrozenSnowconeTrash
     - type: SolutionContainerManager
       solutions:
@@ -191,7 +191,7 @@
     - state: cone
     - state: berry
   - type: Food
-    trash: 
+    trash:
     - FoodFrozenSnowconeTrash
   - type: Tag
     tags:
@@ -208,7 +208,7 @@
     - state: cone
     - state: fruitsalad
   - type: Food
-    trash: 
+    trash:
     - FoodFrozenSnowconeTrash
   - type: Tag
     tags:
@@ -225,7 +225,7 @@
     - state: cone
     - state: clown
   - type: Food
-    trash: 
+    trash:
     - FoodFrozenSnowconeTrash
 
 - type: entity
@@ -239,7 +239,7 @@
     - state: cone
     - state: mime
   - type: Food
-    trash: 
+    trash:
     - FoodFrozenSnowconeTrash
 
 - type: entity
@@ -253,7 +253,7 @@
     - state: cone
     - state: rainbow
   - type: Food
-    trash: 
+    trash:
     - FoodFrozenSnowconeTrash
 
 # Trash
@@ -267,9 +267,18 @@
   - type: Sprite
     sprite: Objects/Consumable/Food/frozen.rsi
     state: cone-trash
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5
   - type: Tag
     tags:
     - Trash
+  - type: Food
+    requiresSpecialDigestion: true
 
 - type: entity
   name: popsicle stick
@@ -287,7 +296,16 @@
       - enum.DamageStateVisualLayers.Base:
           stick: ""
           stick2: ""
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5
   - type: Tag
     tags:
     - Trash
+  - type: Food
+    requiresSpecialDigestion: true
   - type: SpaceGarbage

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

@@ -24,6 +24,7 @@
           Quantity: 15
         - ReagentId: Flavorol
           Quantity: 10
+
 # Meals
 
 - type: entity
@@ -363,7 +364,7 @@
   description: BBQ ribs, slathered in a healthy coating of BBQ sauce. The least vegan thing to ever exist.
   components:
   - type: Food
-    trash: 
+    trash:
     - FoodKebabSkewer
   - type: FlavorProfile
     flavors:
@@ -635,7 +636,7 @@
   description: Buttery.
   components:
   - type: Food
-    trash: 
+    trash:
     - FoodPlate
   - type: FlavorProfile
     flavors:

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

@@ -402,6 +402,8 @@
     grindableSolutionName: food
   - type: SpaceGarbage
     cleanupExempt: true # Mono
+  - type: Food
+    requiresSpecialDigestion: true
 
 - type: entity
   name: baked banana peel
@@ -1143,7 +1145,9 @@
     size: Tiny
   - type: Tag
     tags:
-      - Trash
+    - Trash
+  - type: Food
+    requiresSpecialDigestion: true
   - type: SolutionContainerManager
     solutions:
       food:

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

@@ -482,9 +482,6 @@
       - id: FoodSnackMREBrownieOpen
     sound:
       path: /Audio/Effects/unwrap.ogg
-  - type: StaticPrice
-    price: 21
-
 
 - type: entity
   id: FoodSnackMREBrownieOpen
@@ -533,6 +530,15 @@
   - type: SpaceGarbage
   - type: StaticPrice
     price: 1
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5
+  - type: Food
+    requiresSpecialDigestion: true
 
 - type: entity
   categories: [ HideSpawnMenu ]

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml

@@ -20,6 +20,15 @@
   - type: Tag
     tags:
     - Trash
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5
+  - type: Food
+    requiresSpecialDigestion: true
   - type: PhysicalComposition
     materialComposition:
       Plastic: 50

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml

@@ -65,6 +65,13 @@
     solutions:
       smokable:
         maxVol: 20
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5
+  - type: Food
+    solution: "food"
   - type: Tag
     tags:
       - Cigarette
@@ -101,7 +108,12 @@
             Quantity: 10
           - ReagentId: Omnizine
             Quantity: 10
-
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5 
+          
 - type: entity
   id: CigaretteIron
   parent: SoakedCigarette
@@ -116,7 +128,12 @@
             Quantity: 10
           - ReagentId: Iron
             Quantity: 10
-
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5 
+          
 - type: entity
   id: CigaretteTricordrazine
   parent: SoakedCigarette
@@ -131,7 +148,12 @@
             Quantity: 10
           - ReagentId: Tricordrazine
             Quantity: 10
-
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5 
+          
 - type: entity
   id: CigaretteDylovene
   parent: SoakedCigarette
@@ -146,7 +168,12 @@
             Quantity: 10
           - ReagentId: Dylovene
             Quantity: 10
-
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5 
+          
 - type: entity
   id: CigaretteDermaline
   parent: SoakedCigarette
@@ -161,7 +188,12 @@
             Quantity: 10
           - ReagentId: Dermaline
             Quantity: 10
-
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5 
+          
 - type: entity
   id: CigaretteArithrazine
   parent: SoakedCigarette
@@ -176,7 +208,12 @@
             Quantity: 10
           - ReagentId: Arithrazine
             Quantity: 10
-
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5 
+          
 - type: entity
   id: CigaretteIpecac
   parent: SoakedCigarette
@@ -191,6 +228,11 @@
             Quantity: 10
           - ReagentId: Ipecac
             Quantity: 2
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5
 
 - type: entity
   id: CigaretteBicaridine
@@ -206,7 +248,12 @@
             Quantity: 10
           - ReagentId: Bicaridine
             Quantity: 10
-
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5 
+          
 - type: entity
   id: CigaretteDexalin
   parent: SoakedCigarette
@@ -221,7 +268,12 @@
             Quantity: 10
           - ReagentId: Dexalin
             Quantity: 10
-
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5 
+          
 - type: entity
   id: CigarettePax
   parent: SoakedCigarette
@@ -236,7 +288,12 @@
             Quantity: 10
           - ReagentId: Pax
             Quantity: 2
-
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5 
+          
 - type: entity
   id: CigaretteBbqSauce
   parent: SoakedCigarette
@@ -251,7 +308,12 @@
             Quantity: 10
           - ReagentId: BbqSauce
             Quantity: 10
-
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5 
+          
 - type: entity
   id: CigaretteBlackPepper
   parent: SoakedCigarette
@@ -266,7 +328,12 @@
             Quantity: 10
           - ReagentId: Blackpepper
             Quantity: 10
-
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5 
+          
 - type: entity
   id: CigaretteCapsaicinOil
   parent: SoakedCigarette
@@ -281,7 +348,12 @@
             Quantity: 10
           - ReagentId: CapsaicinOil
             Quantity: 10
-
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5 
+          
 - type: entity
   id: CigaretteBread
   parent: SoakedCigarette
@@ -294,6 +366,13 @@
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
+          - ReagentId: Radium
+            Quantity: 10         
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5
 
 - type: entity
   id: CigaretteMilk
@@ -309,9 +388,14 @@
             Quantity: 10
           - ReagentId: Milk
             Quantity: 10
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5 
 
 - type: entity
-  id: CigaretteBanana
+  id: CigaretteBanana2
   parent: SoakedCigarette
   name: Clown Adjancency Bonus
   components:
@@ -324,7 +408,12 @@
             Quantity: 10
           - ReagentId: BananaHonk
             Quantity: 10
-
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5 
+          
 - type: entity
   id: CigaretteSpaceDrugs
   parent: SoakedCigarette
@@ -339,7 +428,12 @@
             Quantity: 10
           - ReagentId: SpaceDrugs
             Quantity: 10
-
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5 
+          
 - type: entity
   id: CigaretteMuteToxin
   parent: SoakedCigarette
@@ -353,8 +447,13 @@
           - ReagentId: Nicotine
             Quantity: 10
           - ReagentId: MuteToxin
-            Quantity: 2
-
+            Quantity: 10
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5 
+          
 - type: entity
   id: CigaretteMold
   parent: SoakedCigarette
@@ -368,8 +467,13 @@
           - ReagentId: Nicotine
             Quantity: 10
           - ReagentId: Mold
-            Quantity: 2
-
+            Quantity: 10
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5 
+          
 - type: entity
   id: CigaretteLicoxide
   parent: SoakedCigarette
@@ -383,8 +487,13 @@
           - ReagentId: Nicotine
             Quantity: 10
           - ReagentId: Licoxide
-            Quantity: 5
-
+            Quantity: 10
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5 
+          
 - type: entity
   id: CigaretteWeldingFuel
   parent: SoakedCigarette
@@ -398,8 +507,13 @@
           - ReagentId: Nicotine
             Quantity: 10
           - ReagentId: WeldingFuel
-            Quantity: 5
-
+            Quantity: 10
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5 
+          
 - type: entity
   id: CigaretteTHC
   parent: SoakedCigarette
@@ -412,5 +526,50 @@
         reagents:
           - ReagentId: Nicotine
             Quantity: 10
-          - ReagentId: THC
-            Quantity: 5
+          - ReagentId: RobustHarvest
+            Quantity: 10
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5 
+          
+- type: entity
+  id: CigarettePhlogiston
+  parent: SoakedCigarette
+  name: Dragon Dating Sim
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+        - ReagentId: Nicotine
+          Quantity: 10
+        - ReagentId: Phlogiston
+          Quantity: 10
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5 
+          
+- type: entity
+  id: CigaretteBanana
+  parent: SoakedCigarette
+  name: Pun Pun's Tropical Getaway
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 40
+        reagents:
+        - ReagentId: Nicotine
+          Quantity: 10
+        - ReagentId: Potassium
+          Quantity: 10
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5 

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml

@@ -39,6 +39,15 @@
     tags:
     - CigPack
     - Trash
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5
+  - type: Food
+    requiresSpecialDigestion: true
   - type: PhysicalComposition
     materialComposition:
       Steel: 50
@@ -109,6 +118,15 @@
     tags:
     - CigPack
     - Trash
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5
+  - type: Food
+    requiresSpecialDigestion: true
   - type: PhysicalComposition
     materialComposition:
       Steel: 50

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml

@@ -59,6 +59,15 @@
     tags:
     - RollingPaper
     - Trash
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5
+  - type: Food
+    requiresSpecialDigestion: true
   - type: SpaceGarbage
     cleanupExempt: true # Mono
 
@@ -90,6 +99,15 @@
     tags:
     - CigFilter
     - Trash
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5
+  - type: Food
+    requiresSpecialDigestion: true
 
 - type: entity
   id: CigaretteFilter1

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml

@@ -36,6 +36,13 @@
     solutions:
       smokable:
         maxVol: 20
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5
+  - type: Food
+    solution: "food"
   - type: Tag
     tags:
       - Cigar
@@ -71,3 +78,10 @@
     solutions:
       smokable:
         maxVol: 20
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5
+  - type: Food
+    solution: "food"

Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml

@@ -11,6 +11,9 @@
   - type: Tag
     tags:
     - Trash
+  - type: Food
+    solution: "smokable"
+    requiresSpecialDigestion: true
   - type: SpaceGarbage
     cleanupExempt: true # Mono
   - type: StaticPrice

Resources/Prototypes/Entities/Objects/Tools/matches.yml

@@ -21,6 +21,17 @@
     tags:
     - Matchstick
     - Trash
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 20
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5
+  - type: Food
+    requiresSpecialDigestion: true
   - type: SpaceGarbage
     cleanupExempt: true # Mono
   - type: Sprite
@@ -131,5 +142,16 @@
   - type: Tag
     tags:
     - Trash
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 20
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: ToxinTrash
+          Quantity: 5
+  - type: Food
+    requiresSpecialDigestion: true
   - type: SpaceGarbage
     cleanupExempt: true # Mono

Resources/Prototypes/Flavors/flavors.yml

@@ -1343,3 +1343,9 @@
   id: zombiecocktail
   flavorType: Complex
   description: flavor-complex-zombiecocktail
+
+- type: flavor
+  id: trashy
+  flavorType: Base
+  description: flavor-base-trashy
+

Resources/Prototypes/Reagents/fun.yml

@@ -41,6 +41,11 @@
         conditions:
         - !type:OrganType
           type: Moth
+      - !type:SatiateHunger
+        conditions:
+        - !type:OrganType
+          type: Vox
+        factor: 0.10 
 
 - type: reagent
   id: BuzzochloricBees

Resources/Prototypes/Reagents/pyrotechnic.yml

@@ -209,6 +209,13 @@
   tileReactions:
   - !type:FlammableTileReaction {}
   metabolisms:
+    Food:
+      effects:
+      - !type:SatiateThirst
+        factor: 1
+        conditions:
+        - !type:OrganType
+          type: Vox
     Poison:
       effects:
       - !type:HealthChange
@@ -216,6 +223,9 @@
         - !type:OrganType # Goobstation - Yowie
           type: Yowie
           shouldHave: false
+        - !type:OrganType
+          type: Vox
+          shouldHave: false
         damage:
           types:
             Poison: 1

Resources/Prototypes/Reagents/toxins.yml

@@ -531,6 +531,9 @@
           - !type:OrganType # Goobstation - Yowie
             type: Yowie
             shouldHave: false
+          - !type:OrganType
+            type: Vox
+            shouldHave: false
         type: Local
         visualType: MediumCaution
         messages: [ "generic-reagent-effect-sick" ]
@@ -544,6 +547,9 @@
           - !type:OrganType # Goobstation - Yowie
             type: Yowie
             shouldHave: false
+          - !type:OrganType
+            type: Vox
+            shouldHave: false
       - !type:HealthChange
         conditions:
         - !type:OrganType
@@ -552,6 +558,9 @@
         - !type:OrganType # Goobstation - Yowie
           type: Yowie
           shouldHave: false
+        - !type:OrganType
+          type: Vox
+          shouldHave: false
         damage:
           types:
             Poison: 1
@@ -559,7 +568,6 @@
         conditions:
         - !type:OrganType
           type: Animal
-          shouldHave: true
         reagent: Protein
         amount: 0.5
       - !type:AdjustReagent # Frontier: Goblin
@@ -569,6 +577,7 @@
         reagent: Protein # Frontier: Goblin
         amount: 0.5 # Frontier: Goblin
 
+
 - type: reagent
   id: Allicin
   name: reagent-name-allicin
@@ -791,3 +800,19 @@
           shouldHave: false
         walkSpeedModifier: 0.4
         sprintSpeedModifier: 0.4
+
+- type: reagent
+  id: ToxinTrash
+  name: reagent-name-toxintrash
+  group: Toxins
+  desc: reagent-desc-toxintrash
+  flavor: trashy
+  physicalDesc: reagent-physical-desc-nondescript
+  metabolisms:
+    Food:
+      effects:
+      - !type:SatiateHunger
+        factor: 1
+        conditions:
+        - !type:OrganType
+          type: Vox

Resources/ServerInfo/Guidebook/Mobs/Vox.xml

@@ -14,6 +14,8 @@
   Vox always spawn wearing working nitrogen internals equipment.
   A spare breathing mask and an emergency nitrogen canister is provided in their survival box.
 
+  In addition to regular foods, Vox can also eat various snack packaging, banana peels, eggshells, and raw meat without any ill effects. They also like to drink welding fuel.
+
   Vox [color=#1e90ff]slowly recover from low levels of poison damage[/color] on their own,
   so long as they are careful not to exceed 20 poison damage.
   This allows them to endure breathing station air for up to thirty seconds at a time without lasting damage,

Resources/Textures/Mobs/Species/Vox/organs.rsi/meta.json

@@ -1,12 +1,80 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "made by mubururu_ (github)",
+    "copyright": "Originally from Paradise station, updated and edited for SS14 by MissKay1994 (github)",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
+        {
+            "name": "brain"
+        },
+        {
+            "name": "brain-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "brain-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "eyeballs-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "eyeballs-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "eyeball-l"
+        },
+        {
+            "name": "eyeball-r"
+        },
+        {
+            "name": "heart-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "heart-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "heart-on",
+            "delays": [
+                [
+                    0.6,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "kidneys-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "kidneys-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "kidney-l"
+        },
+        {
+            "name": "kidney-r"
+        },
+        {
+            "name": "liver"
+        },
+        {
+            "name": "liver-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "liver-inhand-right",
+            "directions": 4
+        },
         {
             "name": "lungs-inhand-left",
             "directions": 4
@@ -20,6 +88,20 @@
         },
         {
             "name": "lung-r"
+        },
+        {
+            "name": "stomach"
+        },
+        {
+            "name": "stomach-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "stomach-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "tongue"
         }
     ]
 }