From 91e03f9d12413b722c73844ceb823c0012a8a6e0 Mon Sep 17 00:00:00 2001 From: lapatison Date: Mon, 3 Apr 2023 15:36:29 +0300 Subject: [PATCH 1/6] recipe --- .../Recipes/Cooking/meal_recipes.yml | 114 ++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index a4c4364003710d..207671a730924d 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -511,6 +511,120 @@ solids: FoodFlyAmanita: 3 +- type: microwaveMealRecipe + id: RecipeOnionSoup + name: onion soup recipe + result: FoodSoupOnion + time: 10 + reagents: + Water: 10 + solids: + FoodBowlBig: 1 + FoodOnionSlice: 5 + FoodCheeseSlice: 1 + +- type: microwaveMealRecipe + id: RecipeMushroomSoup + name: mushroom soup recipe + result: FoodSoupMushroom + time: 10 + reagents: + Water: 5 + Milk: 5 + solids: + FoodBowlBig: 1 + FoodMushroom: 2 + +- type: microwaveMealRecipe + id: RecipeStewSoup + name: stew recipe + result: FoodSoupStew + time: 10 + reagents: + Water: 10 + solids: + FoodBowlBig: 1 + FoodMeatCutlet: 3 + FoodTomato: 1 + FoodPotato: 1 + FoodCarrot: 1 + FoodEggplant: 1 + FoodMushroom: 1 + +- type: microwaveMealRecipe + id: RecipeTomatoSoup + name: tomato soup recipe + result: FoodSoupTomato + time: 10 + reagents: + Water: 10 + solids: + FoodBowlBig: 1 + FoodTomato: 2 + +- type: microwaveMealRecipe + id: RecipeTomatoBloodSoup + name: tomato blood soup recipe + result: FoodSoupTomatoBlood + time: 10 + reagents: + Blood: 10 + solids: + FoodBowlBig: 1 + FoodTomato: 2 + #todo Replace with blood tomato + +- type: microwaveMealRecipe + id: RecipeWingFangChuSoup + name: wing fang chu recipe + result: FoodSoupWingFangChu + time: 10 + reagents: + Soysauce: 5 + solids: + FoodBowlBig: 1 + FoodMeatXenoCutlet: 2 + +- type: microwaveMealRecipe + id: RecipeVegetableSoup + name: vegetable soup recipe + result: FoodSoupVegetable + time: 10 + reagents: + Water: 5 + solids: + FoodBowlBig: 1 + FoodCorn: 1 + FoodCarrot: 1 + FoodPotato: 1 + FoodEggplant: 1 + +- type: microwaveMealRecipe + id: RecipeClownTearsSoup + name: clown tears soup recipe + result: FoodSoupClown + time: 10 + reagents: + Water: 10 + solids: + FoodBowlBig: 1 + FoodBanana: 1 + ShardGlass: 1 + +- type: microwaveMealRecipe + id: RecipeMonkeysDelightSoup + name: monkeys delight recipe + result: FoodSoupMonkey + time: 10 + reagents: + Flour: 5 + TableSalt: 1 + Blackpepper: 1 + solids: + FoodBowlBig: 1 + FoodBanana: 1 + MonkeyCube: 1 + #Other - type: microwaveMealRecipe From 2d203cf7a6722cb70fd90be9f4678bbbc6aa9660 Mon Sep 17 00:00:00 2001 From: lapatison Date: Mon, 3 Apr 2023 18:00:37 +0300 Subject: [PATCH 2/6] flavors and recipes --- .../Entities/Objects/Consumable/Food/soup.yml | 150 ++++++++++++------ .../Recipes/Cooking/meal_recipes.yml | 12 ++ 2 files changed, 115 insertions(+), 47 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml index 91f3dac564f291..376115a6e0cd61 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml @@ -56,6 +56,7 @@ components: - type: FlavorProfile flavors: + - creamy - peas - type: Sprite sprite: Objects/Consumable/Food/bowl.rsi @@ -72,7 +73,6 @@ Quantity: 8 - ReagentId: Vitamin Quantity: 5 -# Tastes like creamy peas. # Salad @@ -100,7 +100,6 @@ Quantity: 6 - ReagentId: Omnizine Quantity: 8 -# Tastes like leaves - type: entity name: herb salad @@ -125,7 +124,6 @@ Quantity: 8 - ReagentId: Vitamin Quantity: 2 -# Tastes like leaves, apples. - type: entity name: valid salad @@ -154,7 +152,6 @@ Quantity: 2 - ReagentId: DoctorsDelight Quantity: 5 -# Tastes like leaves, potato, meat, valids. - type: entity name: coleslaw @@ -182,7 +179,6 @@ Quantity: 2 - ReagentId: Allicin Quantity: 3 -# Tastes like cabbage, onion, sour. - type: entity name: caesar salad @@ -209,7 +205,6 @@ Quantity: 8 - ReagentId: Vitamin Quantity: 6 -# Tastes like cabbage, onion, croutons, cheese. - type: entity name: kimchi salad @@ -237,7 +232,6 @@ Quantity: 2 - ReagentId: Allicin Quantity: 2 -# Tastes like spicy cabbage, carrots. - type: entity name: fruit salad @@ -261,7 +255,6 @@ Quantity: 2 - ReagentId: Vitamin Quantity: 4 -# Tastes like fruit. - type: entity name: jungle salad @@ -272,6 +265,7 @@ - type: FlavorProfile flavors: - fruity + - jungle - type: Sprite layers: - state: bowl @@ -285,7 +279,6 @@ Quantity: 7 - ReagentId: Vitamin Quantity: 4 -# Tastes like fruit, the jungle. - type: entity name: citrus salad @@ -310,7 +303,6 @@ Quantity: 18 - ReagentId: Vitamin Quantity: 15 -# Tastes like sourness, leaves. - type: entity name: salad of eden @@ -321,6 +313,7 @@ - type: FlavorProfile flavors: - bitter + - hope - type: Sprite layers: - state: bowl @@ -336,7 +329,6 @@ Quantity: 5 - ReagentId: Omnizine Quantity: 5 -# Tastes like extreme bitterness, hope. # Rice @@ -353,7 +345,6 @@ layers: - state: bowl - state: rice -# Tastes like rice. - type: entity name: egg-fried rice @@ -378,7 +369,8 @@ Quantity: 4 - ReagentId: Vitamin Quantity: 4 -# Tastes like rice, egg. Egg =/= Meat -Swept 2020 +# Egg =/= Meat -Swept 2020 + - type: entity name: rice and pork parent: FoodBowlBase @@ -406,7 +398,6 @@ Quantity: 6.5 - ReagentId: Epinephrine Quantity: 2 -# Tastes like rice, meat. - type: entity name: rice pudding @@ -435,7 +426,6 @@ Quantity: 5 - ReagentId: Sugar Quantity: 5 -# Tastes like rice, sweetness. - type: entity name: black-eyed gumbo @@ -464,7 +454,6 @@ Quantity: 3 - ReagentId: CapsaicinOil Quantity: 2 -# Tastes like building heat, savory meat, savory vegetables, suppressed rice. # Misc @@ -477,6 +466,7 @@ - type: FlavorProfile flavors: - oats + - milk - type: Sprite layers: - state: bowl @@ -492,19 +482,22 @@ Quantity: 2 - ReagentId: Milk Quantity: 10 -# Tastes like oats, milk. - type: entity name: space liberty duff parent: FoodBowlBase id: FoodJellyDuff + - type: FlavorProfile + flavors: + - jelly + - mushrooms description: Jello gelatin, from Alfred Hubbard's cookbook. components: - type: Sprite layers: - state: bowl - state: spacelibertyduff -# Tastes like jelly, mushroom. + - type: entity name: amanita jelly parent: FoodInjectableBase @@ -527,7 +520,6 @@ Quantity: 6 - ReagentId: Amatoxin Quantity: 6 -# Tastes like jelly, mushroom. # Soup @@ -537,6 +529,9 @@ id: FoodSoupMeatball description: You've got balls kid, BALLS! components: + - type: FlavorProfile + flavors: + - meatballs - type: Sprite layers: - state: bowl @@ -552,7 +547,6 @@ Quantity: 8 - ReagentId: Water Quantity: 10 -# Tastes like meatballs. - type: entity name: slime soup @@ -560,6 +554,9 @@ id: FoodSoupSlime description: If no water is available, you may substitute tears. components: + - type: FlavorProfile + flavors: + - slimy - type: Sprite layers: - state: bowl @@ -575,7 +572,6 @@ Quantity: 5 - ReagentId: Water Quantity: 10 -# Tastes like slime. - type: entity name: tomato soup @@ -583,6 +579,10 @@ id: FoodSoupTomatoBlood description: Smells like copper... is that a bone? components: + - type: FlavorProfile + flavors: + - metallic + - tomato - type: Sprite layers: - state: bowl @@ -594,11 +594,10 @@ reagents: - ReagentId: Nutriment Quantity: 3 - - ReagentId: Vitamin - Quantity: 5 - - ReagentId: Water + - ReagentId: Iron Quantity: 10 -# Tastes like iron. + - ReagentId: Blood + Quantity: 5 - type: entity name: wing fang chu @@ -606,6 +605,10 @@ id: FoodSoupWingFangChu description: A savory dish of alien wing wang in soy. components: + - type: FlavorProfile + flavors: + - meaty + - salty - type: Sprite layers: - state: bowl @@ -621,7 +624,6 @@ Quantity: 10 - ReagentId: Vitamin Quantity: 7 -# Tastes like soy. - type: entity name: clown's tears @@ -629,6 +631,9 @@ id: FoodSoupClown description: Not very funny. components: + - type: FlavorProfile + flavors: + - bad-joke - type: Sprite layers: - state: bowl @@ -644,7 +649,6 @@ Quantity: 9 - ReagentId: Water Quantity: 10 -# Tastes like a bad joke. - type: entity name: vegetable soup @@ -652,6 +656,10 @@ id: FoodSoupVegetable description: A true vegan meal. components: + - type: FlavorProfile + flavors: + - vegetables + - sadness - type: Sprite layers: - state: bowl @@ -664,10 +672,11 @@ - ReagentId: Nutriment Quantity: 5 - ReagentId: Vitamin - Quantity: 8 + Quantity: 7 - ReagentId: Water Quantity: 10 -# Tastes like vegetables, sadness. + - ReagentId: Oculine + Quantity: 1 - type: entity name: nettle soup @@ -675,6 +684,9 @@ id: FoodSoupNettle description: To think, the botanist would've beat you to death with one of these. components: + - type: FlavorProfile + flavors: + - nettles - type: Sprite layers: - state: bowl @@ -694,7 +706,6 @@ Quantity: 5 - ReagentId: Histamine Quantity: 0.5 -# Tastes like nettles. - type: entity name: mystery soup @@ -702,11 +713,13 @@ id: FoodSoupMystery description: The mystery is, why aren't you eating it? components: + - type: FlavorProfile + flavors: + - chaos - type: Sprite layers: - state: bowl - state: mystery -# Tastes like chaos. - type: entity name: bowl of hot chili @@ -714,6 +727,9 @@ id: FoodSoupChiliHot description: A Texan five-alarm chili! components: + - type: FlavorProfile + flavors: + - spicy - type: Sprite layers: - state: bowl @@ -731,7 +747,6 @@ Quantity: 4 - ReagentId: Allicin Quantity: 3 -# Tastes like hot peppers. - type: entity name: cold chili @@ -739,6 +754,10 @@ id: FoodSoupChiliCold description: This slush is barely a liquid! components: + - type: FlavorProfile + flavors: + - minty + - tomato - type: Sprite layers: - state: bowl @@ -752,7 +771,6 @@ Quantity: 8 - ReagentId: Vitamin Quantity: 4 -# Tastes like tomato, mint. - type: entity name: chili con carnival @@ -760,6 +778,12 @@ id: FoodSoupChiliClown description: A delicious stew of meat, chilies, and salty, salty clown tears. components: + - type: FlavorProfile + flavors: + - spicy + - tomato + - bad-joke + - parents - type: Sprite layers: - state: bowl @@ -777,7 +801,6 @@ Quantity: 4 - ReagentId: Allicin Quantity: 3 -# Tastes like tomato, hot peppers, clown feet, kind of funny, someone's parents. - type: entity name: monkey's delight @@ -785,6 +808,10 @@ id: FoodSoupMonkey description: A delicious soup with hunks of monkey meat simmered to perfection, in a broth that tastes faintly of bananas. components: + - type: FlavorProfile + flavors: + - jungle + - banana - type: Sprite layers: - state: bowl @@ -802,7 +829,6 @@ Quantity: 1 - ReagentId: Blackpepper Quantity: 1 -# Tastes like the jungle, banana. - type: entity name: tomato soup @@ -810,6 +836,9 @@ id: FoodSoupTomato description: Drinking this feels like being a vampire! A tomato vampire... components: + - type: FlavorProfile + flavors: + - tomato - type: Sprite layers: - state: bowl @@ -825,7 +854,6 @@ Quantity: 5 - ReagentId: Water Quantity: 10 -# Tastes like tomato. - type: entity name: eyeball soup @@ -833,6 +861,10 @@ id: FoodSoupEyeball description: It's looking back at you... components: + - type: FlavorProfile + flavors: + - tomato + - squirming - type: Sprite layers: - state: bowl @@ -846,7 +878,6 @@ Quantity: 5 - ReagentId: Vitamin Quantity: 3 -# Tastes like tomato, squirming. - type: entity name: miso soup @@ -854,12 +885,16 @@ id: FoodSoupMiso description: Salty, fishy soup, best had with ramen. components: + - type: FlavorProfile + flavors: + - miso - type: Food trash: FoodBowlFancy - type: Sprite layers: - state: bowl2 - - state: milo ##Why is this misspelled and why does it break if I fix it + - state: miso + #rip milo - type: SolutionContainerManager solutions: food: @@ -871,7 +906,6 @@ Quantity: 3 - ReagentId: Water Quantity: 10 -# Tastes like miso. - type: entity name: mushroom soup @@ -879,6 +913,9 @@ id: FoodSoupMushroom description: A delicious and hearty mushroom soup. components: + - type: FlavorProfile + flavors: + - mushroom - type: Sprite layers: - state: bowl @@ -896,7 +933,6 @@ Quantity: 5 - ReagentId: Milk Quantity: 5 -# Tastes like mushroom. - type: entity name: beet soup @@ -940,7 +976,7 @@ Quantity: 4 - ReagentId: Vitamin Quantity: 6 -# Tastes like +# Tastes like beet. - type: entity name: stew @@ -948,6 +984,11 @@ id: FoodSoupStew description: A nice and warm stew. Healthy and strong. components: + - type: FlavorProfile + flavors: + - meaty + - tomato + - carrot - type: Sprite layers: - state: bowl @@ -958,10 +999,11 @@ maxVol: 15 reagents: - ReagentId: Nutriment - Quantity: 7 + Quantity: 15 + - ReagentId: Protein + Quantity: 5 - ReagentId: Vitamin Quantity: 2 -# Tastes like tomato, carrot. - type: entity name: sweet potato soup @@ -969,6 +1011,9 @@ id: FoodSoupPotato description: Delicious sweet potato in soup form. components: + - type: FlavorProfile + flavors: + - sweet - type: Sprite layers: - state: bowl @@ -990,6 +1035,9 @@ id: FoodSoupOnion description: Good enough to make a grown mime cry. components: + - type: FlavorProfile + flavors: + - onion - type: Sprite layers: - state: bowl @@ -1005,7 +1053,6 @@ Quantity: 5 - ReagentId: Allicin Quantity: 5 -# Tastes like onion, france. - type: entity name: bisque @@ -1013,6 +1060,9 @@ id: FoodSoupBisque description: A classic entrée from Space France. components: + - type: FlavorProfile + flavors: + - creamy - type: Sprite layers: - state: bowl @@ -1030,7 +1080,7 @@ Quantity: 6 - ReagentId: Water Quantity: 5 -# Tastes like cream, crab. +# Tastes like crab. - type: entity name: electron soup @@ -1038,6 +1088,10 @@ id: FoodSoupElectron description: A gastronomic curiosity of ethereal origin. components: + - type: FlavorProfile + flavors: + - mushrooms + - electrons - type: Sprite layers: - state: bowl @@ -1051,7 +1105,6 @@ Quantity: 3 - ReagentId: Licoxide Quantity: 6 -# Tastes like mushroom, electrons. - type: entity name: bungo curry @@ -1059,6 +1112,9 @@ id: FoodSoupBungo description: A spicy vegetable curry made with the humble bungo fruit, Exotic! components: + - type: FlavorProfile + flavors: + - jungle - type: Sprite layers: - state: bowl @@ -1074,4 +1130,4 @@ Quantity: 5 - ReagentId: CapsaicinOil Quantity: 5 -# Tastes like bungo, hot curry, tropical sweetness. +# Tastes like bungo, hot curry. diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 207671a730924d..67239d12ec298d 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -585,6 +585,17 @@ FoodBowlBig: 1 FoodMeatXenoCutlet: 2 +- type: microwaveMealRecipe + id: RecipeWingFangChuSoup + name: wing fang chu recipe + result: FoodSoupWingFangChu + time: 10 + reagents: + Soysauce: 5 + solids: + FoodBowlBig: 1 + FoodMeatSpider: 2 + - type: microwaveMealRecipe id: RecipeVegetableSoup name: vegetable soup recipe @@ -610,6 +621,7 @@ FoodBowlBig: 1 FoodBanana: 1 ShardGlass: 1 + #idk probably replace shard with someting bananium when #14663 merged - type: microwaveMealRecipe id: RecipeMonkeysDelightSoup From eeb36567674ed30da9c3a27a9b306352ea3589a6 Mon Sep 17 00:00:00 2001 From: lapatison Date: Mon, 3 Apr 2023 18:18:40 +0300 Subject: [PATCH 3/6] flavors2 --- .../Locale/en-US/flavors/flavor-profiles.ftl | 14 +++- Resources/Prototypes/Flavors/flavors.yml | 65 +++++++++++++++++++ 2 files changed, 78 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 15ef40d3786266..d23babc3f18e3e 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -78,8 +78,8 @@ flavor-complex-ice-cream = like ice cream flavor-complex-dough = like dough flavor-complex-sweet-dough = like sweet dough flavor-complex-tofu = like tofu +flavor-complex-miso = like miso flavor-complex-muffin = like a muffin - flavor-complex-peas = like peas flavor-complex-pineapple = like pineapple flavor-complex-onion = like onion @@ -98,6 +98,11 @@ flavor-complex-orange = like oranges flavor-complex-watermelon = like watermelon flavor-complex-garlic = like garlic flavor-complex-grape = like grapes +flavor-complex-meatballs = like meatballs +flavor-complex-nettles = like nettles +flavor-complex-jungle = like jungle +flavor-complex-vegetables = like vegetables +# use it when there multiple types of veggies ## Complex foodstuffs (cooked foods, joke flavors, etc) @@ -118,9 +123,16 @@ flavor-complex-boritos = like gaming flavor-complex-nachos = like nachos flavor-complex-donk = like cheap pizza flavor-complex-copypasta = like a repetitive joke +flavor-complex-bad-joke = like a bad joke flavor-complex-memory-leek = like a fork bomb flavor-complex-gunpowder = like gunpowder flavor-complex-validhunting = like validhunting +flavor-complex-sadness = like sadness +flavor-complex-hope = like hope +flavor-complex-chaos = like chaos +flavor-complex-squirming = like squirming +flavor-complex-electrons = like electrons +flavor-complex-parents = like someone's parents # Drink-specific flavors. diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index c820b9f01ad237..9c6ae81105d1a0 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -673,3 +673,68 @@ id: bottledlightning flavorType: Complex description: flavor-complex-bottledlightning + +- type: flavor + id: bad-joke + flavorType: Complex + description: flavor-complex-bad-joke + +- type: flavor + id: vegetables + flavorType: Complex + description: flavor-complex-vegetables + +- type: flavor + id: sadness + flavorType: Complex + description: flavor-complex-sadness + +- type: flavor + id: nettles + flavorType: Complex + description: flavor-complex-nettles + +- type: flavor + id: parents + flavorType: Complex + description: flavor-complex-parents + +- type: flavor + id: jungle + flavorType: Complex + description: flavor-complex-jungle + +- type: flavor + id: squirming + flavorType: Complex + description: flavor-complex-squirming + +- type: flavor + id: miso + flavorType: Complex + description: flavor-complex-miso + +- type: flavor + id: electrons + flavorType: Complex + description: flavor-complex-electrons + +- type: flavor + id: bottledlightning + flavorType: Complex + description: flavor-complex-bottledlightning + +- type: flavor + id: meatballs + flavorType: Complex + description: flavor-complex-meatballs + +- type: flavor + id: hope + flavorType: Complex + description: flavor-complex-hope + +- type: flavor + id: chaos + flavorType: Complex + description: flavor-complex-chaos From b8dcdadfcc950d3899ee17443c77d4c7c3530de4 Mon Sep 17 00:00:00 2001 From: lapatison Date: Mon, 3 Apr 2023 18:25:37 +0300 Subject: [PATCH 4/6] fixes --- .../Prototypes/Recipes/Cooking/meal_recipes.yml | 4 ++-- .../Objects/Consumable/Food/bowl.rsi/meta.json | 2 +- .../Consumable/Food/bowl.rsi/{milo.png => miso.png} | Bin 3 files changed, 3 insertions(+), 3 deletions(-) rename Resources/Textures/Objects/Consumable/Food/bowl.rsi/{milo.png => miso.png} (100%) diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 67239d12ec298d..d73c1fafd65b6b 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -586,7 +586,7 @@ FoodMeatXenoCutlet: 2 - type: microwaveMealRecipe - id: RecipeWingFangChuSoup + id: RecipeWingFangChuSoupSpider name: wing fang chu recipe result: FoodSoupWingFangChu time: 10 @@ -662,7 +662,7 @@ - type: microwaveMealRecipe id: RecipeMisoColaSoup - name: salty sweet milocola soup recipe + name: salty sweet misocola soup recipe result: DisgustingSweptSoup time: 15 reagents: diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json index 73cd2fe641348a..509fedb6fef0dd 100644 --- a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json @@ -86,7 +86,7 @@ "name": "meatball" }, { - "name": "milo" + "name": "miso" }, { "name": "monkeydelight" diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/milo.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/miso.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/bowl.rsi/milo.png rename to Resources/Textures/Objects/Consumable/Food/bowl.rsi/miso.png From c752b552405937ede936cc632db413cbc8b2c537 Mon Sep 17 00:00:00 2001 From: lapatison Date: Mon, 3 Apr 2023 18:29:29 +0300 Subject: [PATCH 5/6] fixfix --- .../Prototypes/Entities/Objects/Consumable/Food/soup.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml index 376115a6e0cd61..467f10d97a637f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml @@ -487,12 +487,12 @@ name: space liberty duff parent: FoodBowlBase id: FoodJellyDuff + description: Jello gelatin, from Alfred Hubbard's cookbook. + components: - type: FlavorProfile flavors: - jelly - mushrooms - description: Jello gelatin, from Alfred Hubbard's cookbook. - components: - type: Sprite layers: - state: bowl From e9983364be9259fff12ac29b795eec78b35de419 Mon Sep 17 00:00:00 2001 From: lapatison <100279397+lapatison@users.noreply.github.com> Date: Mon, 3 Apr 2023 19:42:47 +0300 Subject: [PATCH 6/6] Update Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml Co-authored-by: Moony --- Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml index 467f10d97a637f..0b5a0a93d57de6 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml @@ -369,7 +369,6 @@ Quantity: 4 - ReagentId: Vitamin Quantity: 4 -# Egg =/= Meat -Swept 2020 - type: entity name: rice and pork