From 9b0a17174397893cfd2ad5b988e79d72f0f113f2 Mon Sep 17 00:00:00 2001 From: Disp-Dev <91643998+Disp-Dev@users.noreply.github.com> Date: Thu, 31 Jul 2025 06:51:21 +0800 Subject: [PATCH] New recipe: Cotton Cakes (#39222) * add moth edible cotton cakes * oh fuck i accidentally changed the sln file * inhand sprite fix --------- Co-authored-by: DispenserDev --- .../Random/Food_Drinks/food_baked_single.yml | 1 + .../Random/Food_Drinks/food_baked_whole.yml | 1 + .../Objects/Consumable/Food/Baked/cake.yml | 55 ++++++++++++++++++ .../Recipes/Cooking/meal_recipes.yml | 12 ++++ .../Baked/cake.rsi/cotton-inhand-left.png | Bin 0 -> 579 bytes .../Baked/cake.rsi/cotton-inhand-right.png | Bin 0 -> 579 bytes .../cake.rsi/cotton-slice-inhand-left.png | Bin 0 -> 504 bytes .../cake.rsi/cotton-slice-inhand-right.png | Bin 0 -> 508 bytes .../Food/Baked/cake.rsi/cotton-slice.png | Bin 0 -> 526 bytes .../Consumable/Food/Baked/cake.rsi/cotton.png | Bin 0 -> 567 bytes .../Consumable/Food/Baked/cake.rsi/meta.json | 24 +++++++- 11 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton.png 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 88506d33a6..5d559fa132 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 + - FoodCakeCottonSlice - FoodBakedMuffin - FoodBakedMuffinBerry - FoodBakedMuffinCherry 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 7e580db980..719f2bd912 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 + - FoodCakeCotton - FoodPieApple - FoodPieBaklava - FoodPieBananaCream diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml index eb6b71212a..5c0a4eb7cf 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml @@ -1190,3 +1190,58 @@ Burger: SuppermatterBurger - type: Item heldPrefix: suppermatter-shard + +- type: entity + name: cotton cake + parent: FoodCakeBase + id: FoodCakeCotton + description: A cake with a fiber frosting and a wad of cotton on top. + components: + - type: Sprite + state: cotton + - type: SliceableFood + slice: FoodCakeCottonSlice + - type: Tag + tags: + - Cake + - ClothMade + - type: SolutionContainerManager + solutions: + food: + maxVol: 55 + reagents: + - ReagentId: Nutriment + Quantity: 30 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Fiber + Quantity: 10 + - type: Item + heldPrefix: cotton + +- type: entity + name: slice of cotton cake + parent: FoodCakeSliceBase + id: FoodCakeCottonSlice + description: A slice of cotton cake. You can just lick the frosting, it's fine. + components: + - type: Sprite + state: cotton-slice + - type: Tag + tags: + - Cake + - ClothMade + - Slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 1 + - ReagentId: Fiber + Quantity: 2 + - type: Item + heldPrefix: cotton-slice diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index d576d5789e..baf3e7011c 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -2435,3 +2435,15 @@ MobMothroach: 1 OrganAnimalHeart: 1 MoproachShoes: 1 + +- type: microwaveMealRecipe + id: RecipeCottonCake + name: cotton cake recipe + result: FoodCakeCotton + time: 5 + group: Cake + reagents: + Fiber: 10 + solids: + FoodCakePlain: 1 + \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..623d36ba2889e282f65c9f7bbecb9653c014a001 GIT binary patch literal 579 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uwo;r2v|Bf9$e*F0V?%ktDkN(e}|Nq1Zpyc@}60?C6M@f)h@P7zk zxYxWl5-7%5;1OBOz`%DHgc*L5h);ff2~^0%B<>8{`WOMrN=$$RCD`Obh}*Itqw0 z+gZTkSwJ=jES}83@B*j^Mx$BE0F;`*&cFgxX<%e*z__0NEhG1T>ck ztTM>b0?2~uGBhv%$?lT3aQ@k&*9l^Jx;TbJxWAp|&BbEK!D?#%zW%Y>2K8Bc4zwhe zUHhcyx=DMI{KC>5s;rs;K_B!P1rN$H^3C+pY_;%F3c6!(lQm}L)=Mk=n8R(eAHGQy z{}T9>yR^ijT$pfwTp~p~rp= co{n5o*v0E}Ly8Yh2?P1a)78&qol`;+06YVv+W-In literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..117e4559b0d83e6e3f719c48ce7c682a507d4600 GIT binary patch literal 579 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uwo;r2v|Bf9$e*F0V?%ktDkN(e}|Nq1Zpyc@}60?C6M@f)h@P7zk zxYxWl5-7%5;1OBOz`%DHgc*L5h);ff2~^0%B<>8{`WOMrN=$$RCD`Obh}*Itqw0 z+gZTkSwJ=jES}83@B*j^Mx$BE0F;`*&cFgxX<%e*z__0NEhG1T>ck ztTM>b0?2~uGBhv%$?lT3aQ@k&*9l^Jx;TbJxWAp|$#>X*hdK48-@pHln>I0-l(2?m z_Rk7FaG_a8{M1k7LypsgrZ7x-(9a}T`7CPrtQD)g9`9!CYK}8=d~MXm_cC6Jjj!q^ z%jXvrt#v-@j>SAx&G2(7nEIDk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~O1^9%x{`m3Z(W6KI-@W@kfBydyCxF89mNHETQfwtbe!>4ifMN6gCHsLQ zoCO|{#S9F5hd`K7RKu$QC@4|l8c`CQpH@AC&ooa@Ed~xChm}E!k(GfF$npYWX($`ydJRTqus9QtZOF*PAONJJfHi7)^F literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..883083e177f5b07f74683e2707bd5f7bef67409b GIT binary patch literal 508 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~O1^9%x{(txG(W6H{e*E}<;>7>?^MS(b-g!kpimfEbFZe$QFl^qxWIs@Z zv%n*=n1O-sFbFdq&tH)O6qG1&jVKAuPb(=;EJ|evNX*PD(erZ+Q83jr)U%Mze6<3o zW?O26XPT#{76S*6!^$AV$jZP7WO)IxG?Wc;y#^yQSRCYjLq;YB0U#X(#F_0ZVDT&< z8w3_lW?*;$R0N~ZEM)*nO<-qW0je}GGB#jb05KJ0BkKZ)NmGDq5MTnD%LG;#WN86p zL3J4#7=UDV$y+%8?9uB4GOImZ977`9-(GX%Yf#{ExtR3&@A{my)TKO)FOH@B^J1KT zk@v<=qu1KmY%`cmGeE_`hQZP%>w6uL6+bC<*cl{tp2R z_nP-c0>wBBJR*x382Ao@Fyrz36)8YLi4xa{lHmNblJdl&REB`W%)AmkKi3ciQ$0gH z3+c>PD}ZXYrABzBd3tIwZ~!^13{s4&42(dQ7Z6KB*&ttNFfxP1LH;mgWMU8i(osO1 z+0FtM&jPYRVDV%Ih8I9ZFdEHL2B6dgb_N!pN&_Qf1I7gqQ$aSeE`XRc1;_>gCZM@Y zV3k3Z7C;tMm!W|HNOqUJh4arIy-pyr)zif>#KQmWglN9Q3Op>i@0GvrFMPViw^8XS z!`qsJRS_qT6gsatc&eZ4qR+t!OC=-YY@T%M)wfP4#Y9?{(Ju!ydcMUy85}Sb4q9e00%dmdH?_b literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton.png new file mode 100644 index 0000000000000000000000000000000000000000..eeee2e200ace440822837f78a5fd71baa60e4ba7 GIT binary patch literal 567 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCiji0(?STPn|mTz`TyU&`+wpDP*QhimwBBJR*x382Ao@Fyrz36)7OYN?apKg7ec#$`gxH83GbB^GfvmTtgI0^$hha zq%&Ww0IJ!R8sVAd>8ZuQ0pzeUNHMZ9FalX#Kr9VqgM6XE$P5+-`NNQri9rBJM*(qW zI}2Dm3&;k6#giErUH}!rXf#V1fKn6K8CZZS4UCKp7#BcH1=+~D0AkVyy zF`-@`4=(h5`PH>VJnyf(!_xGI8I?S3Ri(NtcKjSIF%25L=iVLhP@B{+E3ibr<)lt0 z1IxcV32q{R2lD*h2|E;@k