From 8f860157f7046b60c46a61e7b87ad8f07ae34f0b Mon Sep 17 00:00:00 2001 From: Rane <60792108+Elijahrane@users.noreply.github.com> Date: Thu, 17 Feb 2022 20:27:57 -0500 Subject: [PATCH] Vitamins, Protein, new reagents for almost every food, new recipes (#6607) --- .../Objects/Consumable/Food/Baked/bread.yml | 156 +++++++ .../Objects/Consumable/Food/Baked/cake.yml | 99 ++++- .../Objects/Consumable/Food/Baked/donut.yml | 101 +++++ .../Objects/Consumable/Food/Baked/misc.yml | 75 +++- .../Objects/Consumable/Food/Baked/pie.yml | 25 +- .../Objects/Consumable/Food/Baked/pizza.yml | 81 +++- .../Objects/Consumable/Food/burger.yml | 155 ++++++- .../Objects/Consumable/Food/meals.yml | 131 +++++- .../Entities/Objects/Consumable/Food/meat.yml | 84 +++- .../Objects/Consumable/Food/noodles.yml | 45 ++ .../Objects/Consumable/Food/produce.yml | 68 ++- .../Objects/Consumable/Food/skewer.yml | 12 +- .../Entities/Objects/Consumable/Food/soup.yml | 392 +++++++++++++++++- Resources/Prototypes/Hydroponics/seeds.yml | 68 ++- .../Reagents/Consumable/Drink/alcohol.yml | 16 + .../Reagents/Consumable/Food/food.yml | 37 ++ .../Recipes/Cooking/meal_recipes.yml | 103 ++++- .../Food/meals.rsi/amanita-jelly.png | Bin 0 -> 1960 bytes .../Consumable/Food/meals.rsi/meta.json | 13 + 19 files changed, 1581 insertions(+), 80 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/meals.rsi/amanita-jelly.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index 9cde0d8139..2588cca586 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -110,6 +110,15 @@ - state: meat - type: SliceableFood slice: FoodBreadMeatSlice + - type: SolutionContainerManager + solutions: + food: + maxVol: 45 + reagents: + - ReagentId: Nutriment + Quantity: 30 + - ReagentId: Vitamin + Quantity: 5 # Tastes like bread, meat. - type: entity @@ -124,6 +133,15 @@ layers: - state: plate - state: meat-slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 1.2 - type: entity name: xeno-meat bread @@ -139,6 +157,15 @@ - state: xenomeat - type: SliceableFood slice: FoodBreadMeatXenoSlice + - type: SolutionContainerManager + solutions: + food: + maxVol: 45 + reagents: + - ReagentId: Nutriment + Quantity: 30 + - ReagentId: Vitamin + Quantity: 5 # Tastes like bread, acid. - type: entity @@ -153,6 +180,15 @@ layers: - state: plate - state: xenomeat-slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 1.2 - type: entity name: spider-meatbread @@ -168,6 +204,17 @@ - state: spidermeat - type: SliceableFood slice: FoodBreadMeatSpiderSlice + - type: SolutionContainerManager + solutions: + food: + maxVol: 60 + reagents: + - ReagentId: Nutriment + Quantity: 30 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Toxin + Quantity: 15 # Tastes like bread, cobwebs. - type: entity @@ -182,6 +229,17 @@ layers: - state: plate - state: spidermeat-slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 1.2 + - ReagentId: Toxin + Quantity: 3 - type: entity name: banana-nut bread @@ -226,6 +284,15 @@ - state: tofu - type: SliceableFood slice: FoodBreadTofuSlice + - type: SolutionContainerManager + solutions: + food: + maxVol: 45 + reagents: + - ReagentId: Nutriment + Quantity: 30 + - ReagentId: Vitamin + Quantity: 5 # Tastes like bread, tofu. - type: entity @@ -240,6 +307,15 @@ layers: - state: plate - state: tofu-slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 1.2 - type: entity name: cream cheese bread @@ -255,6 +331,15 @@ - state: creamcheese - type: SliceableFood slice: FoodBreadCreamcheeseSlice + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 20 + - ReagentId: Vitamin + Quantity: 5 # Tastes like bread, cheese. - type: entity @@ -269,6 +354,15 @@ layers: - state: plate - state: creamcheese-slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Vitamin + Quantity: 1.2 - type: entity name: mimana bread @@ -284,6 +378,17 @@ - state: mimana - type: SliceableFood slice: FoodBreadMimanaSlice + - type: SolutionContainerManager + solutions: + food: + maxVol: 40 + reagents: + - ReagentId: Nutriment + Quantity: 20 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Nothing + Quantity: 5 # Tastes like bread, cheese. - type: entity @@ -298,6 +403,17 @@ layers: - state: plate - state: mimana-slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Vitamin + Quantity: 1.2 + - ReagentId: Nothing + Quantity: 1.2 # Other than bread/slices @@ -311,6 +427,15 @@ layers: - state: plate - state: moldy-slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Amatoxin + Quantity: 7 # Tastes like decaying fungus. - type: entity @@ -324,6 +449,19 @@ - Baguette - type: Sprite state: baguette + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 1 + - ReagentId: TableSalt + Quantity: 1 + - ReagentId: Blackpepper + Quantity: 1 # Tastes like France. - type: entity @@ -336,6 +474,15 @@ layers: - state: plate - state: garlic-slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 4 # Tastes like garlic, Italy. - type: entity @@ -346,4 +493,13 @@ components: - type: Sprite state: buttered-toast + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 1 # Tastes like bread, butter. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml index dbefa70d7f..7c9111a712 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml @@ -13,10 +13,12 @@ - type: SolutionContainerManager solutions: food: - maxVol: 26 + maxVol: 30 reagents: - ReagentId: Nutriment Quantity: 20 + - Vitamin: + Quantity: 5 - type: entity parent: FoodCakeBase @@ -29,10 +31,12 @@ - type: SolutionContainerManager solutions: food: - maxVol: 8 + maxVol: 10 reagents: - ReagentId: Nutriment Quantity: 4 + - ReagentId: Vitamin + Quantity: 1 # Custom Cake Example @@ -131,6 +135,7 @@ - type: SliceableFood slice: FoodCakeBrainSlice + - type: entity name: slice of brain cake parent: FoodCakeSliceBase @@ -260,12 +265,14 @@ - type: SolutionContainerManager solutions: food: - maxVol: 26 + maxVol: 35 reagents: - ReagentId: Nutriment Quantity: 20 - ReagentId: Theobromine Quantity: 5 + - ReagentId: Vitamin + Quantity: 5 - type: entity name: slice of chocolate cake @@ -285,6 +292,8 @@ Quantity: 4 - ReagentId: Theobromine Quantity: 1 + - ReagentId: Vitamin + Quantity: 1 # Tastes like sweetness, cake, chocolate. - type: entity @@ -361,6 +370,15 @@ - state: pumpkinspice - type: SliceableFood slice: FoodCakePumpkinSlice + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: Nutriment + Quantity: 32 + - ReagentId: Vitamin + Quantity: 11 - type: entity name: slice of pumpkin-spice cake @@ -375,6 +393,15 @@ - state: plate-small - state: plate-slice-shading - state: pumpkinspice-slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 6.4 + - ReagentId: Vitamin + Quantity: 2.2 # Tastes like sweetness, cake, pumpkin. - type: entity @@ -449,6 +476,17 @@ - state: vanilla - type: SliceableFood slice: FoodCakeVanillaSlice + - type: SolutionContainerManager #TODO Sprinkles + solutions: + food: + maxVol: 45 + reagents: + - ReagentId: Nutriment + Quantity: 20 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Glucose + Quantity: 15 - type: entity name: slice of vanilla cake @@ -463,6 +501,17 @@ - state: plate-small - state: plate-slice-shading - state: vanilla-slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 45 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Vitamin + Quantity: 1 + - ReagentId: Glucose + Quantity: 3 # Tastes like sweetness, cake, vanilla. - type: entity @@ -479,6 +528,17 @@ - state: clown - type: SliceableFood slice: FoodCakeClownSlice + - type: SolutionContainerManager #TODO Sprinkles + solutions: + food: + maxVol: 45 + reagents: + - ReagentId: Nutriment + Quantity: 20 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Glucose + Quantity: 15 - type: entity name: slice of clown cake @@ -493,6 +553,17 @@ - state: plate-small - state: plate-slice-shading - state: clown-slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 45 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Vitamin + Quantity: 1 + - ReagentId: Glucose + Quantity: 3 # Tastes like sweetness, cake, clown. - type: entity @@ -509,6 +580,17 @@ - state: trumpet - type: SliceableFood slice: FoodCakeSpacemanSlice + - type: SolutionContainerManager + solutions: + food: + maxVol: 45 + reagents: + - ReagentId: Nutriment + Quantity: 20 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Omnizine #This is a really rare cake with healing stuff and we don't have any of its chems yet + Quantity: 15 - type: entity name: slice of spaceman's cake @@ -523,4 +605,15 @@ - state: plate-small - state: plate-slice-shading - state: trumpet-slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Vitamin + Quantity: 1 + - ReagentId: Omnizine + Quantity: 3 # Tastes like sweetness, cake, jam. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml index 76f71f39d9..453cf74dfd 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml @@ -49,6 +49,15 @@ components: - type: Sprite state: jelly-plain + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Vitamin + Quantity: 1 # Donuts @@ -194,6 +203,15 @@ state: jelly-homer - type: Item HeldPrefix: pink + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Vitamin + Quantity: 1 - type: entity name: pink jelly-donut @@ -205,6 +223,15 @@ state: jelly-pink - type: Item HeldPrefix: pink + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Vitamin + Quantity: 1 - type: entity name: spaceman's jelly-donut @@ -214,6 +241,15 @@ components: - type: Sprite state: jelly-purple + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Vitamin + Quantity: 1 # Tastes like jelly-donut, violets. - type: entity @@ -224,6 +260,15 @@ components: - type: Sprite state: jelly-green + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Vitamin + Quantity: 1 # Tastes like jelly-donut, green apples. - type: entity @@ -234,6 +279,15 @@ components: - type: Sprite state: jelly-beige + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Vitamin + Quantity: 1 # Tastes like jelly-donut, buttery sweetness. - type: entity @@ -253,6 +307,8 @@ Quantity: 3 - ReagentId: Theobromine Quantity: 1 + - ReagentId: Vitamin + Quantity: 1 # Tastes like jelly-donut, bitterness. - type: entity @@ -263,6 +319,15 @@ components: - type: Sprite state: jelly-blue + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Vitamin + Quantity: 1 # Tastes like jelly-donut, blumpkin. - type: entity @@ -273,6 +338,15 @@ components: - type: Sprite state: jelly-yellow + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Vitamin + Quantity: 1 # Tastes like jelly-donut, tropical sweetness. - type: entity @@ -283,6 +357,15 @@ components: - type: Sprite state: jelly-olive + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Vitamin + Quantity: 1 # Tastes like jelly-donut, matcha. - type: entity @@ -293,6 +376,15 @@ components: - type: Sprite state: jelly-laugh + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Vitamin + Quantity: 1 # Tastes like jelly-donut, fizzy tutti frutti. - type: entity @@ -303,4 +395,13 @@ components: - type: Sprite state: jelly-slug + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Vitamin + Quantity: 1 # Tastes like jelly-donut, fizzy tutti frutti. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml index a6815ad5e8..52b950ee5d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -58,7 +58,7 @@ state: muffin-bluecherry - type: entity - name: honey bun + name: honey bun #TODO honey parent: FoodBakedBase id: FoodBakedBunHoney description: A sticky pastry bun glazed with honey. @@ -83,6 +83,15 @@ components: - type: Sprite state: bun-meat + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 2 # Cookies @@ -114,6 +123,15 @@ components: - type: Sprite state: cookie-oatmeal + - type: SolutionContainerManager + solutions: + food: + maxVol: 8 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 1 - type: entity name: raisin cookie @@ -123,6 +141,15 @@ components: - type: Sprite state: cookie-raisin + - type: SolutionContainerManager + solutions: + food: + maxVol: 8 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 1 - type: entity name: sugar cookie @@ -157,6 +184,17 @@ - lizard - star - corgi + - type: SolutionContainerManager + solutions: + food: + maxVol: 8 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Protein + Quantity: 2 + - ReagentId: Vitamin + Quantity: 1 # Waffles/Pancakes @@ -274,7 +312,9 @@ maxVol: 20 reagents: - ReagentId: Nutriment - Quantity: 15 + Quantity: 8 + - ReagentId: Vitamin + Quantity: 1 - type: entity name: soy waffles @@ -286,6 +326,15 @@ layers: - state: tray - state: waffles-soy + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Vitamin + Quantity: 1 - type: entity name: soylent waffles @@ -297,6 +346,15 @@ layers: - state: tray - state: waffles-soylent + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Vitamin + Quantity: 1 - type: entity name: roffle waffles @@ -308,6 +366,15 @@ layers: - state: tray - state: waffles-roffle + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 2 # Misc @@ -334,4 +401,6 @@ maxVol: 20 reagents: - ReagentId: Nutriment - Quantity: 15 + Quantity: 5 + - ReagentId: Vitamin + Quantity: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml index 94655c4072..ad0fa4d485 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml @@ -13,10 +13,12 @@ - type: SolutionContainerManager solutions: food: - maxVol: 24 - reagents: + maxVol: 20 + reagents: #Most of these are this with slight variations, not worth changing until we have the rest of the reagents - ReagentId: Nutriment - Quantity: 20 + Quantity: 11 + - ReagentId: Vitamin + Quanity: 5 - type: SliceableFood count: 4 - type: Tag @@ -40,7 +42,9 @@ maxVol: 6 reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 1.2 + - ReagentId: Vitamin + Quantity: 1 - type: Tag tags: - NoSpinOnThrow @@ -259,10 +263,21 @@ layers: - state: plate - state: amanita + - type: SolutionContainerManager + solutions: + food: + maxVol: 17 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Amatoxin + Quantity: 3 + - ReagentId: Vitamin + Quantity: 4 # Tastes like pie, mushrooms. - type: entity - name: amanita pie + name: plump pie parent: FoodPieBase id: FoodPiePlump description: I bet you love stuff made out of plump helmets! diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml index 2440c4d435..cb0194a0b5 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml @@ -13,10 +13,12 @@ - type: SolutionContainerManager solutions: food: - maxVol: 36 + maxVol: 40 reagents: - ReagentId: Nutriment Quantity: 30 + - ReagentId: Vitamin + Quantity: 5 - type: SliceableFood count: 6 - type: Item @@ -43,6 +45,8 @@ reagents: - ReagentId: Nutriment Quantity: 5 + - ReagentId: Vitamin + Quantity: 0.8 - type: Item size: 1 - type: Tag @@ -163,6 +167,18 @@ - state: donkpocket - type: SliceableFood slice: FoodPizzaDonkpocketSlice + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: Nutriment + Quantity: 27 + - ReagentId: Vitamin + Quantity: 6 + - ReagentId: Omnizine + Quantity: 9 + - type: entity name: slice of donk-pocket pizza @@ -174,6 +190,17 @@ layers: - state: plate-slice - state: donkpocket-slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: Nutriment + Quantity: 4.5 + - ReagentId: Vitamin + Quantity: 1 + - ReagentId: Omnizine + Quantity: 1.5 # Tastes like crust, tomato, cheese, meat, laziness. - type: entity @@ -188,6 +215,17 @@ - state: dank - type: SliceableFood slice: FoodPizzaDankSlice + - type: SolutionContainerManager + solutions: + food: + maxVol: 50 + reagents: + - ReagentId: Nutriment + Quantity: 25 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: DoctorsDelight + Quantity: 6 - type: entity name: slice of dank pizza @@ -199,6 +237,17 @@ layers: - state: plate-slice - state: dank-slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 4.2 + - ReagentId: Vitamin + Quantity: 0.8 + - ReagentId: DoctorsDelight + Quantity: 1 # Tastes like crust, tomato, cheese, meat, satisfaction. - type: entity @@ -264,6 +313,19 @@ - state: arnold - type: SliceableFood slice: FoodPizzaArnoldSlice + - type: SolutionContainerManager + solutions: + food: + maxVol: 85 + reagents: + - ReagentId: Nutriment + Quantity: 30 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Iron + Quantity: 10 + - ReagentId: Omnizine + Quantity: 30 - type: entity name: slice of Arnold's pizza @@ -275,6 +337,19 @@ layers: - state: plate-slice - state: arnold-slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 0.8 + - ReagentId: Iron + Quantity: 1.6 + - ReagentId: Omnizine + Quantity: 5 # Tastes like crust, tomato, cheese, pepperoni, 9 millimeter bullets. #TODO: Make this do poison damage and make cut pizza slices eventually rot into this. @@ -296,6 +371,8 @@ reagents: - ReagentId: Nutriment Quantity: 2 - - ReagentId: Toxin + - ReagentId: Amatoxin Quantity: 2 + - ReagentId: Vitamin + Quantity: 1 # Tastes like stale crust, rancid cheese, mushroom. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml index 0015bfbaeb..bc1fdddd06 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml @@ -34,10 +34,12 @@ - type: SolutionContainerManager solutions: food: - maxVol: 20 + maxVol: 15 reagents: - ReagentId: Nutriment - Quantity: 15 + Quantity: 7 + - ReagentId: Vitamin + Quantity: 3 - type: Item sprite: Objects/Consumable/Food/burger.rsi @@ -116,6 +118,17 @@ components: - type: Sprite state: bearger + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Protein + Quantity: 6 - type: entity name: clown burger @@ -154,6 +167,15 @@ components: - type: Sprite state: ghost + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Nutriment + Quantity: 7 + - ReagentId: Vitamin + Quantity: 12 # Tastes like bun, ectoplasm. # Note: I would put a bunch of colored burgers here as listed in the tg .dm but @@ -181,7 +203,9 @@ maxVol: 33 reagents: - ReagentId: Nutriment - Quantity: 25 + Quantity: 17 + - ReagentId: Vitamin + Quantity: 9 - type: Sprite state: bigbite # Tastes like bun, silver, magic. @@ -198,7 +222,13 @@ maxVol: 53 reagents: - ReagentId: Nutriment - Quantity: 40 + Quantity: 44 + - ReagentId: Vitamin + Quantity: 24 + - ReagentId: TableSalt + Quantity: 5 + - ReagentId: Blackpepper + Quantity: 5 - type: Sprite state: superbite # Tastes like bun, diabetes. @@ -211,6 +241,20 @@ components: - type: Sprite state: fivealarm + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: CapsaicinOil + Quantity: 5 + - ReagentId: Blackpepper + Quantity: 5 + - ReagentId: Vitamin + Quantity: 1 + # Tastes like bun, HEAT. - type: entity @@ -221,6 +265,15 @@ components: - type: Sprite state: rat + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Vitamin + Quantity: 1 # Tastes like bun, HEAT. - type: entity @@ -241,6 +294,14 @@ components: - type: Sprite state: bacon + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 19 + - ReagentId: Vitamin + Quantity: 5 # Tastes like bun, bacon. - type: entity @@ -251,6 +312,15 @@ components: - type: Sprite state: empowered + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Licoxide + Quantity: 5 # Tastes like bun, pure electricity. - type: entity @@ -261,6 +331,17 @@ components: - type: Sprite state: crab + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Protein + Quantity: 5 + - ReagentId: Vitamin + Quantity: 4 # Tastes like bun, crab meat. - type: entity @@ -271,6 +352,17 @@ components: - type: Sprite state: soylent + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Protein + Quantity: 6 + - ReagentId: Vitamin + Quantity: 4 # Tastes like bun, redditors. - type: entity @@ -281,6 +373,17 @@ components: - type: Sprite state: mcrib + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Protein + Quantity: 7 + - ReagentId: Vitamin + Quantity: 4 # Tastes like bun, pork patty. - type: entity @@ -291,6 +394,17 @@ components: - type: Sprite state: mcguffin + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Protein + Quantity: 7 + - ReagentId: Vitamin + Quantity: 1 # Tastes like muffin, bacon. - type: entity @@ -301,6 +415,17 @@ components: - type: Sprite state: chicken + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Protein + Quantity: 7 + - ReagentId: Vitamin + Quantity: 1 # Tastes like bun, chicken. - type: entity @@ -311,6 +436,17 @@ components: - type: Sprite state: chicken + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Protein + Quantity: 7 + - ReagentId: Vitamin + Quantity: 1 # Tastes like bun, duck. - type: entity @@ -321,6 +457,17 @@ components: - type: Sprite state: cheese + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Vitamin + Quantity: 7 + - ReagentId: Protein + Quantity: 1 # TODO: Make this work. # - type: Sprite # state: plate diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index 18751ecbed..f87f303c54 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -81,6 +81,17 @@ components: - type: Sprite state: nachos-cheesy + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 3 + - ReagentId: TableSalt + Quantity: 1 # Tastes like nachos, cheese. - type: entity @@ -91,6 +102,17 @@ components: - type: Sprite state: nachos-cuban + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 7 + - ReagentId: CapsaicinOil + Quantity: 8 + - ReagentId: Vitamin + Quantity: 4 # Tastes like nachos, hot pepper. - type: entity @@ -119,6 +141,15 @@ components: - type: Sprite state: eggplantparm + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 2 # Tastes like eggplant, cheese. - type: entity @@ -139,6 +170,15 @@ components: - type: Sprite state: cubancarp + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: CapsaicinOil + Quantity: 3 # Tastes like fish, batter, hot peppers. - type: entity @@ -149,6 +189,15 @@ components: - type: Sprite state: cornedbeef + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 4 # Tastes like meat, cabbage. - type: entity @@ -159,6 +208,15 @@ components: - type: Sprite state: bearsteak + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Vitamin + Quantity: 5 # Tastes like meat, salmon. - type: entity @@ -169,6 +227,15 @@ components: - type: Sprite state: pigblanket + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 1 # Tastes like meat, butter. - type: entity @@ -179,6 +246,17 @@ components: - type: Sprite state: ribs + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Protein + Quantity: 10 + - ReagentId: BbqSauce + Quantity: 10 # Tastes like meat, smokey sauce. - type: entity @@ -189,16 +267,32 @@ components: - type: Sprite state: benedict + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 4 # Tastes like eggs, bacon, bun. -- type: entity # FUCK THE FRENCH - name: omelette du fromage +- type: entity + name: cheese omelette parent: FoodMealBase id: FoodMealOmelette - description: That's all you can say! + description: Cheesy. components: - type: Sprite state: omelette + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 9 # Tastes like egg, cheese. - type: entity @@ -209,6 +303,17 @@ components: - type: Sprite state: friedegg + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: TableSalt + Quantity: 1 + - ReagentId: Blackpepper + Quantity: 1 # Tastes like egg, salt, pepper. - type: entity @@ -239,6 +344,17 @@ components: - type: Sprite state: saltysweet + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Nutriment + Quantity: 9 + - ReagentId: Water + Quantity: 10 + - ReagentId: Blackpepper + Quantity: 3 # Tastes awesome. - type: entity @@ -259,4 +375,13 @@ components: - type: Sprite state: enchiladas + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: CapsaicinOil + Quantity: 6 # What do Europeans eat instead of enchiladas? 25.4 millimeter-iladas. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index 97b44998df..a142b11fe0 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -408,7 +408,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 20 + Quantity: 10 + - ReagentId: Protein + Quantity: 5 - type: SliceableFood count: 3 slice: FoodMeatCutletCooked @@ -439,7 +441,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 15 + Quantity: 5 + - ReagentId: Protein + Quantity: 5 - type: entity name: cooked bear @@ -461,7 +465,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 15 + Quantity: 5 + - ReagentId: Protein + Quantity: 5 - type: SliceableFood count: 3 slice: FoodMeatBearCutletCooked @@ -486,7 +492,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 15 + Quantity: 5 + - ReagentId: Protein + Quantity: 5 - type: SliceableFood count: 3 slice: FoodMeatPenguinCutletCooked @@ -511,7 +519,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 5 + - ReagentId: Protein + Quantity: 5 - type: SliceableFood count: 3 slice: FoodMeatChickenCutletCooked @@ -539,7 +549,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 15 + Quantity: 5 + - ReagentId: Protein + Quantity: 5 - type: entity name: cooked duck @@ -561,7 +573,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 5 + - ReagentId: Protein + Quantity: 5 - type: SliceableFood count: 3 slice: FoodMeatDuckCutletCooked @@ -586,7 +600,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 15 + Quantity: 5 + - ReagentId: Protein + Quantity: 5 - type: entity name: goliath steak @@ -608,7 +624,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 15 + Quantity: 5 + - reagentId: Protein + Quantity: 5 - type: entity name: lizard steak @@ -630,7 +648,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 5 + - ReagentId: Protein + Quantity: 5 - type: SliceableFood count: 3 slice: FoodMeatLizardCutletCooked @@ -655,7 +675,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 15 + Quantity: 5 + - ReagentId: Protein + Quantity: 5 - type: entity name: meatball @@ -673,7 +695,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 5 + - ReagentId: Protein + Quantity: 5 # Cutlets @@ -879,7 +903,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 2 + Quantity: 1 + - ReagentId: Protein + Quantity: 1 # Cooked @@ -900,7 +926,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 2 + - ReagentId: Protein + Quantity: 2 - type: entity name: bear cutlet @@ -922,7 +950,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 2 + - ReagentId: Protein + Quantity: 2 - type: entity name: penguin cutlet @@ -942,7 +972,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 2 + - ReagentId: Protein + Quantity: 2 - type: entity name: chicken cutlet @@ -962,7 +994,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 2 + - ReagentId: Protein + Quantity: 2 - type: entity name: duck cutlet @@ -982,7 +1016,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 2 + - ReagentId: Protein + Quantity: 2 - type: entity name: lizard cutlet @@ -1003,7 +1039,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 2 + - ReagentId: Protein + Quantity: 2 - type: entity name: spider cutlet @@ -1026,7 +1064,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 1 + - ReagentId: Protein + Quantity: 1 - type: entity name: xeno cutlet @@ -1049,4 +1089,6 @@ food: reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 1 + - ReagentId: Protein + Quantity: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml index 8c735168c8..295a626311 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml @@ -53,6 +53,15 @@ components: - type: Sprite state: copypasta + - type: SolutionContainerManager + solutions: + food: + maxvol: 25 + reagents: + - ReagentId: Nutriment + Quantity: 12 + - ReagentId: Vitamin + Quantity: 8 # Tastes like pasta, bad humor. - type: entity @@ -65,6 +74,15 @@ layers: - state: plate - state: meatball + - type: SolutionContainerManager + solutions: + food: + maxvol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 4 # Tastes like pasta, meat. - type: entity @@ -77,6 +95,15 @@ layers: - state: plate - state: spesslaw + - type: SolutionContainerManager + solutions: + food: + maxvol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 6 # Tastes like pasta, meat. - type: entity @@ -89,6 +116,15 @@ layers: - state: plate - state: chowmein + - type: SolutionContainerManager + solutions: + food: + maxvol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 7 + - ReagentId: Vitamin + Quantity: 6 # Tastes like pasta, tomato. - type: entity @@ -101,4 +137,13 @@ layers: - state: plate - state: butter + - type: SolutionContainerManager + solutions: + food: + maxvol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 1 # Tastes like pasta, butter. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 9d7abc3422..fe74e34427 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -148,7 +148,9 @@ maxVol: 6 reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 4 + - ReagentId: Vitamin + Quantity: 2 - type: Sprite sprite: Objects/Specific/Hydroponics/banana.rsi - type: Produce @@ -207,10 +209,12 @@ - type: SolutionContainerManager solutions: food: - maxVol: 6 + maxVol: 9 reagents: - ReagentId: Nutriment Quantity: 5 + - ReagentId: Vitamin + Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/carrot.rsi - type: Produce @@ -230,10 +234,12 @@ - type: SolutionContainerManager solutions: food: - maxVol: 6 + maxVol: 9 reagents: - ReagentId: Nutriment Quantity: 5 + - ReagentId: Vitamin + Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/lemon.rsi - type: Produce @@ -253,10 +259,14 @@ - type: SolutionContainerManager solutions: food: - maxVol: 6 + maxVol: 16 reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 10 + - ReagentId: Vitamin + Quantity: 2 + - ReagentId: Water + Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/pineapple.rsi - type: Produce @@ -279,9 +289,12 @@ - type: SolutionContainerManager solutions: food: + maxVol: 14 reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 10 + - ReagentId: Vitamin + Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/potato.rsi - type: Produce @@ -301,9 +314,12 @@ - type: SolutionContainerManager solutions: food: + maxVol: 14 reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 10 + - ReagentId: Vitamin + Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/tomato.rsi - type: Produce @@ -379,9 +395,12 @@ - type: SolutionContainerManager solutions: food: + maxVol: 14 reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 10 + - ReagentId: Vitamin + Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/eggplant.rsi - type: Produce @@ -396,10 +415,12 @@ - type: SolutionContainerManager solutions: food: - maxVol: 6 + maxVol: 14 reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 10 + - ReagentId: Vitamin + Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/apple.rsi - type: Produce @@ -421,10 +442,12 @@ - type: SolutionContainerManager solutions: food: - maxVol: 6 + maxVol: 14 reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 10 + - ReagentId: Vitamin + Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/corn.rsi - type: Produce @@ -459,9 +482,12 @@ - type: SolutionContainerManager solutions: food: + maxVol: 14 reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 10 + - ReagentId: Vitamin + Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/onion.rsi - type: Produce @@ -479,9 +505,12 @@ - type: SolutionContainerManager solutions: food: + maxVol: 14 reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 10 + - ReagentId: Vitamin + Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/onion_red.rsi - type: Produce @@ -568,11 +597,14 @@ - type: SolutionContainerManager solutions: food: + maxVol: 18 reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 4 - ReagentId: CapsaicinOil - Quantity: 1 + Quantity: 10 + - ReagentId: Vitamin + Quantity: 4 - type: Sprite sprite: Objects/Specific/Hydroponics/chili.rsi - type: Produce @@ -653,7 +685,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 24 + maxVol: 26 reagents: - ReagentId: Bicaridine Quantity: 10 @@ -663,6 +695,8 @@ Quantity: 2 - ReagentId: Desoxyephedrine Quantity: 2 + - ReagentId: Vitamin + Quantity: 2 - type: Sprite sprite: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi - type: Produce diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml index 0ae8844532..8781e98595 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml @@ -13,10 +13,10 @@ - type: SolutionContainerManager solutions: food: - maxVol: 26 + maxVol: 10 reagents: - ReagentId: Nutriment - Quantity: 20 + Quantity: 8 - type: Item size: 5 @@ -109,7 +109,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 6 + - ReagentId: Vitamin + Quantity: 2 - type: entity name: double rat kebab @@ -127,7 +129,9 @@ food: reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 12 + - ReagentId: Vitamin + Quantity: 6 - type: entity name: fiesta kebab diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml index 83e4c84a06..a1ff62aadc 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml @@ -60,6 +60,15 @@ - state: bowl - state: alpha-filling color: green + - type: SolutionContainerManager + solutions: + food: + maxvol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 5 # Tastes like creamy peas. # Salad @@ -74,6 +83,17 @@ layers: - state: bowl - state: aesir + - type: SolutionContainerManager + solutions: + food: + maxvol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 6 + - ReagentId: Omnizine + Quantity: 8 # Tastes like leaves - type: entity @@ -86,6 +106,15 @@ layers: - state: bowl - state: herb + - type: SolutionContainerManager + solutions: + food: + maxvol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 2 # Tastes like leaves, apples. - type: entity @@ -98,6 +127,17 @@ layers: - state: bowl - state: valid + - type: SolutionContainerManager + solutions: + food: + maxvol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 2 + - ReagentId: DoctorsDelight + Quantity: 5 # Tastes like leaves, potato, meat, valids. - type: entity @@ -110,6 +150,15 @@ layers: - state: bowl - state: fruit + - type: SolutionContainerManager + solutions: + food: + maxvol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Vitamin + Quantity: 4 # Tastes like fruit. - type: entity @@ -122,6 +171,15 @@ layers: - state: bowl - state: fruit + - type: SolutionContainerManager + solutions: + food: + maxvol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 7 + - ReagentId: Vitamin + Quantity: 4 # Tastes like fruit, the jungle. - type: entity @@ -134,6 +192,15 @@ layers: - state: bowl - state: citrusdelight + - type: SolutionContainerManager + solutions: + food: + maxvol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 7 + - ReagentId: Vitamin + Quantity: 5 # Tastes like sourness, leaves. - type: entity @@ -146,6 +213,17 @@ layers: - state: bowl - state: eden + - type: SolutionContainerManager + solutions: + food: + maxvol: 25 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Omnizine + Quantity: 5 # Tastes like extreme bitterness, hope. # Rice @@ -172,6 +250,15 @@ layers: - state: bowl - state: rice-egg + - type: SolutionContainerManager + solutions: + food: + maxvol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Vitamin + Quantity: 4 # Tastes like rice, egg. Egg =/= Meat -Swept 2020 - type: entity name: rice and pork @@ -183,6 +270,19 @@ layers: - state: bowl - state: rice-pork + - type: SolutionContainerManager + solutions: + food: + maxvol: 40 + reagents: + - ReagentId: Nutriment + Quantity: 18 + - ReagentId: Vitamin + Quantity: 7 + - ReagentId: Dexalin ##This is probably a reference to something but I don't get it + Quantity: 6.5 + - ReagentId: Epinephrine + Quantity: 2 # Tastes like rice, meat. - type: entity @@ -195,6 +295,19 @@ layers: - state: bowl - state: rice-pudding + - type: SolutionContainerManager + solutions: + food: + maxvol: 25 + reagents: + - ReagentId: Nutriment + Quantity: 9 + - ReagentId: Vitamin + Quantity: 3 + - ReagentId: Milk ##This is probably a reference to something but I don't get it + Quantity: 5 + - ReagentId: Glucose + Quantity: 5 # Tastes like rice, sweetness. - type: entity @@ -207,6 +320,17 @@ layers: - state: bowl - state: gumbo + - type: SolutionContainerManager + solutions: + food: + maxvol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 3 + - ReagentId: CapsaicinOil + Quantity: 2 # Tastes like building heat, savory meat, savory vegetables, suppressed rice. # Misc @@ -221,6 +345,17 @@ layers: - state: bowl - state: oatmeal + - type: SolutionContainerManager + solutions: + food: + maxvol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 7 + - ReagentId: Vitamin + Quantity: 2 + - ReagentId: Milk + Quantity: 10 # Tastes like oats, milk. - type: entity @@ -234,6 +369,25 @@ - state: bowl - state: spacelibertyduff # Tastes like jelly, mushroom. +- type: entity + name: amanita jelly + parent: FoodInjectableBase + id: FoodJellyAmanita + description: It's evil, don't touch it! + components: + - type: Sprite + sprite: Objects/Consumable/Food/meals.rsi + state: amanita-jelly + - type: SolutionContainerManager + solutions: + food: + maxvol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Amatoxin + Quantity: 6 +# Tastes like jelly, mushroom. # Soup @@ -247,6 +401,17 @@ layers: - state: bowl - state: meatball + - type: SolutionContainerManager + solutions: + food: + maxvol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 7 + - ReagentId: Vitamin + Quantity: 8 + - ReagentId: Water + Quantity: 10 # Tastes like meatballs. - type: entity @@ -259,6 +424,17 @@ layers: - state: bowl - state: slime + - type: SolutionContainerManager + solutions: + food: + maxvol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 1 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Water + Quantity: 10 # Tastes like slime. - type: entity @@ -271,6 +447,17 @@ layers: - state: bowl - state: tomato + - type: SolutionContainerManager + solutions: + food: + maxvol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Water + Quantity: 10 # Tastes like iron. - type: entity @@ -283,6 +470,17 @@ layers: - state: bowl - state: wingfangchu + - type: SolutionContainerManager + solutions: + food: + maxvol: 30 + reagents: + - ReagentId: Protein + Quantity: 9 + - ReagentId: Soysauce + Quantity: 10 + - ReagentId: Vitamin + Quantity: 7 # Tastes like soy. - type: entity @@ -295,6 +493,17 @@ layers: - state: bowl - state: clowntears + - type: SolutionContainerManager + solutions: + food: + maxvol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Vitamin + Quantity: 9 + - ReagentId: Water + Quantity: 10 # Tastes like a bad joke. - type: entity @@ -307,6 +516,17 @@ layers: - state: bowl - state: vegetable + - type: SolutionContainerManager + solutions: + food: + maxvol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 8 + - ReagentId: Water + Quantity: 10 # Tastes like vegetables, sadness. - type: entity @@ -319,6 +539,21 @@ layers: - state: bowl - state: nettle + - type: SolutionContainerManager + solutions: + food: + maxvol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 8 + - ReagentId: Water + Quantity: 10 + - ReagentId: Omnizine + Quantity: 5 + - ReagentId: Histamine + Quantity: 0.5 # Tastes like nettles. - type: entity @@ -346,11 +581,14 @@ - type: SolutionContainerManager solutions: food: + maxVol: 20 reagents: - ReagentId: Nutriment - Quantity: 30 + Quantity: 8 - ReagentId: CapsaicinOil Quantity: 5 + - ReagentId: Vitamin + Quantity: 4 # Tastes like hot peppers. - type: entity @@ -363,6 +601,15 @@ layers: - state: bowl - state: chili-cold + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 4 # Tastes like tomato, mint. - type: entity @@ -378,11 +625,14 @@ - type: SolutionContainerManager solutions: food: + maxVol: 20 reagents: - ReagentId: Nutriment - Quantity: 30 + Quantity: 6 - ReagentId: CapsaicinOil Quantity: 5 + - ReagentId: Vitamin + Quantity: 4 # Tastes like tomato, hot peppers, clown feet, kind of funny, someone's parents. - type: entity @@ -395,6 +645,19 @@ layers: - state: bowl - state: monkeydelight + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: TableSalt + Quantity: 1 + - ReagentId: Blackpepper + Quantity: 1 # Tastes like the jungle, banana. - type: entity @@ -407,6 +670,17 @@ layers: - state: bowl - state: tomato + - type: SolutionContainerManager + solutions: + food: + maxVol: 22 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Water + Quantity: 10 # Tastes like tomato. - type: entity @@ -419,6 +693,15 @@ layers: - state: bowl - state: eyeball + - type: SolutionContainerManager + solutions: + food: + maxVol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 3 # Tastes like tomato, squirming. - type: entity @@ -432,8 +715,18 @@ - type: Sprite layers: - state: bowl2 - - state: milo + - state: milo ##Why is this misspelled and why does it break if I fix it - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 9 + - ReagentId: Vitamin + Quantity: 3 + - ReagentId: Water + Quantity: 10 # Tastes like miso. - type: entity @@ -446,6 +739,19 @@ layers: - state: bowl - state: mushroom + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Vitamin + Quantity: 6 + - ReagentId: Water + Quantity: 5 + - ReagentId: Milk + Quantity: 5 # Tastes like mushroom. - type: entity @@ -458,6 +764,17 @@ layers: - state: bowl - state: beet + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Vitamin + Quantity: 7 + - ReagentId: Water + Quantity: 10 # Tastes like borsch, bortsch, borstch, borsh, borshch, borscht. - type: entity @@ -470,6 +787,15 @@ layers: - state: bowl - state: redbeet + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Vitamin + Quantity: 6 # Tastes like - type: entity @@ -482,6 +808,15 @@ layers: - state: bowl - state: stew + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 7 + - ReagentId: Vitamin + Quantity: 2 # Tastes like tomato, carrot. - type: entity @@ -494,6 +829,15 @@ layers: - state: bowl - state: sweetpotato + - type: SolutionContainerManager + solutions: + food: + maxVol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Vitamin + Quantity: 5 # Tastes like sweet potato. - type: entity @@ -506,6 +850,15 @@ layers: - state: bowl - state: onion + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 1 + - ReagentId: Vitamin + Quantity: 5 # Tastes like onion, france. - type: entity @@ -518,6 +871,19 @@ layers: - state: bowl - state: bisque + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 6 + - ReagentId: Protein + Quantity: 6 + - ReagentId: Water + Quantity: 5 # Tastes like cream, crab. - type: entity @@ -530,6 +896,15 @@ layers: - state: bowl - state: electron + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Licoxide + Quantity: 6 # Tastes like mushroom, electrons. - type: entity @@ -542,4 +917,15 @@ layers: - state: bowl - state: bungo + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: CapsaicinOil + Quantity: 5 # Tastes like bungo, hot curry, tropical sweetness. diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index a0a9306e12..19e254fcf9 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -65,10 +65,14 @@ waterConsumption: 6 idealHeat: 298 chemicals: + Vitamin: + Min: 1 + Max: 4 + PotencyDivisor: 25 Nutriment: Min: 1 - Max: 20 - PotencyDivisor: 20 + Max: 2 + PotencyDivisor: 50 - type: seed id: carrots @@ -88,8 +92,12 @@ chemicals: Nutriment: Min: 1 - Max: 20 + Max: 5 PotencyDivisor: 20 + Vitamin: + Min: 1 + Max: 4 + PotencyDivisor: 25 - type: seed id: lemon @@ -109,8 +117,12 @@ chemicals: Nutriment: Min: 1 - Max: 20 + Max: 5 PotencyDivisor: 20 + Vitamin: + Min: 1 + Max: 4 + PotencyDivisor: 25 - type: seed id: pineapple @@ -132,6 +144,14 @@ Min: 1 Max: 20 PotencyDivisor: 20 + Water: + Min: 1 + Max: 4 + PotencyDivisor: 25 + Vitamin: + Min: 1 + Max: 2 + PotencyDivisor: 50 - type: seed id: potato @@ -153,6 +173,10 @@ Min: 1 Max: 10 PotencyDivisor: 10 + Vitamin: + Min: 1 + Max: 4 + PotencyDivisor: 25 - type: seed id: sugarcane @@ -220,6 +244,10 @@ Min: 1 Max: 10 PotencyDivisor: 10 + Vitamin: + Min: 1 + Max: 4 + PotencyDivisor: 25 - type: seed id: eggplant @@ -242,6 +270,10 @@ Min: 1 Max: 10 PotencyDivisor: 10 + Vitamin: + Min: 1 + Max: 4 + PotencyDivisor: 25 - type: seed id: apple @@ -263,6 +295,10 @@ Min: 1 Max: 10 PotencyDivisor: 10 + Vitamin: + Min: 1 + Max: 4 + PotencyDivisor: 25 - type: seed id: corn @@ -286,6 +322,10 @@ Min: 1 Max: 10 PotencyDivisor: 10 + Vitamin: + Min: 1 + Max: 4 + PotencyDivisor: 25 - type: seed id: onion @@ -309,6 +349,10 @@ Min: 1 Max: 10 PotencyDivisor: 10 + Vitamin: + Min: 1 + Max: 4 + PotencyDivisor: 25 - type: seed id: onionred @@ -332,6 +376,10 @@ Min: 1 Max: 10 PotencyDivisor: 10 + Vitamin: + Min: 1 + Max: 4 + PotencyDivisor: 25 - type: seed id: chanterelle @@ -469,6 +517,14 @@ Min: 1 Max: 10 PotencyDivisor: 10 + Nutriment: + Min: 1 + Max: 4 + PotencyDivisor: 25 + Vitamin: + Min: 1 + Max: 4 + PotencyDivisor: 25 - type: seed id: poppy @@ -577,6 +633,10 @@ Min: 1 Max: 2 PotencyDivisor: 50 + Vitamin: + Min: 1 + Max: 2 + Potencydivisor: 50 - type: seed id: galaxythistle diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 85385fa138..25963b690f 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -381,6 +381,22 @@ physicalDesc: strong-smelling color: "#FF8CFF" spritePath: doctorsdelightglass.rsi + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:SatiateHunger + factor: -2 + Medicine: + effects: + - !type:HealthChange + damage: + groups: + Burn: -1 + Brute: -1 + Airloss: -1 + Toxin: -1 - type: reagent id: DriestMartini diff --git a/Resources/Prototypes/Reagents/Consumable/Food/food.yml b/Resources/Prototypes/Reagents/Consumable/Food/food.yml index a1e71c3491..6170fbc0ba 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/food.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/food.yml @@ -30,3 +30,40 @@ amount: 2 - !type:PlantAdjustPests amount: 2 + + +- type: reagent + id: Vitamin + name: vitamin + group: Foods + desc: Found in healthy, complete meals. + physicalDesc: chalky + color: "#D3D3D3" + metabolisms: + Food: #This makes it not compete with medicines, a large bonus for something that can heal + effects: + - !type:HealthChange + probability: 0.5 + damage: + groups: + Brute: -0.5 + Burn: -0.5 + - !type:SatiateHunger #Numbers are balanced with this in mind + it helps limit how much healing you can get from food + +- type: reagent + id: Protein + name: protein + group: Foods + desc: Found in certain meals, good for bodily health. + physicalDesc: clumpy + color: "#FFFFE5" + metabolisms: + Food: + effects: + - !type:HealthChange + probability: 0.5 + damage: + groups: + Brute: -0.4 + - !type:SatiateHunger + diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 599ad7ba08..49241a6241 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -61,6 +61,16 @@ # FoodTomato: 4 # FoodEgg: 2 +- type: microwaveMealRecipe + id: RecipeEmpoweredBurger + name: empowered burger recipe + result: FoodBurgerEmpowered + time: 5 + solids: + FoodBreadBun: 1 + SheetPlasma1: 2 + + #Breads & Sandwiches - type: microwaveMealRecipe id: RecipeBread @@ -125,6 +135,15 @@ FoodDough: 1 FoodBanana: 1 +- type: microwaveMealRecipe + id: RecipeMoldyBreadSlice + name: moldy bread slice recipe + result: FoodBreadMoldySlice + time: 5 + solids: + FoodBreadPlainSlice: 1 + FoodFlyAmanita: 1 + #Pizzas - type: microwaveMealRecipe id: RecipeMargheritaPizza @@ -168,6 +187,28 @@ FoodCorn: 1 FoodTomato: 1 +- type: microwaveMealRecipe + id: RecipeDankPizza + name: dank pizza recipe + result: FoodPizzaDank + time: 30 + solids: + FoodDough: 1 + FoodAmbrosiaVulgaris: 3 + FoodCheeseSlice: 1 + FoodTomato: 1 + +- type: microwaveMealRecipe + id: RecipeDonkpocketPizza + name: donk-pocket pizza recipe + result: FoodPizzaDonkpocket + time: 30 + solids: + FoodDough: 1 + FoodDonkpocketWarm: 3 + FoodCheeseSlice: 1 + FoodTomato: 1 + #Italian # - type: microwaveMealRecipe # id: RecipeSpaghetti @@ -297,17 +338,28 @@ FoodCarrot: 1 FoodPotato: 1 -#- type: microwaveMealRecipe -# id: RecipeNettleSoup -# name: nettle soup recipe -# result: FoodNettleSoup -# time: 10 -# reagents: -# Water: 10 -# solids: -# FoodNettle: 1 -# FoodEgg: 1 -# FoodPotato: 1 +- type: microwaveMealRecipe + id: RecipeNettleSoup + name: nettle soup recipe + result: FoodSoupNettle + time: 10 + reagents: + Water: 10 + solids: + Nettle: 1 + FoodEgg: 1 + FoodPotato: 1 + +- type: microwaveMealRecipe + id: RecipeAmanitaJelly + name: amanita jelly recipe + result: FoodJellyAmanita + time: 10 + reagents: + Water: 5 + Vodka: 5 + solids: + FoodFlyAmanita: 3 #Other #- type: microwaveMealRecipe @@ -368,6 +420,15 @@ FoodCakeBatter: 1 # should really be pie pastry or whatever. Good enough. FoodBanana: 3 +- type: microwaveMealRecipe + id: RecipeAmanitaPie + name: amanita pie + result: FoodPieAmanita + time: 15 + solids: + FoodCakeBatter: 1 + FoodFlyAmanita: 1 + #Donks i guess - type: microwaveMealRecipe id: RecipeWarmDonkpocket @@ -478,6 +539,26 @@ FoodMeatCutlet: 1 FoodCorn: 1 +# SALADS: These should be moved out of the microwave as soon as possible +- type: microwaveMealRecipe + id: RecipeHerbSalad + name: herb salad recipe + result: FoodSaladHerb + time: 5 + solids: + FoodAmbrosiaVulgaris: 3 + FoodApple: 1 + +- type: microwaveMealRecipe + id: RecipeValidSalad + name: valid salad recipe + result: FoodSaladValid + time: 5 + solids: + FoodAmbrosiaVulgaris: 3 + FoodPotato: 1 + FoodMeatMeatball: 1 + # NOT ACTUAL FOOD - type: microwaveMealRecipe diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/amanita-jelly.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/amanita-jelly.png new file mode 100644 index 0000000000000000000000000000000000000000..b30e8a9a2d53318271b06a31600f493be899190b GIT binary patch literal 1960 zcmZ`(X*8P&8+}tv)ZSX6%1COjWzz^J$PaB&ZyV?0&+J5%{ zNm+dOR~Orp+eui*Aw==!+u#2?)F0-9;qElh6FyRTT0E|J&nlDO?^gHcPb=H5&wQJa zEZT-`Ba|&#f}yBpL5zGH8TF?If-aEgtnZjKl{9404rfTt38hgHG*@V(&qoVsT2f!X zXEz}m>I1fyER;yC%(FT)Sh$zXg!|-VN8ssj3gx!jAdy5x6xO+0HT>?v3aN`Dq^TH(WEXQ<*V4 zhy#J%Q*M_{%h)!^cy#97K>rNM;t0{!*8BdW;=yff+}a`y*E%wbD$>V5bl-hTkzzV@ z<1RA_x3jVjLfJYci7qW&ygXw6HHsL)e&^vgmPKg~OkX-A3;rw@b`}f7)7;buIQ=oj zT`#lF6pmn&b0`3C3H%@k$jiTcCbEa2EsfdN&v6K!Q{6}!mH+^7Ioe3yA#!1tXzeH9 zEH;G98VRe)8>|{IYbJ#+rc_kdcwJjAY4F#(wBy0Y`A`|fr4eB($oCLO_?ZwV^i*7U z6U*n}tigWi>if^0e#UmQO`g(uGPcPDUJZ%ZM$7RcG*LRQQ~62yNDzg_!qZul&L=Fk ztN%kuRF>E5^#Ut8sl7dC;-iM5A}Tw)$??!m%UxP9etH^SpPR5)>qXHKmyMw7-osu? zs>LnLI83$2yp}@ODUcYqSD%Z;HBU}9@pHbLAWr>el7-4lcqQ-B^Lcf$z}I=usSZCj zjJgzs%gufMHxrNlhy>y(%{9Ob!cCq7CK?*D z?U?Qt)-2atTB_0r9b7@*?R=k0G(UHT)1d2%lCfxtQPZ!j5WPFZ>{3%vEUwYBG2_5Y z=0+z4o|3Y}K-gjkv$MN_I$Lo;N=LgyO|(IY)GPn!w`3s*dqHHEK7W!|PM}1FR0hhk z(OKjto)_B-Z&~=ZL0_=8 zr^%U$>dE6R^0eO25?mSIJ+WXW6?zg()6~}%UjaexaK^2(I-VIO`qY!N8xEPwGx?>4 z_Fq{e>q=i3-%9Gz2I}~729SswVCzCaaLt@hK@ANgNk@cB(5cq)P+wm|$!o5rZ+}5; z-UJ#345Eg3pH;||kudu#y4r3(QYwAdvMeVDrKA}A3zj=~K4o=}@A$i{imPc)Sd}9F z=pEY*lq=cSDlj>SdE#N=mrTg5ZOk_lDpGIAuLq-AW93GtZULv28sYfZ___r$wmUqf zr6q`|B4(1~?d44Q5Rj_77kWLf*8p31_OtBwlIy4aajCpB9ppnZQX-| ze;^SQ$I8fLTL&SfE5>G0=`{o=MRR+B%tfo4P{XvL&=)XpG4_7yBUjw(bln6d7&nk}Te5Ky7&)_OqmO)px*FuO{0^Y zW0)>fnN@gI3JBCA?3+gnx zs}A0@^iZ1w+T7K)@9QwjL&Q{wm&m)3I*jrfgq>OTR_hWM$G<_!Gm6p6K765DJQ{5a zv+?e(MEJUreIg^F#(Lal+b zuPjH1J^Il<^OLj{8f58sGc+F=^YivXf@S%kC}?qMbx$)^Q&q(yFQ{F2>GUSdjsAaq qNIr^_XBz*@t}kE);fcTX>A9N5f&SjifP}LS2hhe=Mzsd+@&5q0^P@ii literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json index c8c0efaa89..2dd0ab1795 100644 --- a/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json @@ -7,6 +7,19 @@ "y": 32 }, "states": [ + { + "name": "amanita-jelly", + "delays": [ + [ + 5, + 0.1, + 0.1, + 0.1, + 0.1, + 1 + ] + ] + }, { "name": "bearsteak", "delays": [