Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Хачапуре ТЗ от Дубика #400

Merged
merged 17 commits into from
Sep 7, 2024
Merged

Хачапуре ТЗ от Дубика #400

merged 17 commits into from
Sep 7, 2024

Conversation

Inconnu1337
Copy link
Contributor

@Inconnu1337 Inconnu1337 commented Sep 3, 2024 •
edited by Schrodinger71
Loading

Описание PR

Проверки

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения

🆑 Inconnu

  • add: Добавлено Хачапуре, рецепт приготовления и перевод.

@github-actions github-actions bot added Changes: Sprites Изменение спрайтов No C# Changes: Localization Изменение локализации labels Sep 3, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Sep 3, 2024 •
edited
Loading

RSI Diff Bot; head commit 9674c4f merging into 4a4a68d
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi

State Old New Status
khachapuri Added

Edit: diff updated after 9674c4f

@Inconnu1337 Inconnu1337 changed the title Хачапури ТЗ от Дубика Хачапурt ТЗ от Дубика Sep 3, 2024
@Inconnu1337 Inconnu1337 changed the title Хачапурt ТЗ от Дубика Хачапуре ТЗ от Дубика Sep 3, 2024
FaDeOkno
FaDeOkno requested changes Sep 3, 2024
View reviewed changes
Copy link
Collaborator

@FaDeOkno FaDeOkno left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Всё супер, осталась пара незначительных моментов

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/meals.ftl Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml Show resolved Hide resolved
Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml Outdated Show resolved Hide resolved
@Schrodinger71
Copy link
Collaborator

Юбилейный пр 🥳

@Inconnu1337 Inconnu1337 requested a review from FaDeOkno September 4, 2024 12:57
@Schrodinger71
Copy link
Collaborator

Schrodinger71 commented Sep 4, 2024 •
edited
Loading

@Inconnu1337
дубликат
image

1Stepka1
1Stepka1 previously requested changes Sep 5, 2024
View reviewed changes
Copy link
Collaborator

@1Stepka1 1Stepka1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Вкину ещë к тому что котя добавил

Resources/Textures/ADT/Objects/Consumable/Food/meals.rsi/meta.json Outdated Show resolved Hide resolved
@1Stepka1 1Stepka1 dismissed their stale review September 5, 2024 14:41

требования выполнены

@Bolper
Copy link
Contributor

Bolper commented Sep 5, 2024

@Inconnu1337
на будущее, если ты решил проблему, то нажимай кнопочке "resolve conservation"
Чтобы знали, ты решил проблему или нет~
image

@Schrodinger71 Schrodinger71 dismissed 1Stepka1’s stale review September 7, 2024 00:15

Отзываю, исправлено

@Schrodinger71 Schrodinger71 added this pull request to the merge queue Sep 7, 2024
Merged via the queue into AdventureTimeSS14:master with commit bdd9b0c Sep 7, 2024
13 checks passed
@Inconnu1337 Inconnu1337 deleted the FoodMealKhachapuri branch September 7, 2024 00:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FaDeOkno FaDeOkno FaDeOkno approved these changes

@Schrodinger71 Schrodinger71 Schrodinger71 approved these changes

@1Stepka1 1Stepka1 1Stepka1 left review comments

Assignees
No one assigned
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C# Status: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Inconnu1337 @Schrodinger71 @Bolper @1Stepka1 @FaDeOkno