Lizard "Rework" (#20328)

Part of my Species Reworks, this gives lizards the ability to pull without hands, a diet restriction (Meat, Fruit, and Pills), and removes their random damage modifiers while toning up / down their notable ones to reasonable levels. Additionally normalizes their specific heat, removes their extra cold damage taken, and removes their random walking speed increase.

Any food I could find that was a fruit / meat has been tagged appropriately. This shouldn't break anything but it's possible (likely) I've missed a few, which can be fixed later.

Resources/Prototypes/Body/Organs/reptilian.yml

@@ -4,6 +4,11 @@
   noSpawn: true
   components:
   - type: Stomach
+    specialDigestible:
+      tags:
+      - Fruit
+      - Meat
+      - Pill
   - type: SolutionContainerManager
     solutions:
       stomach:

Resources/Prototypes/Damage/modifier_sets.yml

@@ -124,11 +124,8 @@
 - type: damageModifierSet
   id: Scale # Skin tougher, bones weaker, strong stomachs, cold-blooded (kindof)
   coefficients:
-    Blunt: 1.1
+    Cold: 1.3
-    Slash: 0.9
+    Heat: 0.7
-    Cold: 1.5
-    Heat: 0.9
-    Poison: 0.9
 
 - type: damageModifierSet
   id: Diona

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -981,6 +981,7 @@
     - Trash
     - VimPilot
     - Mouse
+    - Meat
   - type: Respirator
     damage:
       types:
@@ -2330,6 +2331,7 @@
     - VimPilot
     - Trash
     - Hamster
+    - Meat
   - type: Respirator
     damage:
       types:

Resources/Prototypes/Entities/Mobs/Species/reptilian.yml

@@ -10,7 +10,10 @@
   - type: Hunger
     starvationDamage:
       types:
-        Cold: 1
+        Cold: 0.5
+        Bloodloss: 0.5
+  - type: Puller
+    needsHands: false
   - type: Thirst
   - type: Icon
     sprite: Mobs/Species/Reptilian/parts.rsi
@@ -49,15 +52,15 @@
     heatDamageThreshold: 400
     coldDamageThreshold: 285
     currentTemperature: 310.15
-    specificHeat: 46
+    specificHeat: 42
     coldDamage:
       types:
-        Cold : 0.2 #per second, scales with temperature & other constants
+        Cold : 0.1 #per second, scales with temperature & other constants
     heatDamage:
       types:
         Heat : 0.1 #per second, scales with temperature & other constants
   - type: MovementSpeedModifier
-    baseWalkSpeed : 2.7
+    baseWalkSpeed : 2.5
     baseSprintSpeed : 4.5
 
 - type: entity

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

@@ -92,6 +92,10 @@
     - state: banana
   - type: SliceableFood
     slice: FoodBreadBananaSlice
+  - type: Tag
+    tags:
+    - Fruit
+    - Bread
 # Tastes like bread, banana, nut.
 
 - type: entity
@@ -108,6 +112,9 @@
   - type: Sprite
     layers:
     - state: banana-slice
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: cornbread
@@ -234,6 +241,10 @@
           Quantity: 30
         - ReagentId: Vitamin
           Quantity: 5
+  - type: Tag
+    tags:
+    - Meat
+    - Bread
 # Tastes like bread, meat.
 
 - type: entity
@@ -259,6 +270,9 @@
           Quantity: 6
         - ReagentId: Vitamin
           Quantity: 1.2
+  - type: Tag
+    tags:
+    - Meat
 
 - type: entity
   name: mimana bread
@@ -370,6 +384,10 @@
           Quantity: 5
         - ReagentId: Protein
           Quantity: 5
+  - type: Tag
+    tags:
+    - Meat
+    - Bread
 
 - type: entity
   name: sausage bread slice
@@ -396,6 +414,9 @@
           Quantity: 1
         - ReagentId: Protein
           Quantity: 1
+  - type: Tag
+    tags:
+    - Meat
 
 - type: entity
   name: spider meat bread
@@ -424,6 +445,10 @@
           Quantity: 5
         - ReagentId: Toxin
           Quantity: 15
+  - type: Tag
+    tags:
+    - Meat
+    - Bread
 # Tastes like bread, cobwebs.
 
 - type: entity
@@ -451,6 +476,9 @@
           Quantity: 1.2
         - ReagentId: Toxin
           Quantity: 3
+  - type: Tag
+    tags:
+    - Meat
 
 - type: entity
   name: tofu bread
@@ -528,6 +556,10 @@
           Quantity: 30
         - ReagentId: Vitamin
           Quantity: 5
+  - type: Tag
+    tags:
+    - Meat
+    - Bread
 # Tastes like bread, acid.
 
 - type: entity
@@ -553,6 +585,9 @@
           Quantity: 6
         - ReagentId: Vitamin
           Quantity: 1.2
+  - type: Tag
+    tags:
+    - Meat
 
 # Other than bread/slices
 

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

@@ -296,6 +296,9 @@
     state: apple
   - type: SliceableFood
     slice: FoodCakeAppleSlice
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: slice of apple cake
@@ -305,6 +308,9 @@
   components:
   - type: Sprite
     state: apple-slice
+  - type: Tag
+    tags:
+    - Fruit
 # Tastes like sweetness, cake, slime.
 
 - type: entity
@@ -347,6 +353,9 @@
           Quantity: 32
         - ReagentId: Vitamin
           Quantity: 11
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: slice of pumpkin-spice cake
@@ -365,6 +374,9 @@
           Quantity: 6.4
         - ReagentId: Vitamin
           Quantity: 2.2
+  - type: Tag
+    tags:
+    - Fruit
 # Tastes like sweetness, cake, pumpkin.
 
 - type: entity

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

@@ -20,6 +20,7 @@
   - type: Tag
     tags:
     - DonkPocket
+    - Meat
 
 # Donkpocket
 

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

@@ -106,6 +106,9 @@
       - meaty
   - type: Sprite
     state: meat
+  - type: Tag
+    tags:
+    - Meat
 # Tastes like meat.
 
 - type: entity
@@ -303,6 +306,9 @@
           Quantity: 3
         - ReagentId: Vitamin
           Quantity: 1
+  - type: Tag
+    tags:
+    - Fruit
 # Tastes like jelly-donut, green apples.
 
 - type: entity
@@ -362,6 +368,9 @@
           Quantity: 3
         - ReagentId: Vitamin
           Quantity: 1
+  - type: Tag
+    tags:
+    - Fruit
 # Tastes like jelly-donut, blumpkin.
 
 - type: entity
@@ -381,6 +390,9 @@
           Quantity: 3
         - ReagentId: Vitamin
           Quantity: 1
+  - type: Tag
+    tags:
+    - Fruit # Apparently this is a fruit. Huh.
 # Tastes like jelly-donut, tropical sweetness.
 
 - type: entity

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

@@ -37,6 +37,9 @@
   components:
   - type: Sprite
     state: muffin-berry
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: cherry muffin
@@ -46,6 +49,9 @@
   components:
   - type: Sprite
     state: muffin-cherry
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: bluecherry muffin
@@ -55,6 +61,9 @@
   components:
   - type: Sprite
     state: muffin-bluecherry
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: honey bun #TODO honey
@@ -138,6 +147,9 @@
           Quantity: 5
         - ReagentId: Vitamin
           Quantity: 1
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: sugar cookie
@@ -278,6 +290,7 @@
   - type: Tag
     tags:
     - Pancake
+    - Fruit
 
 - type: entity
   name: chocolate chip pancake

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

@@ -64,6 +64,10 @@
     - state: apple
   - type: SliceableFood
     slice: FoodPieAppleSlice
+  - type: Tag
+    tags:
+    - Fruit 
+    - Pie 
   
 - type: entity
   name: slice of apple pie
@@ -79,6 +83,10 @@
     - state: plain-slice
     - state: alpha-slice-filling
       color: orange
+  - type: Tag
+    tags:
+    - Fruit 
+    - Pie
 # Tastes like pie, apple.
 
 - type: entity
@@ -143,6 +151,10 @@
           path: /Audio/Weapons/Guns/Empty/empty.ogg
         ejectSound:
           path: /Audio/Weapons/Guns/Empty/empty.ogg
+  - type: Tag
+    tags:
+    - Fruit 
+    - Pie
 # Tastes like pie, cream, banana.
 
 - type: entity
@@ -162,6 +174,10 @@
     - state: berryclafoutis
   - type: SliceableFood
     slice: FoodPieClafoutisSlice
+  - type: Tag
+    tags:
+    - Fruit 
+    - Pie
 
 - type: entity
   name: slice of berry clafoutis
@@ -177,6 +193,10 @@
     - state: plain-slice
     - state: alpha-slice-filling
       color: pink
+  - type: Tag
+    tags:
+    - Fruit 
+    - Pie
 # Tastes like pie, blackberries.
 
 - type: entity
@@ -194,6 +214,10 @@
     - state: cherry
   - type: SliceableFood
     slice: FoodPieCherrySlice
+  - type: Tag
+    tags:
+    - Fruit 
+    - Pie
 
 - type: entity
   name: slice of cherry pie
@@ -208,6 +232,10 @@
     - state: plain-slice
     - state: alpha-slice-filling
       color: red
+  - type: Tag
+    tags:
+    - Fruit 
+    - Pie
 # Tastes like pie, cherries.
 
 - type: entity
@@ -225,6 +253,10 @@
     - state: meat
   - type: SliceableFood
     slice: FoodPieMeatSlice
+  - type: Tag
+    tags:
+    - Meat
+    - Pie
 
 - type: entity
   name: slice of meat pie
@@ -239,6 +271,10 @@
     - state: plain-slice
     - state: alpha-slice-filling
       color: brown
+  - type: Tag
+    tags:
+    - Meat
+    - Pie
 # Tastes like pie, meat.
 
 - type: entity
@@ -256,6 +292,10 @@
     - state: xeno
   - type: SliceableFood
     slice: FoodPieXenoSlice
+  - type: Tag
+    tags:
+    - Meat
+    - Pie
 
 - type: entity
   name: slice of xeno pie
@@ -271,6 +311,10 @@
     - state: plain-slice
     - state: alpha-slice-filling
       color: green
+  - type: Tag
+    tags:
+    - Meat
+    - Pie
 # Tastes like pie, meat, acid.
 
 - type: entity
@@ -356,6 +400,10 @@
       - sweet
   - type: Sprite
     state: grape
+  - type: Tag
+    tags:
+    - Fruit 
+    - Pie
 # Tastes like tart, grape.
 
 - type: entity
@@ -382,6 +430,10 @@
       - apple
   - type: Sprite
     state: gapple
+  - type: Tag
+    tags:
+    - Fruit 
+    - Pie
 # Tastes like tart, apple, expensive metal.
 
 - type: entity

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

@@ -28,6 +28,7 @@
   - type: Tag
     tags:
     - Pizza
+    - Fruit # Tomato? idk
 
 - type: entity
   parent: FoodInjectableBase # Not sliceable
@@ -56,6 +57,7 @@
   - type: Tag
     tags:
     - Pizza
+    - Fruit
 
 # Pizza
 
@@ -108,6 +110,10 @@
     - state: meat
   - type: SliceableFood
     slice: FoodPizzaMeatSlice
+  - type: Tag
+    tags:
+    - Meat
+    - Pizza
 
 - type: entity
   name: slice of meat pizza
@@ -124,6 +130,10 @@
   - type: Sprite
     layers:
     - state: meat-slice
+  - type: Tag
+    tags:
+    - Meat
+    - Pizza
 # Tastes like crust, tomato, cheese, meat.
 
 - type: entity
@@ -247,6 +257,10 @@
           Quantity: 6
         - ReagentId: Omnizine
           Quantity: 9
+  - type: Tag
+    tags:
+    - Meat
+    - Pizza
 
 
 - type: entity
@@ -272,6 +286,10 @@
           Quantity: 1
         - ReagentId: Omnizine
           Quantity: 1.5
+  - type: Tag
+    tags:
+    - Meat
+    - Pizza
 # Tastes like crust, tomato, cheese, meat, laziness.
 
 - type: entity
@@ -348,6 +366,10 @@
     - state: sassysage
   - type: SliceableFood
     slice: FoodPizzaSassysageSlice
+  - type: Tag
+    tags:
+    - Meat
+    - Pizza
 
 - type: entity
   name: slice of sassysage pizza
@@ -364,6 +386,10 @@
   - type: Sprite
     layers:
     - state: sassysage-slice
+  - type: Tag
+    tags:
+    - Meat
+    - Pizza
 # Tastes like crust, tomato, cheese, sausage, sass.
 
 - type: entity
@@ -401,6 +427,10 @@
   - type: Sprite
     layers:
     - state: pineapple-slice
+  - type: Tag
+    tags:
+    - Meat
+    - Pizza
 # Tastes like crust, tomato, cheese, pineapple, ham.
 
 #TODO: This is a meme pizza from /tg/. It has specially coded mechanics.
@@ -435,6 +465,10 @@
           Quantity: 10
         - ReagentId: Omnizine
           Quantity: 30
+  - type: Tag
+    tags:
+    - Meat
+    - Pizza
 
 - type: entity
   name: slice of Arnold's pizza
@@ -465,6 +499,10 @@
           Quantity: 1.6
         - ReagentId: Omnizine
           Quantity: 5
+  - type: Tag
+    tags:
+    - Meat
+    - Pizza
 # Tastes like crust, tomato, cheese, pepperoni, 9 millimeter bullets.
 
 #TODO: Make this do poison damage and make cut pizza slices eventually rot into this.

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

@@ -90,6 +90,9 @@
           Quantity: 6
         - ReagentId: Vitamin
           Quantity: 6
+  - type: Tag
+    tags:
+    - Meat
 # Tastes like bun, grass.
 
 - type: entity
@@ -113,6 +116,9 @@
           Quantity: 19
         - ReagentId: Vitamin
           Quantity: 5
+  - type: Tag
+    tags:
+    - Meat
 # Tastes like bun, bacon.
 
 - type: entity
@@ -138,6 +144,9 @@
           Quantity: 5
         - ReagentId: Vitamin
           Quantity: 2
+  - type: Tag
+    tags:
+    - Meat
 
 - type: entity
   name: bearger
@@ -162,6 +171,9 @@
           Quantity: 6
         - ReagentId: Vitamin
           Quantity: 5
+  - type: Tag
+    tags:
+    - Meat
 
 - type: entity
   name: big bite burger
@@ -185,6 +197,9 @@
           Quantity: 9
   - type: Sprite
     state: bigbite
+  - type: Tag
+    tags:
+    - Meat
 # Tastes like bun, silver, magic.
 
 - type: entity
@@ -210,6 +225,9 @@
           Quantity: 6
         - ReagentId: Vitamin
           Quantity: 5
+  - type: Tag
+    tags:
+    - Meat
 # Tastes like bun, brains.
 
 - type: entity
@@ -236,6 +254,9 @@
           Quantity: 3
         - ReagentId: Vitamin
           Quantity: 2
+  - type: Tag
+    tags:
+    - Meat
 
 - type: entity
   name: cheese burger
@@ -261,6 +282,9 @@
           Quantity: 7
         - ReagentId: Protein
           Quantity: 1
+  - type: Tag
+    tags:
+    - Meat
 # TODO: Make this work.
   # - type: Sprite
   #   state: plate
@@ -296,6 +320,9 @@
           Quantity: 1
         - ReagentId: Mayo
           Quantity: 3
+  - type: Tag
+    tags:
+    - Meat
 # Tastes like bun, chicken.
 
 - type: entity
@@ -321,6 +348,9 @@
           Quantity: 6
         - ReagentId: Vitamin
           Quantity: 6
+  - type: Tag
+    tags:
+    - Meat
 
 - type: entity
   name: corgi burger #curger...
@@ -343,6 +373,9 @@
           Quantity: 7
         - ReagentId: Vitamin
           Quantity: 12
+  - type: Tag
+    tags:
+    - Meat
 
 - type: entity
   name: crab burger
@@ -367,6 +400,9 @@
           Quantity: 5
         - ReagentId: Vitamin
           Quantity: 4
+  - type: Tag
+    tags:
+    - Meat
 
 - type: entity
   name: crazy hamburger # Burger for you euro-cucks
@@ -395,6 +431,9 @@
           Quantity: 3
         - ReagentId: Vitamin
           Quantity: 6
+  - type: Tag
+    tags:
+    - Meat
 
 - type: entity
   name: duck sandwich # Burger for you sick bastards
@@ -419,6 +458,9 @@
           Quantity: 7
         - ReagentId: Vitamin
           Quantity: 1
+  - type: Tag
+    tags:
+    - Meat
 # Tastes like bun, duck.
 
 - type: entity
@@ -456,6 +498,9 @@
       - fishy
   - type: Sprite
     state: fish
+  - type: Tag
+    tags:
+    - Meat
 # Tastes like bun, fish.
 
 - type: entity
@@ -510,6 +555,7 @@
   - type: Tag
     tags:
       - ClothMade
+      - Meat
 # Tastes like bun, ectoplasm.
 
 - type: entity
@@ -535,6 +581,9 @@
           Quantity: 6
         - ReagentId: Vitamin
           Quantity: 5
+  - type: Tag
+    tags:
+    - Meat
 
 - type: entity
   name: McGuffin
@@ -559,6 +608,9 @@
           Quantity: 7
         - ReagentId: Vitamin
           Quantity: 1
+  - type: Tag
+    tags:
+    - Meat
 
 - type: entity
   name: McRib
@@ -585,6 +637,9 @@
           Quantity: 4
         - ReagentId: BbqSauce
           Quantity: 1
+  - type: Tag
+    tags:
+    - Meat
 # Tastes like bun, pork patty.
 
 - type: entity
@@ -637,6 +692,9 @@
           Quantity: 6
         - ReagentId: Vitamin
           Quantity: 3
+  - type: Tag
+    tags:
+    - Meat
 
 - type: entity
   name: rat burger
@@ -661,6 +719,9 @@
           Quantity: 6
         - ReagentId: Vitamin
           Quantity: 2
+  - type: Tag
+    tags:
+    - Meat
 # Tastes like bun, HEAT.
 
 - type: entity
@@ -685,6 +746,9 @@
           Quantity: 5
         - ReagentId: SulfuricAcid
           Quantity: 5
+  - type: Tag
+    tags:
+    - Meat
 # Tastes like bun, lettuce, sludge.
 
 - type: entity
@@ -763,6 +827,9 @@
           Quantity: 5
   - type: Sprite
     state: superbite
+  - type: Tag
+    tags:
+    - Meat
 # Tastes like bun, diabetes.
 
 - type: entity
@@ -814,6 +881,9 @@
           Quantity: 6
         - ReagentId: Vitamin
           Quantity: 5
+  - type: Tag
+    tags:
+    - Meat
 # Tastes like bun, acid.
 
 # Note: I would put a bunch of colored burgers here as listed in the tg .dm but

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

@@ -9,6 +9,7 @@
   - type: Tag
     tags:
       - Egg
+      - Meat
   - type: Food
     trash: Eggshells
   - type: Sprite

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

@@ -103,6 +103,9 @@
       color: red
   - type: Food
     trash: FoodFrozenPopsicleTrash
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: jumbo ice-cream
@@ -184,6 +187,9 @@
     - state: berry
   - type: Food
     trash: FoodFrozenSnowconeTrash
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: fruit salad snowcone
@@ -197,6 +203,9 @@
     - state: fruitsalad
   - type: Food
     trash: FoodFrozenSnowconeTrash
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: clowncone

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

@@ -195,6 +195,9 @@
           Quantity: 6
         - ReagentId: Vitamin
           Quantity: 2
+  - type: Tag
+    tags:
+    - Fruit
 # Tastes like eggplant, cheese.
 
 - type: entity
@@ -222,9 +225,6 @@
       - fishy
       - batter
       - spicy
-  - type: Tag
-    tags:
-    - CubanCarp
   - type: Sprite
     state: cubancarp
   - type: SolutionContainerManager
@@ -236,6 +236,10 @@
           Quantity: 6
         - ReagentId: CarpoToxin
           Quantity: 3
+  - type: Tag
+    tags:
+    - CubanCarp
+    - Meat
 # Tastes like fish, batter, hot peppers.
 
 - type: entity
@@ -259,6 +263,9 @@
           Quantity: 6
         - ReagentId: Vitamin
           Quantity: 4
+  - type: Tag
+    tags:
+    - Meat
 # Tastes like meat, cabbage.
 
 - type: entity
@@ -282,6 +289,9 @@
           Quantity: 2
         - ReagentId: Vitamin
           Quantity: 5
+  - type: Tag
+    tags:
+    - Meat
 # Tastes like meat, salmon.
 
 - type: entity
@@ -305,6 +315,9 @@
           Quantity: 6
         - ReagentId: Vitamin
           Quantity: 1
+  - type: Tag
+    tags:
+    - Meat
 # Tastes like meat, butter.
 
 - type: entity
@@ -330,6 +343,9 @@
           Quantity: 10
         - ReagentId: BbqSauce
           Quantity: 10
+  - type: Tag
+    tags:
+    - Meat
 # Tastes like meat, smokey sauce.
 
 - type: entity
@@ -354,6 +370,9 @@
           Quantity: 6
         - ReagentId: Vitamin
           Quantity: 4
+  - type: Tag
+    tags:
+    - Meat
 # Tastes like eggs, bacon, bun.
 
 - type: entity
@@ -375,6 +394,9 @@
         reagents:
         - ReagentId: Nutriment
           Quantity: 9
+  - type: Tag
+    tags:
+    - Meat
 # Tastes like egg, cheese.
 
 - type: entity
@@ -401,6 +423,9 @@
           Quantity: 1
         - ReagentId: Blackpepper
           Quantity: 1
+  - type: Tag
+    tags:
+    - Meat
 # Tastes like egg, salt, pepper.
 
 - type: entity
@@ -493,6 +518,9 @@
           Quantity: 6
         - ReagentId: CarpoToxin
           Quantity: 15
+  - type: Tag
+    tags:
+    - Meat
 # tastes exotic
 
 - type: entity
@@ -515,6 +543,9 @@
             Quantity: 8
           - ReagentId: CapsaicinOil
             Quantity: 6
+    - type: Tag
+      tags:
+      - Meat
 # What do Europeans eat instead of enchiladas? 25.4 millimeter-iladas.
 
 - type: entity
@@ -544,6 +575,9 @@
           Quantity: 5
         - ReagentId: Kelotane
           Quantity: 5
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: taco
@@ -559,6 +593,9 @@
       - onion
   - type: Sprite
     state: taco
+  - type: Tag
+    tags:
+    - Meat
 
 - type: entity
   name: corn in butter

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

@@ -43,6 +43,7 @@
   - type: Tag
     tags:
     - Raw
+    - Meat
   - type: Perishable
     # raw meat rots in 5 minutes, get it into the freezer fast
     rotAfter: 300
@@ -88,6 +89,9 @@
     graph: MeatSteak
     node: start
     defaultTarget: meat steak
+  - type: Tag
+    tags:
+    - Meat
 
 - type: entity
   name: raw human meat
@@ -120,6 +124,7 @@
   - type: Tag
     tags:
     - Raw
+    - Meat
   - type: Sprite
     state: fish
   - type: SolutionContainerManager
@@ -144,6 +149,7 @@
   - type: Tag
     tags:
     - Raw
+    - Meat
   - type: Sprite
     state: bacon
   - type: SolutionContainerManager
@@ -183,6 +189,7 @@
     node: start
     defaultTarget: filet migrawr
     
+
 - type: entity
   name: raw penguin meat
   parent: FoodMeatRawBase
@@ -266,6 +273,7 @@
     tags:
     - Raw
     - HighRiskItem
+    - Meat
   - type: Sprite
     state: corgi
   - type: SolutionContainerManager
@@ -331,6 +339,7 @@
   - type: Tag
     tags:
     - Raw
+    - Meat
   - type: Sprite
     layers:
     - state: dragon
@@ -407,6 +416,7 @@
   - type: Tag
     tags:
     - Raw
+    - Meat
   - type: Sprite
     state: rotten
   - type: SolutionContainerManager
@@ -486,6 +496,7 @@
   - type: Tag
     tags:
     - Raw
+    - Meat
   - type: Sprite
     state: xeno
   - type: SolutionContainerManager
@@ -547,6 +558,7 @@
   - type: Tag
     tags:
     - Raw
+    - Meat
   - type: Sprite
     state: salami
   - type: SliceableFood
@@ -565,6 +577,7 @@
   - type: Tag
     tags:
     - Raw
+    - Meat
   - type: Sprite
     state: clown
   - type: SliceableFood
@@ -579,6 +592,7 @@
   - type: Tag
     tags:
     - Raw
+    - Meat
   - type: Sprite
     state: meatball
 
@@ -594,6 +608,7 @@
   - type: Tag
     tags:
     - Raw
+    - Meat
   - type: Sprite
     state: slime
 
@@ -630,6 +645,9 @@
     size: 5
   - type: StaticPrice
     price: 3000 #It has so much Omnizin in it
+  - type: Tag
+    tags:
+    - Meat
 
 - type: entity
   name: steak
@@ -640,6 +658,7 @@
   - type: Tag
     tags:
     - Cooked
+    - Meat
   - type: Sprite
     layers:
     - state: plain-cooked
@@ -667,6 +686,7 @@
   - type: Tag
     tags:
     - Cooked
+    - Meat
   - type: Food
   - type: Sprite
     layers:
@@ -699,6 +719,7 @@
   - type: Tag
     tags:
     - Cooked
+    - Meat
   - type: Food
   - type: Sprite
     layers:
@@ -727,6 +748,7 @@
   - type: Tag
     tags:
     - Cooked
+    - Meat
   - type: Food
   - type: Sprite
     layers:
@@ -755,6 +777,7 @@
   - type: Tag
     tags:
     - Cooked
+    - Meat
   - type: Food
   - type: Sprite
     layers:
@@ -783,6 +806,7 @@
   - type: Tag
     tags:
     - Cooked
+    - Meat
   - type: Sprite
     layers:
     - state: chicken-fried
@@ -811,6 +835,7 @@
   - type: Tag
     tags:
     - Cooked
+    - Meat
   - type: Food
   - type: Sprite
     layers:
@@ -842,6 +867,7 @@
   - type: Tag
     tags:
     - Cooked
+    - Meat
   - type: Food
   - type: Sprite
     layers:
@@ -867,6 +893,7 @@
   - type: Tag
     tags:
     - Cooked
+    - Meat
   - type: Food
   - type: Sprite
     layers:
@@ -920,6 +947,7 @@
   - type: Tag
     tags:
     - Cooked
+    - Meat
   - type: Food
   - type: Sprite
     layers:
@@ -948,6 +976,7 @@
   - type: Tag
     tags:
     - Cooked
+    - Meat
   - type: Food
   - type: Sprite
     layers:
@@ -970,6 +999,7 @@
   - type: Tag
     tags:
     - Cooked
+    - Meat
   - type: Sprite
     state: meatball-cooked
   - type: SolutionContainerManager
@@ -995,6 +1025,7 @@
     tags:
     - Raw
     - Cutlet
+    - Meat
   - type: Sprite
     state: cutlet
   - type: SolutionContainerManager
@@ -1016,6 +1047,7 @@
     tags:
     - Raw
     - Cutlet
+    - Meat
   - type: Sprite
     layers:
     - state: cutlet
@@ -1040,6 +1072,7 @@
     tags:
     - Raw
     - Cutlet
+    - Meat
   - type: Sprite
     state: cutlet
     color: white
@@ -1062,6 +1095,7 @@
     tags:
     - Raw
     - Cutlet
+    - Meat
   - type: Sprite
     state: cutlet
     color: white
@@ -1084,6 +1118,7 @@
     tags:
     - Raw
     - Cutlet
+    - Meat
   - type: Sprite
     state: cutlet
     color: white
@@ -1106,6 +1141,7 @@
     tags:
     - Raw
     - Cutlet
+    - Meat
   - type: Sprite
     layers:
     - state: cutlet
@@ -1131,6 +1167,7 @@
     tags:
     - Raw
     - Cutlet
+    - Meat
   - type: Sprite
     state: spidercutlet
   - type: SolutionContainerManager
@@ -1156,6 +1193,7 @@
     tags:
     - Raw
     - Cutlet
+    - Meat
   - type: Sprite
     state: xenocutlet
   - type: SolutionContainerManager
@@ -1174,6 +1212,7 @@
   - type: Tag
     tags:
     - Cutlet
+    - Meat
   - type: Sprite
     state: salami-slice
     color: red
@@ -1188,6 +1227,7 @@
     tags:
     - Raw
     - Cutlet
+    - Meat
   - type: Sprite
     state: salami-slice
   - type: SolutionContainerManager
@@ -1211,6 +1251,7 @@
     tags:
     - Cooked
     - Cutlet
+    - Meat
   - type: Sprite
     state: cutlet-cooked
   - type: SolutionContainerManager
@@ -1232,6 +1273,7 @@
     tags:
     - Cooked
     - Cutlet
+    - Meat
   - type: Sprite
     layers:
     - state: cutlet-cooked
@@ -1256,6 +1298,7 @@
     tags:
     - Cooked
     - Cutlet
+    - Meat
   - type: Sprite
     state: cutlet-cooked
     color: white
@@ -1278,6 +1321,7 @@
     tags:
     - Cooked
     - Cutlet
+    - Meat
   - type: Sprite
     state: cutlet-cooked
     color: white
@@ -1300,6 +1344,7 @@
     tags:
     - Cooked
     - Cutlet
+    - Meat
   - type: Sprite
     state: cutlet-cooked
     color: white
@@ -1322,6 +1367,7 @@
     tags:
     - Cooked
     - Cutlet
+    - Meat
   - type: Sprite
     layers:
     - state: cutlet-cooked
@@ -1345,6 +1391,7 @@
     tags:
     - Cooked
     - Cutlet
+    - Meat
   - type: Sprite
     state: spidercutlet-cooked
   - type: SolutionContainerManager
@@ -1366,6 +1413,7 @@
     tags:
     - Cooked
     - Cutlet
+    - Meat
   - type: Sprite
     state: xenocutlet-cooked
   - type: SolutionContainerManager

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

@@ -43,6 +43,9 @@
       - tomato
   - type: Sprite
     state: tomato
+  - type: Tag
+    tags:
+    - Fruit
 # Tastes like pasta, tomato.
 
 - type: entity
@@ -88,6 +91,9 @@
           Quantity: 8
         - ReagentId: Vitamin
           Quantity: 4
+  - type: Tag
+    tags:
+    - Meat
 # Tastes like pasta, meat.
 
 - type: entity

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

@@ -219,6 +219,9 @@
       reagents:
       - ReagentId: JuiceBanana
         Quantity: 10
+  - type: Tag
+    tags:
+    - Fruit
     
 - type: entity
   name: mimana
@@ -443,6 +446,7 @@
   - type: Tag
     tags:
     - Lemon
+    - Fruit
 
 - type: entity
   name: lime
@@ -465,6 +469,7 @@
   - type: Tag
     tags:
     - Lime
+    - Fruit
 
 - type: entity
   name: orange
@@ -484,6 +489,9 @@
       reagents:
       - ReagentId: JuiceOrange
         Quantity: 10
+  - type: Tag
+    tags:
+    - Meat
 
 - type: entity
   name: pineapple
@@ -517,6 +525,9 @@
   - type: SliceableFood
     count: 5
     slice: FoodPineappleSlice
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: potato
@@ -596,6 +607,9 @@
         solution: food
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: blue tomato
@@ -637,6 +651,9 @@
         solution: food
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: blood tomato
@@ -676,6 +693,9 @@
         solution: food
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+  - type: Tag
+    tags:
+    - Fruit # Fuck you they're a fruit
 
 - type: entity
   name: eggplant
@@ -699,6 +719,9 @@
     sprite: Objects/Specific/Hydroponics/eggplant.rsi
   - type: Produce
     seedId: eggplant
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: apple
@@ -727,6 +750,9 @@
       reagents:
       - ReagentId: JuiceApple
         Quantity: 10
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: cocoa pod
@@ -757,6 +783,9 @@
       - id: FoodCocoaBeans
     sound:
       path: /Audio/Effects/packetrip.ogg
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: ear of corn
@@ -923,6 +952,9 @@
       reagents:
       - ReagentId: JuicePineapple
         Quantity: 2
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: onion slice
@@ -1201,6 +1233,7 @@
   - type: Tag
     tags:
     - Galaxythistle
+    - Fruit # Probably? 
 
 - type: entity
   name: fly amanita
@@ -1252,6 +1285,9 @@
     seedId: gatfruit
   - type: Food
     trash: WeaponRevolverPython
+  - type: Tag
+    tags:
+    - Fruit # It's in the name
 
 - type: entity
   name: rice bushel
@@ -1376,6 +1412,9 @@
     butcheringType: Knife
     spawned:
     - id: ClothingHeadHatWatermelon
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: watermelon slice
@@ -1406,6 +1445,9 @@
       reagents:
       - ReagentId: JuiceWatermelon
         Quantity: 4
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: grapes
@@ -1462,6 +1504,9 @@
       reagents:
       - ReagentId: JuiceBerry
         Quantity: 10
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: bungo fruit
@@ -1500,6 +1545,7 @@
     tags:
     - Recyclable
     - Trash
+    - Fruit
   - type: SolutionContainerManager
     solutions:
       food:

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

@@ -64,6 +64,10 @@
         color: green
       - state: skewer-meat-alpha4
         color: brown
+  - type: Tag
+    tags:
+    - Meat
+    - Fruit
 
 - type: entity
   name: meat kebab
@@ -78,6 +82,9 @@
       - state: skewer-meat2
       - state: skewer-meat3
       - state: skewer-meat4
+  - type: Tag
+    tags:
+    - Meat
 
 - type: entity
   name: human kebab

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

@@ -183,6 +183,9 @@
   - type: Item
   - type: Food
     trash: FoodPacketPistachioTrash
+  - type: Tag
+    tags:
+    - Fruit # Seed of a fruit, you can yell at me
 
 - type: entity
   name: popcorn
@@ -216,6 +219,9 @@
   - type: Item
   - type: Food
     trash: FoodPacketRaisinsTrash
+  - type: Tag
+    tags:
+    - Fruit
 
 - type: entity
   name: bob's semki sunflower seeds
@@ -246,6 +252,9 @@
   - type: Item
   - type: Food
     trash: FoodPacketSusTrash
+  - type: Tag
+    tags:
+    - Meat
 
 - type: entity
   name: syndi-cakes

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

@@ -109,6 +109,10 @@
           Quantity: 6
         - ReagentId: Omnizine
           Quantity: 8
+  - type: Tag
+    tags:
+    - Soup
+    - Fruit # I don't know what this is but its' a salad so sure
 
 - type: entity
   name: herb salad
@@ -133,6 +137,10 @@
           Quantity: 8
         - ReagentId: Vitamin
           Quantity: 2
+  - type: Tag
+    tags:
+    - Fruit
+    - Soup
 
 - type: entity
   name: valid salad
@@ -161,6 +169,11 @@
           Quantity: 2
         - ReagentId: DoctorsDelight
           Quantity: 5
+  - type: Tag
+    tags:
+    - Meat
+    - Fruit
+    - Soup
 
 - type: entity
   name: coleslaw
@@ -264,6 +277,10 @@
           Quantity: 2
         - ReagentId: Vitamin
           Quantity: 4
+  - type: Tag
+    tags:
+    - Fruit
+    - Soup
 
 - type: entity
   name: jungle salad
@@ -288,6 +305,10 @@
           Quantity: 7
         - ReagentId: Vitamin
           Quantity: 4
+  - type: Tag
+    tags:
+    - Fruit
+    - Soup
 
 - type: entity
   name: citrus salad
@@ -312,6 +333,10 @@
           Quantity: 18
         - ReagentId: Vitamin
           Quantity: 15
+  - type: Tag
+    tags:
+    - Fruit
+    - Soup
 
 - type: entity
   name: salad of eden
@@ -378,6 +403,10 @@
           Quantity: 4
         - ReagentId: Vitamin
           Quantity: 4
+  - type: Tag
+    tags:
+    - Meat
+    - Soup
 
 - type: entity
   name: rice and pork
@@ -406,6 +435,10 @@
           Quantity: 6.5
         - ReagentId: Epinephrine
           Quantity: 2
+  - type: Tag
+    tags:
+    - Meat
+    - Soup
 
 - type: entity
   name: rice pudding
@@ -462,6 +495,10 @@
           Quantity: 3
         - ReagentId: CapsaicinOil
           Quantity: 2
+  - type: Tag
+    tags:
+    - Meat
+    - Soup
 
 # Misc
 
@@ -555,6 +592,10 @@
           Quantity: 8
         - ReagentId: Water
           Quantity: 10
+  - type: Tag
+    tags:
+    - Meat
+    - Soup
 
 - type: entity
   name: slime soup
@@ -606,6 +647,10 @@
           Quantity: 10
         - ReagentId: Blood
           Quantity: 5
+  - type: Tag
+    tags:
+    - Fruit
+    - Soup
 
 - type: entity
   name: wing fang chu
@@ -837,6 +882,10 @@
             Quantity: 1
           - ReagentId: Blackpepper
             Quantity: 1
+  - type: Tag
+    tags:
+    - Meat
+    - Soup
 
 - type: entity
   name: tomato soup
@@ -862,6 +911,10 @@
             Quantity: 5
           - ReagentId: Water
             Quantity: 10
+  - type: Tag
+    tags:
+    - Fruit
+    - Soup
 
 - type: entity
   name: eyeball soup
@@ -886,6 +939,10 @@
             Quantity: 5
           - ReagentId: Vitamin
             Quantity: 3
+  - type: Tag
+    tags:
+    - Meat
+    - Soup
 
 - type: entity
   name: miso soup
@@ -914,6 +971,10 @@
             Quantity: 3
           - ReagentId: Water
             Quantity: 10
+  - type: Tag
+    tags:
+    - Meat
+    - Soup
 
 - type: entity
   name: mushroom soup
@@ -1012,6 +1073,11 @@
             Quantity: 5
           - ReagentId: Vitamin
             Quantity: 2
+  - type: Tag
+    tags:
+    - Meat
+    - Fruit
+    - Soup
 
 - type: entity
   name: sweet potato soup
@@ -1138,4 +1204,8 @@
             Quantity: 5
           - ReagentId: CapsaicinOil
             Quantity: 5
+  - type: Tag
+    tags:
+    - Fruit
+    - Soup
 # Tastes like bungo, hot curry.

Resources/Prototypes/Entities/Objects/Specific/chemistry.yml

@@ -428,6 +428,9 @@
         transferForensics: true
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+  - type: Tag
+    tags:
+    - Pill
 
 - type: entity
   name: pill canister

Resources/Prototypes/tags.yml

@@ -476,6 +476,9 @@
 - type: Tag
   id: ForceNoFixRotations # fixrotations command WON'T target this
 
+- type: Tag
+  id: Fruit
+
 - type: Tag
   id: Galaxythistle
 
@@ -709,6 +712,9 @@
 - type: Tag
   id: Matchstick
 
+- type: Tag
+  id: Meat
+
 - type: Tag
   id: Medkit
 
@@ -785,6 +791,9 @@
 - type: Tag
   id: Pig
 
+- type: Tag
+  id: Pill
+
 - type: Tag
   id: PillCanister