diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/meals.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/meals.ftl new file mode 100644 index 00000000000..22b6019665f --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/meals.ftl @@ -0,0 +1,2 @@ +ent-ADTFoodMealKhachapuri = хачапури + .desc = Большая лепешка, которую дополняет рассольный сыр и свежее яйцо. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/meals.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/meals.ftl index ad77bfa353d..3d8619b366c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/meals.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/meals.ftl @@ -51,4 +51,4 @@ ent-FoodMealEnchiladas = энчилада ent-FoodSaladWatermelonFruitBowl = фруктовый арбузный боул .desc = Единственный салат, в котором можно съесть миску. ent-FoodMealCornInButter = кукуруза в сливочном масле - .desc = Маслянистенько. + .desc = Маслянистенько. \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meals.yml new file mode 100644 index 00000000000..ba7e31fd3b0 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meals.yml @@ -0,0 +1,49 @@ +# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_meal.yml +# A bunch of different meals. This stuff doesn't come off their plates because +# it's assembled on them. Or they just don't have plates. + +# Base + +- type: entity + parent: FoodInjectableBase + id: ADTFoodMealBase + abstract: true + description: A delicious meal, cooked with love. + components: + - type: Item + storedRotation: -90 + - type: Food + - type: Sprite + sprite: ADT/Objects/Consumable/Food/meals.rsi + - type: SolutionContainerManager + solutions: + food: + maxVol: 26 + reagents: + - ReagentId: Nutriment + Quantity: 20 + +# Tastes like egg, cheese. +- type: entity + name: Khachapuri + parent: ADTFoodMealBase + id: ADTFoodMealKhachapuri + description: A large flatbread that complements pickled cheese, fresh egg. + components: + - type: FlavorProfile + flavors: + - egg + - salty + - milk + - cheesy + - type: Sprite + state: khachapuri + - type: SolutionContainerManager + solutions: + food: + maxVol: 13 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: TableSalt + Quantity: 3 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/fill.txt b/Resources/Prototypes/ADT/Recipes/Cooking/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Recipes/Cooking/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml new file mode 100644 index 00000000000..c816632bb77 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml @@ -0,0 +1,12 @@ +- type: microwaveMealRecipe + id: ADTFoodKhachapuriRecipe + name: Khachapuri recipe + result: ADTFoodMealKhachapuri + time: 15 + reagents: + Egg: 12 + TableSalt: 5 + Milk: 5 + solids: + FoodCheeseSlice: 1 + FoodBreadPlainSlice: 1 \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index fb1280daffa..96a9a471f68 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -705,7 +705,7 @@ Water: 10 solids: FoodBowlBig: 1 - + - type: microwaveMealRecipe id: RecipeRicePudding name: rice pudding recipe diff --git a/Resources/ServerInfo/ADT/NewRecipes.xml b/Resources/ServerInfo/ADT/NewRecipes.xml index 21c02a93ba7..2086d681df2 100644 --- a/Resources/ServerInfo/ADT/NewRecipes.xml +++ b/Resources/ServerInfo/ADT/NewRecipes.xml @@ -235,6 +235,17 @@ - Печень вульпы - Маленькая тарелка +## Хачапури + Хачапури готовится так: на 15 секунд в микроволновку помещается - + - Один ломтик сыра + - Один ломтик хлеба + - Два яйца + - Молоко 5u + - Соль 5u + + + + ## Маффины Заметив условия пониженного уровня сахара в крови некоторых членов экипажа, Центральное Командование позволило испекание некоторых новых кондитерских изделий на станциях. diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/khachapuri.png b/Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/khachapuri.png new file mode 100644 index 00000000000..e1ed5d7c6bf Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/khachapuri.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/meta.json new file mode 100644 index 00000000000..ffbf8c8739a --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Adventure Times MRP", + "states": [ + { + "name": "khachapuri" + } + ] +} \ No newline at end of file