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

shaverma #39

Merged
merged 34 commits into from
Nov 13, 2024
Merged

shaverma #39

merged 34 commits into from
Nov 13, 2024

Conversation

jailedfish
Copy link

@jailedfish jailedfish commented Nov 10, 2024 •
edited
Loading

Описание PR

Добавлена шаверма, готовящаяся в 2 этапа:

  • 5 секунд 2 мясо, тесто, томат
  • 15 секунд шаверма

Почему / Баланс

Попросили здесь / готовая шаверма чуть лучше тако, так что баланс в норме

Ссылка на ветку

https://discordapp.com/channels/919301044784226385/1304645328556916818

Технические детали

  • добавлена шаверма в двух вариантах (не испечённая и готовая) (./Resources/Prototypes/Entities/Objects/Consumable/Food/shaverma-unbaked.yml и ./Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml)
  • добавлен её спрайт (./Resources/Textures/Objects/Consumable/Food/shavuha.rsi/) (лучше переделать)
  • добавлен рецепт (./Resources/Prototypes/Recipes/Cooking/meal_recipes.yml)

Медиа

vii

Список изменений
🆑

  • add: Добавлена шаурма.

@jailedfish jailedfish requested a review from Morb0 as a code owner November 10, 2024 21:52
@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 10, 2024 •
edited
Loading

RSI Diff Bot; head commit 64faa23 merging into bd06ed9
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_CorvaxNext/Objects/Consumable/Food/shavuha.rsi

State Old New Status
baked Added
unbaked Added

Edit: diff updated after 64faa23

jailedfish
jailedfish commented Nov 10, 2024
View reviewed changes
Copy link
Author

@jailedfish jailedfish left a comment

Choose a reason for hiding this comment

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

Ну мне нравится, что

@github-actions github-actions bot added the Changes: Localization Изменяет локализацию label Nov 11, 2024
FireNameFN
FireNameFN requested changes Nov 11, 2024
View reviewed changes
Copy link
Collaborator

@FireNameFN FireNameFN left a comment

Choose a reason for hiding this comment

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

Не забывай про то, что всё должно быть в _CorvaxNext.

Resources/Textures/Objects/Consumable/Food/shavuha.rsi/baked.png Outdated Show resolved Hide resolved
Resources/Textures/Objects/Consumable/Food/shavuha.rsi/meta.json Outdated Show resolved Hide resolved
Resources/Textures/Objects/Consumable/Food/shavuha.rsi/unbaked.png Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/shaverma-baked.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Objects/Consumable/Food/shaverma-unbaked.yml Outdated Show resolved Hide resolved
...es/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/baked/shaverma-baked.ftl Outdated Show resolved Hide resolved
Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/shaverma-unbaked.ftl Outdated Show resolved Hide resolved
@jailedfish
Copy link
Author

всё поправил, вроде работает

@FireNameFN
Copy link
Collaborator

Я изменил ченджлог, если что.

@FireNameFN
Copy link
Collaborator

А по прототипам проблем не вижу. Ждём Кмин и Авейра.

@jailedfish
Copy link
Author

@AwareFoxy

@AwareFoxy
Copy link
Collaborator

Дома буду посмотрю

AwareFoxy
AwareFoxy requested changes Nov 12, 2024
View reviewed changes
Copy link
Collaborator

@AwareFoxy AwareFoxy 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/_corvaxnext/entities/objects/consumable/food/shaverma.ftl Outdated Show resolved Hide resolved
Resources/Locale/ru-RU/_corvaxnext/entities/objects/consumable/food/shaverma.ftl Outdated Show resolved Hide resolved
@jailedfish jailedfish requested a review from AwareFoxy November 12, 2024 21:22
AwareFoxy
AwareFoxy previously approved these changes Nov 13, 2024
View reviewed changes
@jailedfish
Copy link
Author

@AwareFoxy мёрдж пж

@FireNameFN
Copy link
Collaborator

@AwareFoxy мёрдж пж

А чеки исправлять? У тебя там ещё какой-то rsi не используется.

@jailedfish
Copy link
Author

неиспользуемый rsi поправил, а тесты и на чистом билде не запускаются

@jailedfish
Copy link
Author

@AwareFoxy

@jailedfish
Copy link
Author

ну всё, самое время апрувить

@AwareFoxy
Copy link
Collaborator

Выглядит вкусно, пахнет вкусно, кушать можно.

@AwareFoxy AwareFoxy merged commit 9ed74fd into space-syndicate:master Nov 13, 2024
13 checks passed
@hiucko
Copy link

hiucko commented Nov 13, 2024

Легенда ахаха 🥇 , спасибо за шаурму

ksen0morph added a commit that referenced this pull request Nov 13, 2024
@ksen0morph
Revert "shaverma (#39)"
aa66d79 
This reverts commit 9ed74fd.
@ksen0morph ksen0morph mentioned this pull request Nov 13, 2024
Merged
ksen0morph added a commit that referenced this pull request Nov 13, 2024
@ksen0morph
Revert "shaverma (#39)" (#48)
a3f519e 
This reverts commit 9ed74fd.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FireNameFN FireNameFN FireNameFN left review comments

@AwareFoxy AwareFoxy AwareFoxy left review comments

@Morb0 Morb0 Awaiting requested review from Morb0

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
@jailedfish @FireNameFN @AwareFoxy @hiucko @onlyfans12