From 42ae963bf4c660be6cc80f0f6ef592a4a3d299d8 Mon Sep 17 00:00:00 2001 From: DisposableCrewmember42 Date: Tue, 10 Sep 2024 19:30:50 +0200 Subject: [PATCH 1/3] feat: blue and purple tomato soup --- .../Entities/Objects/Consumable/Food/soup.yml | 62 ++++++++++++++++++ .../DeltaV/Recipes/Cooking/meal_recipes.yml | 23 +++++++ .../bluepurpletomatosoup.rsi/blue-tomato.png | Bin 0 -> 637 bytes .../Food/bluepurpletomatosoup.rsi/bowl.png | Bin 0 -> 401 bytes .../Food/bluepurpletomatosoup.rsi/meta.json | 20 ++++++ .../purple-tomato.png | Bin 0 -> 673 bytes 6 files changed, 105 insertions(+) create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Food/bluepurpletomatosoup.rsi/blue-tomato.png create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Food/bluepurpletomatosoup.rsi/bowl.png create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Food/bluepurpletomatosoup.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Food/bluepurpletomatosoup.rsi/purple-tomato.png diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml index 6907a2d5741..5af647e5c47 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml @@ -30,3 +30,65 @@ sprite: DeltaV/Objects/Consumable/Food/scrambledeggs.rsi state: scrambled-eggs # Tastes like eggs, butter and salt + +- type: entity + name: blue tomato soup + parent: FoodBowlBase + id: FoodSoupTomatoBlue + description: Smells like tomatoes... and soap? + components: + - type: FlavorProfile + flavors: + - funny + - tomato + - type: Sprite + sprite: DeltaV/Objects/Consumable/Food/bluepurpletomatosoup.rsi + layers: + - state: bowl + - state: blue-tomato + - type: SolutionContainerManager + solutions: + food: + maxVol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: SpaceLube + Quantity: 6 + - ReagentId: Water + Quantity: 3 + - type: Tag + tags: + - Fruit + - Soup + +- type: entity + name: purple tomato soup + parent: FoodBowlBase + id: FoodSoupTomatoPurple + description: Smells like tomatoes, but funky. + components: + - type: FlavorProfile + flavors: + - tingly + - tomato + - type: Sprite + sprite: DeltaV/Objects/Consumable/Food/bluepurpletomatosoup.rsi + layers: + - state: bowl + - state: purple-tomato + - type: SolutionContainerManager + solutions: + food: + maxVol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: SpaceLube + Quantity: 3 + - ReagentId: Water + Quantity: 6 + - type: Tag + tags: + - Fruit + - Soup \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml index 2533bff44bb..01287c1016d 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml @@ -29,3 +29,26 @@ FoodDoughPie: 1 FoodPumpkin: 1 FoodPlateTin: 1 + +- type: microwaveMealRecipe + id: RecipeBlueTomatoSoup + name: blue tomato soup recipe + result: FoodSoupTomatoBlue + time: 10 + reagents: + Water: 10 + solids: + FoodBowlBig: 1 + FoodBlueTomato: 2 + +- type: microwaveMealRecipe + id: RecipePurpleTomatoSoup + name: purple tomato soup recipe + result: FoodSoupTomatoPurple + time: 10 + reagents: + Water: 10 + solids: + FoodBowlBig: 1 + FoodBlueTomato: 1 + FoodTomato: 1 diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Food/bluepurpletomatosoup.rsi/blue-tomato.png b/Resources/Textures/DeltaV/Objects/Consumable/Food/bluepurpletomatosoup.rsi/blue-tomato.png new file mode 100644 index 0000000000000000000000000000000000000000..31c76047e0498b5ad54b2ba304f8baea8d22a6de GIT binary patch literal 637 zcmV-@0)qXCP)EX>4Tx04R}tkv&MmKpe$iQ>9ue3U&~2$WWcyMTzBx-kgE(v zjs;YqL3aJ%fAG6ot1va$N(v=_-WSLD7zYBoK(p>R-^Y&AJOTXAz?I(dR~x|0C+YQ$ z7C8b2w}Ff6j;8DZmpj17lOdb3EBR>(g#z$?M&FbJhHru3TC2DAK29Hi40V;d0S*p< zi6UjMd%U}^ySIPOwEO!3f8;{aT|MnH2Vl^SYJ#aovT-9*K$HR}j{ z5Qn`{Abm4oer-TH9TsLl>^tVQO*l6)uN#`;=?3a|`Qn6O}B-1+YfJx&?jz85kHCEUX==V!4B>FT?X^j~I;Y z{W0ug!KUHVsWS|EIvNZoj_yYhhdBsed^0dGFsN(mGcYhPFi1+tF)%PNFxEX>4Tx04R}tkv&MmKpe$iQ>9ue3U&~2$WWcyMTzBx-kgE(v zjs;YqL3aJ%fAG6ot1va$N(v=_-WSLD7zYBoK(p>R-^Y&AJOTXAz?I(dR~x|0C+YQ$ z7C8b2w}Ff6j;8DZmpj17lOdb3EBR>(g#z$?M&FbJhHru3TC2DAK29Hi40V;d0S*p< zi6UjMd%U}^ySIPOwEO!3Qwqgb7Rp3z6B`nP4~- zk7W6O%H8g6_xta^I}kz$A;g~iFayx3@YYhopO?EH)S()HFAz7IK;5%Wn zrF09j`ohPfS@+U5H1Hw-TstDoV|*vXwM_uhJbo(_P~VC$esy5G*aJ{hHLh*8V|T3y z?iNy1HCdT(e_VSzFz5|z=4Tan(Z{f64zNC%hI}s}gb=!(7|=qpS=3Yv00000NkvXX Hu0mjf!~-L8 literal 0 HcmV?d00001 From 6cf33bf483fff84303314dc80a68cc310e45e621 Mon Sep 17 00:00:00 2001 From: DisposableCrewmember42 Date: Tue, 10 Sep 2024 20:18:45 +0200 Subject: [PATCH 2/3] tweak(bluepurpletomatosoup): incorporate description feedback --- .../DeltaV/Entities/Objects/Consumable/Food/soup.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml index 5af647e5c47..ad03d2194ea 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml @@ -35,7 +35,7 @@ name: blue tomato soup parent: FoodBowlBase id: FoodSoupTomatoBlue - description: Smells like tomatoes... and soap? + description: It's hard to avoid spilling this tomato soup... components: - type: FlavorProfile flavors: @@ -66,7 +66,7 @@ name: purple tomato soup parent: FoodBowlBase id: FoodSoupTomatoPurple - description: Smells like tomatoes, but funky. + description: Do they make purple tomatoes? components: - type: FlavorProfile flavors: From 8a1eb362cc70d8dc5113f620e18afa7702c92309 Mon Sep 17 00:00:00 2001 From: DisposableCrewmember42 Date: Wed, 11 Sep 2024 00:45:42 +0200 Subject: [PATCH 3/3] style: Add newline at end of soup.yml --- .../Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml index ad03d2194ea..d1ad0f8837b 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml @@ -91,4 +91,4 @@ - type: Tag tags: - Fruit - - Soup \ No newline at end of file + - Soup