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 0000000000..a0820eeacc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/tortilladough-flat.png differ 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 0000000000..b69ffc39e6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/tortilladough-slice.png differ 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 0000000000..d502da9b1c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/tortilladough.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json index c3af1577c8..e3fa26223a 100644 --- a/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json @@ -140,7 +140,7 @@ "name": "stewedsoymeat" }, { - "name": "taco" + "name": "softtaco" }, { "name": "melonfruitbowl" diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/taco.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/softtaco.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/meals.rsi/taco.png rename to Resources/Textures/Objects/Consumable/Food/meals.rsi/softtaco.png diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftaco.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftaco.png new file mode 100644 index 0000000000..36e605235b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftaco.png differ 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 0000000000..4db06131dc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/taco.rsi/beeftacosupreme.png differ 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 0000000000..014e20c0e9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentaco.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentacosupreme.png b/Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentacosupreme.png new file mode 100644 index 0000000000..ac07ed66b2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/taco.rsi/chickentacosupreme.png differ 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 0000000000..4a2a605523 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/taco.rsi/fishtaco.png differ 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 0000000000..f80673f6a6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/taco.rsi/rattaco.png differ 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 0000000000..63a396484c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/taco.rsi/tacoshell.png differ