From 335ee13caf3e7ea3603e29415a95945a096a82f8 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Mon, 26 Jun 2023 06:05:07 +0300 Subject: [PATCH] Taco! (#17635) --- .../Entities/Objects/Consumable/Food/meals.yml | 16 +++++++++++++++- .../Prototypes/Recipes/Cooking/meal_recipes.yml | 12 ++++++++++++ .../Objects/Consumable/Food/meals.rsi/meta.json | 5 ++++- .../Objects/Consumable/Food/meals.rsi/taco.png | Bin 0 -> 461 bytes 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/meals.rsi/taco.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index 46add4a699..0cb21ccf2b 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -517,7 +517,6 @@ Quantity: 6 # What do Europeans eat instead of enchiladas? 25.4 millimeter-iladas. - - type: entity name: melon fruit bowl parent: FoodMealBase @@ -545,3 +544,18 @@ Quantity: 5 - ReagentId: Kelotane Quantity: 5 + +- type: entity + name: taco + parent: FoodMealBase + id: FoodMealTaco + description: Take a bite! + components: + - type: FlavorProfile + flavors: + - cheesy + - tomato + - meaty + - onion + - type: Sprite + state: taco diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index decd66a266..2e05a28793 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1585,3 +1585,15 @@ solids: FoodMeatLizard: 1 FoodKebabSkewer: 1 + +- type: microwaveMealRecipe + id: RecipeFoodMealTaco + name: taco recipe + result: FoodMealTaco + time: 10 + solids: + FoodDoughSlice: 1 + FoodTomato: 1 + FoodOnionSlice: 2 + FoodCheeseSlice: 1 + FoodMeatCutlet: 1 diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json index 9db6ebb819..7e5df4d53f 100644 --- a/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, taco from https://github.com/ss220-space/Paradise/commit/6c9bd827610433093a79d814b96bd50f9cf12eec", "size": { "x": 32, "y": 32 @@ -139,6 +139,9 @@ { "name": "stewedsoymeat" }, + { + "name": "taco" + }, { "name": "melonfruitbowl" }, diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/taco.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/taco.png new file mode 100644 index 0000000000000000000000000000000000000000..ca32b9cb7cba89e93af8d004ff074f4b46be8e50 GIT binary patch literal 461 zcmV;;0W$uHP)bMr7K`$PAdrt^dMflOz)O|g4CaJlutx{jBOoDKE?oQ`;Cm>G6-4LzclH?Ssl37y zp#E?tYqfffK}1)8gjw+YXZurt{|F7B0W^RH7&^cQHb9~|NX|-A00000NkvXXu0mjf DeZ;vo literal 0 HcmV?d00001