From c92b99f6bacaa0e829995be0fcfbef2f4f7b374c Mon Sep 17 00:00:00 2001 From: phunnyguy <90366172+phunnyguy@users.noreply.github.com> Date: Wed, 18 Oct 2023 17:03:23 -0400 Subject: [PATCH] Tortilla dough, Taco shells, and Tacos (#20797) LGTM! --- .../Objects/Consumable/Food/ingredients.yml | 50 +++++- .../Objects/Consumable/Food/meals.yml | 10 +- .../Entities/Objects/Consumable/Food/taco.yml | 145 ++++++++++++++++++ .../Construction/Graphs/food/tortilla.yml | 13 ++ .../Recipes/Cooking/meal_recipes.yml | 82 +++++++++- .../Prototypes/Recipes/Reactions/food.yml | 14 ++ .../Consumable/Food/ingredients.rsi/meta.json | 11 +- .../ingredients.rsi/tortilladough-flat.png | Bin 0 -> 378 bytes .../ingredients.rsi/tortilladough-slice.png | Bin 0 -> 438 bytes .../Food/ingredients.rsi/tortilladough.png | Bin 0 -> 610 bytes .../Consumable/Food/meals.rsi/meta.json | 2 +- .../Food/meals.rsi/{taco.png => softtaco.png} | Bin .../Consumable/Food/taco.rsi/beeftaco.png | Bin 0 -> 303 bytes .../Food/taco.rsi/beeftacosupreme.png | Bin 0 -> 307 bytes .../Consumable/Food/taco.rsi/chickentaco.png | Bin 0 -> 308 bytes .../Food/taco.rsi/chickentacosupreme.png | Bin 0 -> 309 bytes .../Consumable/Food/taco.rsi/fishtaco.png | Bin 0 -> 286 bytes .../Consumable/Food/taco.rsi/meta.json | 32 ++++ .../Consumable/Food/taco.rsi/rattaco.png | Bin 0 -> 329 bytes .../Consumable/Food/taco.rsi/tacoshell.png | Bin 0 -> 283 bytes 20 files changed, 347 insertions(+), 12 deletions(-) create mode 100644 Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml create mode 100644 Resources/Prototypes/Recipes/Construction/Graphs/food/tortilla.yml create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/tortilladough-flat.png create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/tortilladough-slice.png create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/tortilladough.png rename Resources/Textures/Objects/Consumable/Food/meals.rsi/{taco.png => softtaco.png} (100%) create mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftaco.png create mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftacosupreme.png create mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentaco.png create mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentacosupreme.png create mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/fishtaco.png create mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/rattaco.png create mode 100644 Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index 8ef9bab706..71008ac89a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -379,6 +379,54 @@ - type: Sprite state: cornmealdough-slice +- type: entity + name: tortilla dough + parent: FoodBakingBase + id: FoodDoughTortilla + description: A piece of tortilla dough. + components: + - type: FlavorProfile + flavors: + - chalky + - dough + - type: Sprite + state: tortilladough + - type: SliceableFood + count: 3 + slice: FoodDoughTortillaSlice + +- type: entity + name: tortilla dough slice + parent: FoodBakingBase + id: FoodDoughTortillaSlice + description: A slice of tortilla dough. + components: + - type: FlavorProfile + flavors: + - chalky + - dough + - type: Sprite + state: tortilladough-slice + - type: Construction + graph: Tortilla + node: start + +- type: entity + name: flattened tortilla dough + parent: FoodBakingBase + id: FoodDoughTortillaFlat + description: A flattened slice of tortilla dough, cook this to get a taco shell. + components: + - type: FlavorProfile + flavors: + - chalky + - dough + - type: Sprite + state: tortilladough-flat + - type: Construction + graph: Tortilla + node: flat + - type: entity name: bun parent: FoodBakingBase @@ -460,7 +508,7 @@ components: - type: Sprite state: butter - + - type: entity name: stick of cannabis butter parent: FoodBakingBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index a55c535421..f4b52217cd 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -580,9 +580,9 @@ - Fruit - type: entity - name: taco + name: soft taco parent: FoodMealBase - id: FoodMealTaco + id: FoodMealSoftTaco description: Take a bite! components: - type: FlavorProfile @@ -592,10 +592,8 @@ - meaty - onion - type: Sprite - state: taco - - type: Tag - tags: - - Meat + state: softtaco + - type: entity name: corn in butter diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml new file mode 100644 index 0000000000..385f52b543 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml @@ -0,0 +1,145 @@ +- type: entity + name: taco shell + parent: FoodMealBase + id: FoodTacoShell + description: A taco shell, easy to hold, but falls on its side when put down. + components: + - type: Food + - type: Sprite + sprite: Objects/Consumable/Food/taco.rsi + layers: + - state: tacoshell + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 6.66 # Just using the same values as the bun values, since the recipe for taco shells is roughly the same as buns. +# Base + +- type: entity + parent: FoodInjectableBase + id: FoodTacoBase + abstract: true + components: + - type: FlavorProfile + flavors: + - meaty + - cheesy + - type: Food + transferAmount: 3 + - type: Sprite + sprite: Objects/Consumable/Food/taco.rsi + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 4 + - type: Item + sprite: Objects/Consumable/Food/taco.rsi + +- type: entity + name: beef taco + parent: FoodTacoBase + id: FoodTacoBeef + description: A very basic and run of the mill beef taco, now with cheese! + components: + - type: Food + - type: Sprite + state: beeftaco + +- type: entity + name: chicken taco + parent: FoodTacoBase + id: FoodTacoChicken + description: A very basic and run of the mill chicken taco, now with cheese! + components: + - type: Food + - type: Sprite + state: chickentaco + +- type: entity + name: fish taco + parent: FoodTacoBase + id: FoodTacoFish + description: Sounds kinda gross, but it's actually not that bad. + components: + - type: FlavorProfile + flavors: + - onion + - fishy + - type: Food + - type: Sprite + state: fishtaco + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Vitamin + Quantity: 6 + +- type: entity + name: rat taco + parent: FoodTacoBase + id: FoodTacoRat + description: Yeah, that looks about right... + components: + - type: Food + - type: Sprite + state: rattaco + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 4 + +- type: entity + name: beef taco supreme + parent: FoodTacoBase + id: FoodTacoBeefSupreme + description: It's like a regular beef taco, but surpeme! + components: + - type: Food + - type: Sprite + state: beeftacosupreme + - type: SolutionContainerManager + solutions: + food: + maxVol: 26 + reagents: + - ReagentId: Nutriment + Quantity: 14 + - ReagentId: Vitamin + Quantity: 6 + +- type: entity + name: chicken taco supreme + parent: FoodTacoBase + id: FoodTacoChickenSupreme + description: It's like a regular chicken taco, but surpeme! + components: + - type: Food + - type: Sprite + state: chickentacosupreme + - type: SolutionContainerManager + solutions: + food: + maxVol: 26 + reagents: + - ReagentId: Nutriment + Quantity: 14 + - ReagentId: Vitamin + Quantity: 6 + diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/food/tortilla.yml b/Resources/Prototypes/Recipes/Construction/Graphs/food/tortilla.yml new file mode 100644 index 0000000000..4678ef801e --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/food/tortilla.yml @@ -0,0 +1,13 @@ +- type: constructionGraph + id: Tortilla + start: start + graph: + - node: start + entity: FoodDoughTortillaSlice + edges: + - to: flat + steps: + - tool: Rolling + doAfter: 1 + - node: flat + entity: FoodDoughTortillaFlat diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index c02919777b..d83d58bc92 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1674,9 +1674,9 @@ FoodKebabSkewer: 1 - type: microwaveMealRecipe - id: RecipeFoodMealTaco - name: taco recipe - result: FoodMealTaco + id: RecipeFoodMealSoftTaco + name: soft taco recipe + result: FoodMealSoftTaco time: 10 solids: FoodDoughSlice: 1 @@ -1733,3 +1733,79 @@ FoodCorn: 1 FoodPlate: 1 FoodButter: 1 + +- type: microwaveMealRecipe + id: RecipeTacoShell + name: taco shell recipe + result: FoodTacoShell + time: 5 + solids: + FoodDoughTortillaFlat: 1 # one third of a standard bread dough recipe + +- type: microwaveMealRecipe + id: RecipeTacoBeef + name: beef taco recipe + result: FoodTacoBeef + time: 10 + solids: + FoodTacoShell: 1 + FoodMeatCutlet: 1 + FoodCheeseSlice: 1 + +- type: microwaveMealRecipe + id: RecipeTacoChicken + name: chicken taco recipe + result: FoodTacoChicken + time: 10 + solids: + FoodTacoShell: 1 + FoodMeatChickenCutlet: 1 + FoodCheeseSlice: 1 + +- type: microwaveMealRecipe + id: RecipeTacoFish + name: fish taco recipe + result: FoodTacoFish + time: 10 + solids: + FoodTacoShell: 1 + FoodMeatFish: 1 + FoodOnionSlice: 2 + FoodTomato: 1 + FoodCabbage: 1 + +- type: microwaveMealRecipe + id: RecipeTacoRat + name: rat taco recipe + result: FoodTacoRat + time: 10 + solids: + FoodTacoShell: 1 + FoodCheeseSlice: 1 + FoodMeatRat: 1 + +- type: microwaveMealRecipe + id: RecipeTacoBeefSupreme + name: beef taco supreme recipe + result: FoodTacoBeefSupreme + time: 10 + solids: + FoodTacoShell: 1 + FoodCheeseSlice: 1 + FoodMeatCutlet: 1 + FoodTomato: 1 + FoodCabbage: 1 + FoodOnionSlice: 2 + +- type: microwaveMealRecipe + id: RecipeTacoChickenSupreme + name: beef taco supreme recipe + result: FoodTacoChickenSupreme + time: 10 + solids: + FoodTacoShell: 1 + FoodCheeseSlice: 1 + FoodMeatChickenCutlet: 1 + FoodTomato: 1 + FoodCabbage: 1 + FoodOnionSlice: 2 diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml index 284b1c763a..3ca69b379d 100644 --- a/Resources/Prototypes/Recipes/Reactions/food.yml +++ b/Resources/Prototypes/Recipes/Reactions/food.yml @@ -58,6 +58,20 @@ - !type:CreateEntityReactionEffect entity: FoodDoughCornmeal +- type: reaction + id: CreateTortillaDough + impact: Low + quantized: true + conserveEnergy: false + reactants: + Cornmeal: + amount: 15 + Water: + amount: 10 + effects: + - !type:CreateEntityReactionEffect + entity: FoodDoughTortilla + - type: reaction id: CreateCakeBatter impact: Low diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json index bf656ff00c..3c66005b04 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", + "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,", "size": { "x": 32, "y": 32 @@ -108,6 +108,15 @@ }, { "name": "tofu-slice" + }, + { + "name": "tortilladough" + }, + { + "name": "tortilladough-flat" + }, + { + "name": "tortilladough-slice" } ] } diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/tortilladough-flat.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/tortilladough-flat.png new file mode 100644 index 0000000000000000000000000000000000000000..a0820eeacc524aa43ad73bc14bc91836310cfc08 GIT binary patch literal 378 zcmV-=0fqjFP)RB!U=$z& Y00FXY@jIq8U;qFB07*qoM6N<$f*^jUaR2}S literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/tortilladough-slice.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/tortilladough-slice.png new file mode 100644 index 0000000000000000000000000000000000000000..b69ffc39e6f48dea8b0ee55421744ff53c70ebf2 GIT binary patch literal 438 zcmV;n0ZIOeP)r&iv~q|BB-}KCm<4Uxw+VWL9-s&40i*{A7p>|IiZ<=r1T9**2$Ntc z1~b$gguz0lh0MheW*j%QxZh@m|D1dOpL@>*i9{li{4sO0Ec$%DaED(5035pmz{>XV zOnZe| zM=rqPvNloscKQHBm4wj3hL{gB*9(R)Ph@hmnwF@0#^ah}chC!l2p)uQ%FFXTS6^7e zY&R(8OQ=h$q85q88Ga3L><-^fpKi}4l~jSzwRoX}hST>108&YnV!i~x?cEh-y(T6< z5{sj#X`)KvmwDdUL{ZZyYMQtE6W@~vyr*iV>}pz8gy{Bc0L*rSt@T|JnH=7e^g;o2 zU!O#;-#kn;DAh{Y1<oB#j-07*qoM6N<$f;J+^1^@s6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/tortilladough.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/tortilladough.png new file mode 100644 index 0000000000000000000000000000000000000000..d502da9b1cc84f6ea5824338c622680fd3fbb712 GIT binary patch literal 610 zcmV-o0-gPdP)BjE7=|A!#g;M1l^P>#r~{#HmJ*DUzmTCzp^!h&Ipi03&MzpLyJsncLLpl_7GpYe zaTSur1{>j4vPDGYK&%eVo#S9E+3i-n+v&c$=l#C>bO(tNCHmi$T4mAM$$q%Ay~kQQ zBfmMe2f(0jQG4|^_P$FQxcpQPExX0e_MZH9-$dy3CUNaLbVm~E*d8gZ z2!Ni~Xr3O1|IC1ZYi4-{u4nxzH0uK}7+%Ymvy=Tu6Ojhqzk4|sp4T&sRYRV=`#Xo* zu@JEv&tF6)7R$iKlV=htB(fd4BMegmz%VuRrxh9F*=^RQ&9bvqVU-@h${M;frK9}I@qxE%|(W1*R4Zf`~s44?##9D8;ffG>>?09^e# z|2qQ!UoV=#^d1lpC2;WUwls1dUNN`i`qythF1(T-Et)*2H&Vw(yCF2G0`Abeo0-5Y zyM=$zq`Fy?>`rTdb=^eg-{!-WT4{ZrikNp%F#mPdxF{)agN7yW+@2T6_~Is_yor5Spg z#o<23MKdrkFeqI5%aCNvM3f_lasYa;W22)|&O!J#CJf2*e=*EWWFyKEL?xQ7OGW={ zseWU)cAJY~$p!(2n1BxqFg`XqCh{wTx&#x$%@_X|j^4#@2T=~#vEKOqhxdON1O!RB!U=)lT008pMpG64@mz4kj002ovPDHLkV1l}8 BfIa{K literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftacosupreme.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftacosupreme.png new file mode 100644 index 0000000000000000000000000000000000000000..4db06131dce7e2f745568d4a6f0d1c1ccd2ccec3 GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJU!E?GArY;~2@#5yEbD3Ao!D>pm0mjg6^3g;Tf$kU??zny85}Sb4q9e0G()r AO#lD@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentaco.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentaco.png new file mode 100644 index 0000000000000000000000000000000000000000..014e20c0e96aefc2e7f7135cc4fa58815e276643 GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ-<~dxArY;~2@=0O;wsjB8kb);J}X?FK$OKm3Y$QEGaiP_Uwae71HZvT`UuhS3UkOfA4>y zfIv#3!nCwqA37VoPt7=}R?8Y`nG5zIm)k)N2}=fstI7)wg!cYh0SpEPPgg&ebxsLQ E0H#5yEbD3Ao!D>pm0mjgT8M?AW-nE5SoRlqq_8 z*T3sQe~%TsH4{HPiI<7TkWpSDp(f|c<3Gg!isRw+z1u94!CvHYJE$S?iGg9qrP&{%{CtIh;lSYO>gTe~DWM4f DruKs) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/fishtaco.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/fishtaco.png new file mode 100644 index 0000000000000000000000000000000000000000..4a2a6055234cfd987914d15b9d79ec33f83adfec GIT binary patch literal 286 zcmV+(0pb3MP)NkdKx49UWY!G0G3HZPO z<71zZ}<>ckG kQ7{Td!6+C7qhRC!0KPrHzdt#tZ~y=R07*qoM6N<$f+7}!E&u=k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json new file mode 100644 index 0000000000..3e028b55c9 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Added by Phunny", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "tacoshell" + }, + { + "name": "beeftaco" + }, + { + "name": "beeftacosupreme" + }, + { + "name": "chickentaco" + }, + { + "name": "chickentacosupreme" + }, + { + "name": "fishtaco" + }, + { + "name": "rattaco" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/rattaco.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/rattaco.png new file mode 100644 index 0000000000000000000000000000000000000000..f80673f6a685cd9786f0c9bbf1d7fa7f196a0d04 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFba6OIEF;DCMQU+E=~~XX$mwr z&@fTP_rHDH|N4J_G@F+!F**GCxxeJO`Fl?;So*8i@!}iplg|tvZe6kbxxLZ$t*0^| zhcqw$S~E$e(fs0prux|_>dn($nYU$c-zhOIM!;7KF4w!W zX36#Sk`mfl25*$LuD*-N|MUOwZ+jl5CLNw5m&Eg17tRQbi}MTXlZN@6tIeK)VY$)< V(S(VT>wrPT;OXk;vd$@?2>|nika++A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell.png new file mode 100644 index 0000000000000000000000000000000000000000..63a396484ce9a4922224beaf9fafacbec44afd63 GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJN1iT@ArY;~2@NpBnze9yq|CYRp9+(9l+EsL6mj1m zuv#EVlDX^Yjf^11K*a{RH#c6am{QC$Y0@R0wqvhUTA2bn(_RN%{2#UIzQnq_&ypfG zIW{P&Jz!?;>F-xl3lw_VAp5%ae|^ROc1MQ^t&I}5VxIFI-g-NR=ibHjCr_n9y~5>o c@B|Y>qhjZoITL0AJFVdQ&MBb@01fMadH?_b literal 0 HcmV?d00001 -- 2.51.2