From f0fb804cc121fc67ea688c3ce27a73c461fcb474 Mon Sep 17 00:00:00 2001 From: Inconnu1337 Date: Wed, 4 Sep 2024 00:03:07 +0300 Subject: [PATCH 1/8] =?UTF-8?q?=D0=A5=D0=B0=D1=87=D0=B0=D0=BF=D1=83=D1=80?= =?UTF-8?q?=D0=B8=20=D0=A2=D0=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../objects/consumable/food/meals.ftl | 2 ++ .../Objects/Consumable/Food/meals.yml | 25 +++++++++++++++++- .../Recipes/Cooking/meal_recipes.yml | 15 ++++++++++- .../Consumable/Food/meals.rsi/khachapuri.png | Bin 0 -> 803 bytes .../Consumable/Food/meals.rsi/meta.json | 5 +++- 5 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/meals.rsi/khachapuri.png 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..7d3fab1acb9 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 @@ -52,3 +52,5 @@ ent-FoodSaladWatermelonFruitBowl = фруктовый арбузный боул .desc = Единственный салат, в котором можно съесть миску. ent-FoodMealCornInButter = кукуруза в сливочном масле .desc = Маслянистенько. +ent-FoodMealKhachapuri = хачапури + .desc = Большая лепешка, которую дополняет рассольный сыр и свежее яйцо. \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index 1ded684c77a..4108025a91d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -404,7 +404,30 @@ tags: - Meat # Tastes like egg, cheese. - +- type: entity + name: Khachapuri + parent: FoodMealBase + id: FoodMealKhachapuri + 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 + - type: entity name: fried egg parent: FoodMealBase diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 1aace5896e6..f4b9f502cd7 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -675,7 +675,20 @@ Water: 10 solids: FoodBowlBig: 1 - + +- type: microwaveMealRecipe + id: Khachapuri + name: Khachapuri recipe + result: FoodMealKhachapuri + time: 15 + reagents: + Egg: 12 + TableSalt: 5 + Milk: 5 + solids: + FoodCheeseSlice: 1 + FoodBreadPlainSlice: 1 + - type: microwaveMealRecipe id: RecipeRicePudding name: rice pudding recipe diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/khachapuri.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/khachapuri.png new file mode 100644 index 0000000000000000000000000000000000000000..e1ed5d7c6bf00d6b73b06727bc54e7872cd3bade GIT binary patch literal 803 zcmV+;1Kj+HP)Px%-AP12R9HvtmfuTLVHn4sr7f9lwhfmpG?x%Kg%(N|(ekE^<+! z_w#r)+|?!f=;!1;D6p-OJV*DhJBIskD`d$~v>@iK(0Sz8*Z!($FI}4bLcz%wgteyJ z6LR*91}3u4h*~C7jOMH9*D8G($kV_3$t?>^MuMg&8tg zI_XFB7Ue&M6bQ4Un`S2O7>1|{02g3)r~f1aIPF<#*gDAK5dHdSh+SwqS5$r%Y=_v1 zZ{hb8oeCKWg>J%#3wUX>)lSXZy|khAAf-lkv2gMAamoZ9vMU&X0t5zfB={yy7baG8 zH4FooqGKF;^WJev-ZazqP>YfWo4s?t0RaLzgT%f3Qoo1j0!SF#JwAGS?=BrUb%tHQ zNwolw7t6s*?8?Z^CIlvn@mMI{O0f((QJp^*WI$0JXb{-M`NbpfRF zN&N#tTo5sJMW`zy{%YJ%7*_3C>ZVi~ifZC0%l!N-moAbq7FnRvqbW_TRRM5Pbtt6U zAsk3bl%{$>{Q1~z>N|EqX<&NEXb3 Date: Wed, 4 Sep 2024 15:53:25 +0300 Subject: [PATCH 2/8] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=A2=D0=97=20=D0=A5=D0=B0=D1=87=D0=B0=D0=BF=D1=83=D1=80=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Objects/Consumable/Food/meals.ftl | 2 + .../objects/consumable/food/meals.ftl | 4 +- .../Objects/Consumable/Food/meals.yml | 49 ++++++++++++++++++ .../Prototypes/ADT/Recipes/Cooking/fill.txt | 1 - .../ADT/Recipes/Cooking/meal_recipes.yml | 12 +++++ .../Objects/Consumable/Food/meals.yml | 24 --------- .../Consumable/Food/meals.rsi/khachapuri.png | Bin .../Consumable/Food/meals.rsi/meta.json | 14 +++++ .../Consumable/Food/meals.rsi/meta.json | 5 +- 9 files changed, 79 insertions(+), 32 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/meals.ftl create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meals.yml delete mode 100644 Resources/Prototypes/ADT/Recipes/Cooking/fill.txt create mode 100644 Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml rename Resources/Textures/{ => ADT}/Objects/Consumable/Food/meals.rsi/khachapuri.png (100%) create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/meta.json 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 7d3fab1acb9..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,6 +51,4 @@ ent-FoodMealEnchiladas = энчилада ent-FoodSaladWatermelonFruitBowl = фруктовый арбузный боул .desc = Единственный салат, в котором можно съесть миску. ent-FoodMealCornInButter = кукуруза в сливочном масле - .desc = Маслянистенько. -ent-FoodMealKhachapuri = хачапури - .desc = Большая лепешка, которую дополняет рассольный сыр и свежее яйцо. \ No newline at end of file + .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..b7420f26315 --- /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: FoodMealBase + 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: FoodMealBase + 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..eb7871a6ed8 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml @@ -0,0 +1,12 @@ +- type: microwaveMealRecipe + id: Khachapuri + 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/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index 4108025a91d..779a104dd44 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -404,30 +404,6 @@ tags: - Meat # Tastes like egg, cheese. -- type: entity - name: Khachapuri - parent: FoodMealBase - id: FoodMealKhachapuri - 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 - - type: entity name: fried egg parent: FoodMealBase diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/khachapuri.png b/Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/khachapuri.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/meals.rsi/khachapuri.png rename to Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/khachapuri.png 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..d31cbccbe7b --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, taco from https://github.com/ss220-space/Paradise/commit/6c9bd827610433093a79d814b96bd50f9cf12eec, corn in butter from im_kreks", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "khachapuri" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json index ac1559f06a4..e3fa26223a2 100644 --- a/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json @@ -150,9 +150,6 @@ }, { "name": "corn-in-butter" - }, - { - "name": "khachapuri" - } + } ] } From ea87bbf1e22c0ea134fba552857832d6e8137847 Mon Sep 17 00:00:00 2001 From: Inconnu1337 Date: Wed, 4 Sep 2024 22:31:15 +0300 Subject: [PATCH 3/8] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D0=B8=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=B4=D1=83=D0=B1=D0=BB=D0=B8=D0=BA=D0=B0=D1=82=20=D0=B2=20?= =?UTF-8?q?=D0=A5=D0=B0=D1=87=D0=B0=D0=BF=D1=83=D1=80=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/ADT/Entities/Objects/Consumable/Food/meals.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meals.yml index b7420f26315..0328c5bff63 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meals.yml @@ -6,7 +6,7 @@ - type: entity parent: FoodInjectableBase - id: FoodMealBase + id: ADTFoodMealBase abstract: true description: A delicious meal, cooked with love. components: @@ -26,7 +26,7 @@ # Tastes like egg, cheese. - type: entity name: Khachapuri - parent: FoodMealBase + parent: ADTFoodMealBase id: ADTFoodMealKhachapuri description: A large flatbread that complements pickled cheese, fresh egg. components: From ade3f72a662b9df57fff66f32dba0ed2036e87c0 Mon Sep 17 00:00:00 2001 From: Inconnu1337 Date: Wed, 4 Sep 2024 22:38:01 +0300 Subject: [PATCH 4/8] =?UTF-8?q?=D0=A1=D0=BD=D0=BE=D0=B2=D0=B0=20=D0=BC?= =?UTF-8?q?=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml index eb7871a6ed8..cac22640e21 100644 --- a/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml @@ -1,5 +1,5 @@ - type: microwaveMealRecipe - id: Khachapuri + id: ADTKhachapuri name: Khachapuri recipe result: ADTFoodMealKhachapuri time: 15 From 1c8c07203474b17e7719590c361995e38134d7c7 Mon Sep 17 00:00:00 2001 From: Inconnu1337 Date: Thu, 5 Sep 2024 16:59:42 +0300 Subject: [PATCH 5/8] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8..?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Consumable/Food/meals.rsi/meta.json | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/meta.json index d31cbccbe7b..ffbf8c8739a 100644 --- a/Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/meta.json @@ -1,14 +1,14 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, taco from https://github.com/ss220-space/Paradise/commit/6c9bd827610433093a79d814b96bd50f9cf12eec, corn in butter from im_kreks", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "khachapuri" - } - ] -} + "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 From 6fda9128dbbf5b046c98f96b63418e34e8bff1b6 Mon Sep 17 00:00:00 2001 From: Inconnu1337 Date: Sat, 7 Sep 2024 02:41:28 +0300 Subject: [PATCH 6/8] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=87=D0=B5?= =?UTF-8?q?=D1=80=D1=82=20=D0=B8=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B4=D1=83=D0=B1=D0=BB=D0=B8=D0=BA=D0=B0=D1=82?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Entities/Objects/Consumable/Food/meals.yml | 2 +- .../Prototypes/Recipes/Cooking/meal_recipes.yml | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meals.yml index 0328c5bff63..ba7e31fd3b0 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meals.yml @@ -14,7 +14,7 @@ storedRotation: -90 - type: Food - type: Sprite - sprite: ADT\Objects\Consumable\Food\meals.rsi + sprite: ADT/Objects/Consumable/Food/meals.rsi - type: SolutionContainerManager solutions: food: diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 48d16cdcfc8..96a9a471f68 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -706,19 +706,6 @@ solids: FoodBowlBig: 1 -- type: microwaveMealRecipe - id: Khachapuri - name: Khachapuri recipe - result: FoodMealKhachapuri - time: 15 - reagents: - Egg: 12 - TableSalt: 5 - Milk: 5 - solids: - FoodCheeseSlice: 1 - FoodBreadPlainSlice: 1 - - type: microwaveMealRecipe id: RecipeRicePudding name: rice pudding recipe From 7f7076814febfa597dcfc48d8be84eee11a2d7d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Sat, 7 Sep 2024 03:02:32 +0300 Subject: [PATCH 7/8] Update meals.yml --- Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index 779a104dd44..1ded684c77a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -404,6 +404,7 @@ tags: - Meat # Tastes like egg, cheese. + - type: entity name: fried egg parent: FoodMealBase From a9e69e4b8a2126d631543419ca04f5c88c6e3d68 Mon Sep 17 00:00:00 2001 From: Inconnu1337 Date: Sat, 7 Sep 2024 03:18:44 +0300 Subject: [PATCH 8/8] =?UTF-8?q?=D0=A0=D0=B5=D1=86=D0=B5=D0=BF=D1=82=20?= =?UTF-8?q?=D0=A5=D0=B0=D1=87=D0=B0=D0=BF=D1=83=D1=80=D0=B5=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=B2=20=D0=BA=D0=BD?= =?UTF-8?q?=D0=B8=D0=B3=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/ADT/Recipes/Cooking/meal_recipes.yml | 2 +- Resources/ServerInfo/ADT/NewRecipes.xml | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml index cac22640e21..c816632bb77 100644 --- a/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml @@ -1,5 +1,5 @@ - type: microwaveMealRecipe - id: ADTKhachapuri + id: ADTFoodKhachapuriRecipe name: Khachapuri recipe result: ADTFoodMealKhachapuri time: 15 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 + + + + ## Маффины Заметив условия пониженного уровня сахара в крови некоторых членов экипажа, Центральное Командование позволило испекание некоторых новых кондитерских изделий на станциях.