From b86b0c7fe828fb69cccfd784de26b07bb729ac0c Mon Sep 17 00:00:00 2001 From: Hannah Giovanna Dawson Date: Sat, 2 Aug 2025 19:35:09 +0100 Subject: [PATCH] Berry Delight (#38881) * Berry delight * Uncook the YAML * Move stuff in meal_recipes * BERRY DELIGHT IS INEVITABLE --- .../Locale/en-US/flavors/flavor-profiles.ftl | 1 + .../Random/Food_Drinks/food_baked_single.yml | 1 + .../Random/Food_Drinks/food_baked_whole.yml | 1 + .../Objects/Consumable/Food/Baked/cake.yml | 85 ++++++++++++++++++ Resources/Prototypes/Flavors/flavors.yml | 5 ++ .../Recipes/Cooking/meal_recipes.yml | 12 +++ .../Food/Baked/cake.rsi/berry_delight.png | Bin 0 -> 872 bytes .../Baked/cake.rsi/berry_delight_slice.png | Bin 0 -> 642 bytes .../Consumable/Food/Baked/cake.rsi/meta.json | 8 +- 9 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/berry_delight.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/berry_delight_slice.png diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index bdc0ea858a..f012d83d7e 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -53,6 +53,7 @@ flavor-base-terrible = terrible flavor-base-mindful = mindful flavor-base-chewy = chewy flavor-base-trashy = trashy +flavor-base-motivating = motivating # Complex flavors. Put a flavor here when you want something that's more # specific. diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml index 5d559fa132..7d0f734acc 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml @@ -42,6 +42,7 @@ - FoodCakeChristmasSlice - FoodCakeVanillaSlice - FoodCakeBirthdaySlice + - FoodCakeBerryDelightSlice - FoodCakeCottonSlice - FoodBakedMuffin - FoodBakedMuffinBerry diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml index 719f2bd912..7683f19884 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml @@ -37,6 +37,7 @@ - FoodCakeChristmas - FoodCakeBirthday - FoodCakeVanilla + - FoodCakeBerryDelight - FoodCakeCotton - FoodPieApple - FoodPieBaklava diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml index 5c0a4eb7cf..a1b69a0966 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml @@ -1245,3 +1245,88 @@ Quantity: 2 - type: Item heldPrefix: cotton-slice + +# Motivating + +- type: entity + name: berry delight + parent: FoodCakeBase + id: FoodCakeBerryDelight + description: This is a cake that is approaching. + components: + - type: Sprite + state: berry_delight + - type: FlavorProfile + flavors: + - sweet + - berry + - motivating + - type: SolutionContainerManager + solutions: + food: + maxVol: 55 + reagents: + - ReagentId: Nutriment + Quantity: 40 + - ReagentId: Vitamin + Quantity: 10 + - ReagentId: Milk + Quantity: 10 + - type: SliceableFood + slice: FoodCakeBerryDelightSlice + - type: Tag + tags: + - Cake + - Fruit + - type: Item + inhandVisuals: + left: + - state: plain-inhand-left + - state: alpha-filling-inhand-left + color: red + right: + - state: plain-inhand-right + - state: alpha-filling-inhand-right + color: red + +- type: entity + name: berry delight slice + parent: FoodCakeSliceBase + id: FoodCakeBerryDelightSlice + description: Put a fork in, your hunger in isolation. + components: + - type: Sprite + state: berry_delight_slice + - type: FlavorProfile + flavors: + - sweet + - berry + - motivating + - type: SolutionContainerManager + solutions: + food: + maxVol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 2 + - ReagentId: Milk + Quantity: 2 + - type: Tag + tags: + - Cake + - Fruit + - Slice + - type: Item + inhandVisuals: + left: + - state: alpha-slice-inhand-left + color: white + - state: alpha-slice-filling-inhand-left + color: red + right: + - state: alpha-slice-inhand-right + color: white + - state: alpha-slice-filling-inhand-right + color: red diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index e4348b4efb..8eef7e1cb5 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -1483,3 +1483,8 @@ id: artifactglue flavorType: Complex description: flavor-complex-artifact-glue + +- type: flavor + id: motivating + flavorType: Base + description: flavor-base-motivating diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index baf3e7011c..7e3cca3fa4 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1700,6 +1700,18 @@ FoodSnackRaisins: 1 OrganAnimalHeart: 1 +- type: microwaveMealRecipe + id: RecipeBerryDelight + name: berry delight recipe + result: FoodCakeBerryDelight + time: 5 + group: Cake + solids: + FoodCakePlain: 1 + FoodBerries: 5 + reagents: + Milk: 10 + - type: microwaveMealRecipe id: RecipeBreadDog name: bread dog recipe diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/berry_delight.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/berry_delight.png new file mode 100644 index 0000000000000000000000000000000000000000..765507a014b75bf99849c259621f2fee87bfb270 GIT binary patch literal 872 zcmV-u1DE`XP)Px&B1uF+R9J=Wl`&`=R~*KF@8sMSS&`FNAP;WZV!Bkx)}&LG8$88=ltPyTXDf7R zA%)Nmt&1U0Xdp`q*_t{-!4QZ=+Qh>(X>2GicnQ{GM4;_pfz=?(obA)S_d1;QtUH|? zhYsza4+Qu0{_p+1_q})TV4#5p`i~`Eruff4YP!3fot(m7tn}2qc533t^B!851Sa7f z`HL0Pepy339sQvB{0IPBTg@2UYu0f`iZL@CWilCrun5C;Uo+N=;Q9PWDt!CuWDlG~ zG60q(ux%ULwo@6#z+rKx!B@VRGw|)Jld%LcnGCjVn*;!~*86P{V+|!iok2o?Wn~D0 zJ(P;-hkpANfD?dwW6{8K`_C)aPjNaipVkVcG+IZ$q08pO@c8EaRpH^{4 z4z?|~x`Ycb6Safgmg&1Y?XsZ`n6Z2L{Wr$-)ENhW4Moh%zflMJ``R8;XB?(0HN)-s z7~P(l&>ITIET}x)<7~-cY=5KPyL~i69pG5kHPC5y!&43PGn1SsX)dYC(`dCD3a;I+ y9sP5BnAY!ou0Q+u2Rhr7RKHaYG|)i*YyAUx^p~N9+-08t0000Px%JV``BR9J=Wl|e{TaU91#K9`OV6}D``$mkH#sXE9uI>dqwAtGcHL>R^noy87L z4`J<)bql-*VaFC8szZn&YvC&I7L~fq)N)VT+_Lwk`~N$b(<0(OGwAR>@Zj-&|KIQX zeZT+j{~lOaSXk@=;d+N$YCIyt^$wXyFUU-KL8|6zyCLqc*}vobzcTQv_~yNw>ixF{ zGU)}mT|C!$`lq;=7s|D4r3lX^r;2;KUA*ef2mr4`2k-$5eBNCHo5I!Ad$$r_J_Df2 zbE^2v=f8*XCdgxZnX&<;m5YmU2~b&4`Nws0^E#rXjkO0u96Rn&s;$%kUC#pGbpAeW z8U?bsRlcqo#8wt*GV>~BL3IdSw}SvAk|`3&6uO=*UI1lU0ev}xJb#haiRX-VUs5)p z)PWC?w-7mtbI=38>V;Qmj~*6HeKSl9a}7H%KmSEpT-iXx+kp9Wf}^oXY6dd^O#4sb z4>x09-#8d^ff%l_VeVgUre`dnJcUYI(9#=10QrI>Cj^m|6m|Am;_c&1#wMBW7{`>7 znRrT7w}?^)X5u>Mq9X_?(AqQ(0#9xRX^c)`b4c8K?#N16MfQP{F=(5E9I5cejez%6SpG%B}H_ zCA~eWA0mJ*pIa^qaQv8>bty^9G8`Jjrt^3YRnWf!13PB0uU(#S)yYn;TXy-}rT5;# c!s377JJ)XLH#R&t@&Et;07*qoM6N<$f)h<7g#Z8m literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json index e00bbdeeea..c8d773339d 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, inhands by mubururu_ (github), cotton cake sprites by DispenserG0inUp", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, inhands by mubururu_ (github), cotton cake sprites by DispenserG0inUp, berry delighht sprites by FairlySadPanda (Github)", "size": { "x": 32, "y": 32 @@ -330,6 +330,12 @@ { "name": "cotton-slice-inhand-right", "directions": 4 + }, + { + "name": "berry_delight" + }, + { + "name": "berry_delight_slice" } ] }