-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
<!-- ЭТО ШАБЛОН ВАШЕГО PULL REQUEST. Текст между стрелками - это комментарии - они не будут видны в PR. --> ## Описание PR <!-- Ниже опишите ваш Pull Request. Что он изменяет? На что еще это может повлиять? Постарайтесь описать все внесённые вами изменения! --> <!-- Укажите ссылки на соответствующие обсуждения, проблемы, баги, заказы в разработку или предложения Если ссылки отсутствуют или этот PR ваша личная инициатива, данный раздел описания можно удалить. --> <!-- Если приемлемо, добавьте скриншоты для демонстрации вашего PR. Если ваш PR представляет собой визуальное изменение, добавьте скриншоты, иначе он может быть закрыт. --> **Проверки** <!-- Выполнение всех следующих действий, если это приемлемо для вида изменений сильно ускорит разбор вашего PR --> - [x] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [x] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [x] Я запускал локальный сервер со своими изменениями и всё протестировал. - [x] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. **Изменения** <!-- Здесь вы можете написать список изменений, который будет автоматически добавлен в игру, когда ваш PR будет принят. В журнал изменений следует помещать только то, что действительно важно игрокам. В списке изменений тип значка не является часть предложения, поэтому явно указывайте - Добавлен, Удалён, Изменён. плохо: - add: Новый инструмент для инженеров хорошо: - add: Добавлен новый инструмент для инженеров Вы можете указать своё имя после символа 🆑 именно оно будет отображаться в журнале изменений (иначе будет использоваться ваше имя на GitHub) Например: 🆑 Ia --> 🆑 Inconnu - add: Добавлено Хачапуре, рецепт приготовления и перевод. --------- Co-authored-by: Schrödinger <[email protected]>
- Loading branch information
1 parent
4a4a68d
commit bdd9b0c
Showing
9 changed files
with
90 additions
and
3 deletions.
There are no files selected for viewing
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/meals.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ent-ADTFoodMealKhachapuri = хачапури | ||
.desc = Большая лепешка, которую дополняет рассольный сыр и свежее яйцо. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meals.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+803 Bytes
Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/khachapuri.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions
14
Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" | ||
} | ||
] | ||
} |