From e07609b3b3109604b664ec62d6712334ec2fbc97 Mon Sep 17 00:00:00 2001 From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Date: Sat, 28 Dec 2024 18:02:24 -0800 Subject: [PATCH] New cotton baguette, crostini, chevre-chaud, bagel, and croissant foods for moffs (#33508) * A looooooooot of new cotton foods for the moffs * address slam's comments on the food for moffs not having any moff food in the food (the food that's intended for moffs) * alternative sprites for bagel-cottondough.png, baguette-cotton.png, and croissant-cotton.png * update requested sprites * change requested sprites * address part of sloth's review, awaiting response * address second half of review, fix magical food nutriment mitosis bug --- .../Objects/Consumable/Food/Baked/bagel.yml | 28 ++++++ .../Objects/Consumable/Food/Baked/bread.yml | 71 ++++++++++++++ .../Objects/Consumable/Food/Baked/misc.yml | 66 ++++++++++++- .../Objects/Consumable/Food/ingredients.yml | 89 +++++++++++++++++- .../Construction/Graphs/food/doughrope.yml | 16 +++- .../Recipes/Cooking/meal_recipes.yml | 37 ++++++++ .../Baked/bagel.rsi/bagel-cottondough.png | Bin 0 -> 543 bytes .../Consumable/Food/Baked/bagel.rsi/meta.json | 19 ++-- .../baguette-cotton-equipped-BELT.png | Bin 0 -> 432 bytes .../bread.rsi/baguette-cotton-inhand-left.png | Bin 0 -> 454 bytes .../baguette-cotton-inhand-right.png | Bin 0 -> 522 bytes .../Food/Baked/bread.rsi/baguette-cotton.png | Bin 0 -> 660 bytes .../Food/Baked/bread.rsi/crostini-cotton.png | Bin 0 -> 404 bytes .../Consumable/Food/Baked/bread.rsi/meta.json | 20 +++- .../Baked/misc.rsi/chevrechaud-cotton.png | Bin 0 -> 869 bytes .../Food/Baked/misc.rsi/croissant-cotton.png | Bin 0 -> 763 bytes .../Consumable/Food/Baked/misc.rsi/meta.json | 8 +- .../ingredients.rsi/cotton-dough-rope.png | Bin 0 -> 482 bytes .../ingredients.rsi/cotton-dough-slice.png | Bin 0 -> 521 bytes .../ingredients.rsi/croissant-raw-cotton.png | Bin 0 -> 307 bytes .../Consumable/Food/ingredients.rsi/meta.json | 11 ++- 21 files changed, 349 insertions(+), 16 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel-cottondough.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-cotton-equipped-BELT.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-cotton-inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-cotton-inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-cotton.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/crostini-cotton.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/chevrechaud-cotton.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/croissant-cotton.png create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cotton-dough-rope.png create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cotton-dough-slice.png create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/croissant-raw-cotton.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml index 8f23b6c7df..114b3e01f2 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml @@ -47,3 +47,31 @@ Quantity: 5 - ReagentId: Nutriment Quantity: 5 + +- type: entity + id: FoodBagelCotton + parent: FoodBagelBase + name: cotton bagel + description: A delicious bagel made with cotton dough. + components: + - type: FlavorProfile + flavors: + - bread + - cotton + - type: Sprite + state: bagel-cottondough + - type: Food + requiresSpecialDigestion: true + - type: Tag + tags: + - ClothMade + - type: SolutionContainerManager + solutions: + food: + maxVol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 2.5 + - ReagentId: Fiber + Quantity: 2.5 + diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index 0fb3df4d27..db77d81ce8 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -702,6 +702,46 @@ Blunt: 1 # bonk # Tastes like France. +- type: entity + name: cotton baguette + parent: FoodBreadBaguette + id: FoodBreadBaguetteCotton + description: Bon azzétit! + components: + - type: Sprite + state: baguette-cotton + - type: SliceableFood + slice: FoodBreadBaguetteCottonSlice + - type: Food + requiresSpecialDigestion: true + - type: Tag + tags: + - Bread + - ClothMade + - type: Clothing + equippedPrefix: baguette-cotton + - type: Item + inhandVisuals: + left: + - state: baguette-cotton-inhand-left + right: + - state: baguette-cotton-inhand-right + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Fiber + Quantity: 3 + - ReagentId: Vitamin + Quantity: 1 + - ReagentId: TableSalt + Quantity: 1 + - ReagentId: Blackpepper + Quantity: 1 + - type: entity name: crostini parent: FoodBreadSliceBase @@ -724,6 +764,37 @@ - ReagentId: Blackpepper Quantity: 0.1 +- type: entity + name: cotton crostini + parent: FoodBreadBaguetteSlice + id: FoodBreadBaguetteCottonSlice + description: Bon az-zetite! + components: + - type: Sprite + state: crostini-cotton + - type: Food + requiresSpecialDigestion: true + - type: Tag + tags: + - Bread + - Slice + - ClothMade + - type: SolutionContainerManager + solutions: + food: + maxVol: 2 + reagents: + - ReagentId: Nutriment + Quantity: 0.25 + - ReagentId: Fiber + Quantity: 0.25 + - ReagentId: Vitamin + Quantity: 0.1 + - ReagentId: TableSalt + Quantity: 0.1 + - ReagentId: Blackpepper + Quantity: 0.1 + - type: entity name: buttered toast parent: FoodBreadSliceBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml index b4be6a8dfd..db8c186856 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -28,7 +28,7 @@ description: A delicious and spongy little cake. components: - type: Food - trash: + trash: - FoodPlateMuffinTin - type: Sprite sprite: Objects/Consumable/Food/Baked/misc.rsi @@ -609,6 +609,38 @@ - ReagentId: Vitamin Quantity: 0.5 +- type: entity + name: cotton chèvre chaud + parent: FoodBakedChevreChaud + id: FoodBakedChevreChaudCotton + description: A disk of slightly melted chèvre flopped on top of a... cotton crostini, and toasted all-round. + components: + - type: FlavorProfile + flavors: + - bread + - nutty + - creamy + - smokey + - cotton + - type: Sprite + state: chevrechaud-cotton + - type: Food + requiresSpecialDigestion: true + - type: Tag + tags: + - ClothMade + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 1 + - ReagentId: Fiber + Quantity: 1 + - ReagentId: Vitamin + Quantity: 0.5 + - type: entity name: brownies parent: FoodBakedBase @@ -771,3 +803,35 @@ damage: types: Blunt: 0 # so the damage stats icon doesn't immediately give away the syndie ones + +- type: entity + name: cotton croissant + parent: FoodBakedCroissant + id: FoodBakedCroissantCotton + description: Buttery, flaky, fibery goodness. + components: + - type: FlavorProfile + flavors: + - bread + - butter + - cotton + - type: Sprite + state: croissant-cotton + - type: Food + requiresSpecialDigestion: true + - type: Tag + tags: + - ClothMade + - type: SolutionContainerManager + solutions: + food: + maxVol: 7 + reagents: + - ReagentId: Nutriment + Quantity: 1.5 + - ReagentId: Fiber + Quantity: 1.5 + - ReagentId: Butter + Quantity: 2 + - ReagentId: Vitamin + Quantity: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index af7d75b175..30d0189492 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -315,6 +315,13 @@ - type: Construction graph: DoughRope node: start + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: Nutriment + Quantity: 5 - type: entity name: dough rope @@ -330,6 +337,13 @@ - type: Construction graph: DoughRope node: rolled + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: Nutriment + Quantity: 5 - type: entity name: cornmeal dough @@ -426,9 +440,9 @@ - cotton - type: Sprite state: cotton-dough - # - type: SliceableFood # TODO add it - # count: 3 - # slice: FoodDoughCottonSlice + - type: SliceableFood + count: 3 + slice: FoodDoughCottonSlice - type: Construction graph: CottonPizza node: start @@ -446,6 +460,59 @@ - ReagentId: Fiber Quantity: 10 +- type: entity + name: cotton dough slice + parent: FoodBakingBase + id: FoodDoughCottonSlice + description: A slice of cotton dough. + components: + - type: FlavorProfile + flavors: + - dough + - cotton + - type: Sprite + state: cotton-dough-slice + - type: Tag + tags: + - Slice + - type: Construction + graph: DoughRopeCotton + node: start + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: Nutriment + Quantity: 1.5 + - ReagentId: Fiber + Quantity: 3.5 + +- type: entity + name: dough rope + parent: FoodBakingBase + id: FoodDoughCottonRope + description: A thin noodle of cotton dough. Can be cooked into a cotton bagel. + components: + - type: FlavorProfile + flavors: + - dough + - cotton + - type: Sprite + state: cotton-dough-rope + - type: Construction + graph: DoughRopeCotton + node: rolled + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: Nutriment + Quantity: 1.5 + - ReagentId: Fiber + Quantity: 3.5 + - type: entity name: raw pastry base parent: FoodBakingBase @@ -499,6 +566,9 @@ - type: Construction graph: CottonPizza node: flat + - type: SliceableFood + count: 3 + slice: FoodCroissantRawCotton - type: entity name: pizza bread @@ -818,3 +888,16 @@ reagents: - ReagentId: Nutriment Quantity: 3 + +- type: entity + name: raw cotton croissant + parent: FoodCroissantRaw + id: FoodCroissantRawCotton + description: Buttery, flaky, fibery goodness waiting to happen. + components: + - type: FlavorProfile + flavors: + - dough + - cotton + - type: Sprite + state: croissant-raw-cotton diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/food/doughrope.yml b/Resources/Prototypes/Recipes/Construction/Graphs/food/doughrope.yml index 52a9a817cf..1b95d46dce 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/food/doughrope.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/food/doughrope.yml @@ -10,4 +10,18 @@ - tool: Rolling doAfter: 1 - node: rolled - entity: FoodDoughRope \ No newline at end of file + entity: FoodDoughRope + +- type: constructionGraph + id: DoughRopeCotton + start: start + graph: + - node: start + entity: FoodDoughCottonSlice + edges: + - to: rolled + steps: + - tool: Rolling + doAfter: 1 + - node: rolled + entity: FoodDoughCottonRope diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 1ec6fc7233..abfd0fd321 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -24,6 +24,14 @@ FoodDoughRope: 1 PoppySeeds: 1 +- type: microwaveMealRecipe + id: RecipeBagelCotton + name: cotton bagel recipe + result: FoodBagelCotton + time: 5 + solids: + FoodDoughCottonRope: 1 + #Burgers - type: microwaveMealRecipe @@ -458,6 +466,17 @@ solids: FoodDough: 1 +- type: microwaveMealRecipe + id: RecipeBaguetteCotton + name: baguette recipe + result: FoodBreadBaguetteCotton + time: 15 + reagents: + TableSalt: 5 + Blackpepper: 5 + solids: + FoodDoughCotton: 1 + - type: microwaveMealRecipe id: RecipeBaguetteSword name: baguette sword recipe @@ -1939,6 +1958,15 @@ FoodChevreSlice: 1 FoodBreadBaguetteSlice: 1 +- type: microwaveMealRecipe + id: RecipeFoodBakedChevreChaudCotton + name: cotton chevre chaud recipe + result: FoodBakedChevreChaudCotton + time: 5 + solids: + FoodChevreSlice: 1 + FoodBreadBaguetteCottonSlice: 1 + - type: microwaveMealRecipe id: RecipeCannabisButter name: cannabis butter recipe @@ -2067,6 +2095,15 @@ FoodCroissantRaw: 1 FoodButterSlice: 1 +- type: microwaveMealRecipe + id: RecipeCroissantCotton + name: cotton croissant recipe + result: FoodBakedCroissantCotton + time: 5 + solids: + FoodCroissantRawCotton: 1 + FoodButterSlice: 1 + - type: microwaveMealRecipe id: RecipeThrowingCroissant name: throwing croissant recipe diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel-cottondough.png b/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/bagel-cottondough.png new file mode 100644 index 0000000000000000000000000000000000000000..57fbe72b5cf2a8ab6c82f69d09cf3ae1cd445671 GIT binary patch literal 543 zcmV+)0^t3LP)VAm z0BWCW0K|vR<0Tw6-hZJ5W(#5sP$}j$noZ&*9D?sZPTkYWZGSY)nzc6_A*^PgQp{_v zFpQUQLL-3SFyQ!Wy=i^G=H~u1VAPbDVMg+ zjAoNux%;@Iw)HJ2l;#0Qd%wDR>vEE7BLk$|69%1gcnOEGbUy$$%P*{St!7|pc2cuT zYs8N};chMiu(4flgEN7Ou<7UQb>{mG+xWv|iZzBzotk%=p*R@`rmN7<>w7WPXV~oD-ZORxU zV~lneXCz7M_BiPY{6ppx&0VHU1}n{~0}h hj3R&tAOh$)z)zQW?ZehZYO(+T002ovPDHLkV1iqU@gx8M literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/meta.json index fcd9dc077d..60e45949fd 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi/meta.json @@ -1,17 +1,20 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Bagel and BagelPoppy were created by DrEnzyme", + "copyright": "Bagel and BagelPoppy were created by DrEnzyme. Bagel-cottondough by JuneSzalkowska.", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "bagel" - }, - { - "name": "bagel-poppy" - } + { + "name": "bagel" + }, + { + "name": "bagel-poppy" + }, + { + "name": "bagel-cottondough" + } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-cotton-equipped-BELT.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-cotton-equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..b631cbea3eeec7d39b9b726bed4daed31d7c0637 GIT binary patch literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zvpiiKLn`LH zy|r=eAp-%n2d8I0s^Z6Z~vfN7A3UM~c3+UKO0M`Tu9x^G~AhGv;2uoK@bV#<-ec+GojJ{_Xo$ z9hF|k{a86m#$l;Z-tK#A7uBnj-fBruSu%TnkYv0$_u{BtHH9hf_$y~OP1vRHvpk`M z$?0v~;+f~BTlcmaNI5K?xvf3AVE*3Me>EoxKwJnS4{X2ijqT9O))NzQ5}bG*zGXON z^EY-*%Qou|O54Ph!`97i{U~Op6(cU={e10vhRA7Vv((F<#a??D#&|;Br!?|b+20pt z6(@dmo)NLuPZ56exA(#oYyGg@$wm9_0DZYCPx$fJsC_RCt{2+C5IgFcb&y7sLS=7*I!8ID>Nl-Xd_J;&p4&S6 zAb17f{`I5idZz7ePe!ZkgW%0*#Z6Um&NHD1ZD8|s%S1#k@1L|>t%KW3ElP)tR(yS4 zP}g&IL5S8_I}7qx6Y0>Jk{UGr@OH zu-{3}DA526_XO9GY^svCyS;d7J(X(M`tH2@2zEVFm+9dO0000000000;D_(!X1152 zL%uh>p*PFNBng1gitTHW>m{fCeYUj-+}7MwC5Lui>fKTF%Gqee4>t=UBD#8fn`AA5 zSOBDI24c4>5&&-N!(MToWLkBPM>M9%^#-t&kiT#Jx8Rb`nPrTEkmBs&R8 w^F1;Cn*a>=1eawYULTN>Z!H1<007L>7irS!^R3i@&j0`b07*qoM6N<$f^4S9fB*mh literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-cotton-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-cotton-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..61880dfe04063854aa2417e2d771a08e943e2f38 GIT binary patch literal 522 zcmV+l0`>igP)Px$#7RU!RCt{2+O1B*P!tF7fB8^^1c4YML4W~Gf@mLrG&q77qNqLqZ_w-w5J)f} zT7h3CkW7%EFg4Tx6%|W(fP)|x$kK&=+?Czt|C3F2bI<8%*PMF*A|fIpqRIl-mjB*E zRSR_&kjNLn+$7XWK;YVvq+MUck zyNct>p|QaOK3{1+M56IJ|nE@gqA|e3z1lN-4DS8o@1poj5 M07*qoM6N<$f}IuZO8@`> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-cotton.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-cotton.png new file mode 100644 index 0000000000000000000000000000000000000000..fc00041207539a7e591298561c0fc5c49dd3efa3 GIT binary patch literal 660 zcmV;F0&D$=P)Px%PDw;TR9J=WmOp3{VHn1L*A}d)C4Yzz8i}TVB*9D;?14kFh(d-+hEQ-$=&FNm zLRW{b8N{Vna28@g5bDycgAgs6(FZ?mqZE@B2RA z%fUnw{bMPA3slIehGPx$PDw;TR9J=WlfOy>K@f*OHDGnbg%lQY1R?dMN}&%R`T{{jYYQ7oLD0uY9jm-R ziu59;x~s!pLfV9kaVsHaZOlpS{i@m7`SY7y1_FUVAQ1RtHdaZ}T3cfbaU3%o z4vC@&V+_@5_1E=&m9S`>BncvdQVJ1q_ad^gkRM6Y)GnAzCe~VOU;EGYwg2pV3p-6y z>sxozCrE2;_ls|ch@0FDx&X|I6&E)vRxpDuNs^$o_7YL>2~tYIbnI*qq43$zou|De zLB<%L(ta;+eRRlZURs(Qa7_!-9#OeQRIZ_vBFi#*&D-?}0BByFljk{6xrT@^D^?iI zOTgFEd7hJH8F3u@mi7ArfWcVk+?;XQdZKf4=KS?Wo7UwC^+ucS{RJ;?@AURc-U7VW ye5G_P;Ah48fZr9n>C_m6RnK_7inS`%3$7*HE8Jz7CA~b4`jTkQo}H1} zA-fZg6cZ$gqfufRlOlamZON>*um9IK&5C$*c{{A(iX%@!ya`cD(lsa55IrZ4$(qXj zZ=RkpI1qG?CZXZU_usl9vIF1SzW;UP``^b<_Xrnu#lIps4S$HfUD3J@AhrQ#mlaLh zh4W2le{iyH_E)Nt9X1SjJ%yGGwBA6|LXcJYoRfPOVHn3hCA1l=?BK-_-I-G$!m@`1F%rVlirz$!DCxF`PJ#!6 z@Df3PL350RK!gws1;G_uV-AJvsF#A>W-HXg?!I(bmOy$s?L=ttjs!uxpUeC5^8EO| z&kryd3sI{0gz*scSB?K)BN-qG8H z`|A=nUM$7_nkTlCj*_>j7d^UfPx%wMj%lR9J=WmOn@vVHn1L(TXvkCN_bzq770DO(At)BzUO(~ z=e;+98fy68p{aJ`c%M}Ouo(4BF0NL6&aFx}_+1VGV6-<^xRV1M!roDuY6Mjz!0&Ph z60xnL4S?`r3*PA|VqZQm)P6$vumuoBmLsIDQgT~I8#a4Cn7YB#O?*F2S67$#Qehof zSYhb#9XY0J3-G%ff_M5Gci%0E4igdaK_bGKL&v<=NzcR#;h(=5bLa?vdPdL03@=9> zmK0G^faHAc%?m<4H=VDh6e6|`k^mSC26<0>KQ3Q?eci4qLbV6vvfKNy*+s{}kI(Ui z)|mG?dDM{wAe}oW8jTX)kF%A}lFl`dN~QR%Zn>I4Km0|eZI3K5bcNxA!+J+y@y&<-8EL$s5+92D;EHrHdZRYa5!TeXg2KWf&nZ6$K!;I5|`d8TP+4;M%4t74vjEZNjFL`0rF3 zh@wb&o`)_N$m5pJzt^{+Z&GK#wM_-Euvj6EW5O^b4sQXtu}tRY=h)f%Gu;gIr2rzA z2jIzfc<#=iiylucAMgHQAWy3GV-j%`MJfmaC31O0E>GBW=yuvP9UJfZ5?%CY)N3rP zZjL2~2~J>HmMWLa6bc1i9)0ev&IVKVS^BjNfRyq>-Bc%VZBrRW1<&&^41@F2D!|xN zCNXjYu5GIRotuu$jb*aFwaeeD`b6?CZNRln)u`84ksFkMRtBk-QfgAlaovd|HqfZo zSl`;ER1|bOZGhA(pQr%uK)l507*qoM6N<$f?*rkQUCw| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cotton-dough-slice.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/cotton-dough-slice.png new file mode 100644 index 0000000000000000000000000000000000000000..ca7e2347d7b8fa3df3d0935354624f808937453e GIT binary patch literal 521 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|?gjXSxZXXn z<>8qf_fBqoa%$7V zaR2Dqi#r!RKC|ui!IgWK^sZ^mJg{Qoqq93N?OJ^I@ah$fsk;~VY@OS-x+P=p(!SQk&S5=GT$rwX8lF=!r+S zuiU+IrYSdeZb#X%9V<63nfm_y`)ALd-Mo48{Q2`Y%0H$96?v5e`33){3@{+H=L#LR z0h-$E>Eak-(fjtoPQk+t9IOFX9h{%VEcoBXb1*9<+tllgkNs0ancJ_`ZZrR5YIA>P zdf?$||YuX8omirD29x_{4S02*) zCcC4f9hq?GfIcfq)BOR{`awc)wYbCbytk|e~4Bvn@RmC`ubq!Y@l-(JYD@< J);T3K0RYKvEw%sv literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/croissant-raw-cotton.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/croissant-raw-cotton.png new file mode 100644 index 0000000000000000000000000000000000000000..f80dc893319c30fcca50270f110b99e15685c0cb GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|v;urWT!C~) zu}w;p?VoS^zTKJd?s&rfn&7(=LjJEvSzY8aJRFR7{Q3X>T;sGZksbLS9vu5`C_b|ISFrL{ zT-kwZ6S{UkZaKW{gnJ7MSIY#yFHS23H^#Gwirr)I?+iHRePg>CM{k3diNf^SRyU`M zpZrVOSvDL_i!aWawu~bywnbIJO=YcBN#CVOjmMQ&NiAL%{#dzyv0KspK*}M0#nixi qy5Hgzb*3?zZ)E*3_uDW3_4>+LoNJYtmD7L@W$<+Mb6Mw<&;$UiZiBM` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json index 366f39f96a..dd802fb59f 100644 --- a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny, butter-slice and croissant-raw taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380)", + "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny, butter-slice and croissant-raw taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955, cotton made by mlexf (discord 1143460554963427380). Croissant-raw-cotton, cotton-dough-slice and cotton-dough-rope by JuneSzalkowska", "size": { "x": 32, "y": 32 @@ -46,6 +46,12 @@ { "name": "cotton-dough" }, + { + "name": "cotton-dough-slice" + }, + { + "name": "cotton-dough-rope" + }, { "name": "dough" }, @@ -123,6 +129,9 @@ }, { "name": "croissant-raw" + }, + { + "name": "croissant-raw-cotton" } ] } -- 2.51.2