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.

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

Добавлены шоколадные батончики #153

Merged
merged 7 commits into from
Jul 31, 2024

Conversation

Schrodinger71
Copy link
Collaborator

@Schrodinger71 Schrodinger71 commented Jul 30, 2024

Описание PR

Перенос AdventureTimeSS14/space_station#332

Проверки

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

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

github-actions bot commented Jul 30, 2024

RSI Diff Bot; head commit 434fe2b merging into 8c6b232
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/bars.rsi

State Old New Status
bar-choco Added
bar-coconut Added
bar-energy Added
bar-nuts Added
bar-pink Added
bar-two Added

Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/packing.rsi

State Old New Status
choco-packed Added
coconut-packed Added
energy-packed Added
nuts-packed Added
pink-packed Added
two-packed Added

Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi

State Old New Status
choco-trash Added
coconut-trash Added
energy-trash Added
nuts-trash Added
pink-trash Added
two-trash Added

Edit: diff updated after 434fe2b

…tl to Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/chocolate.ftl
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.

все что chocolate.yml и chocolate.ftl перенести по тем же путям в snacks.
А именно Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml и Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/snacks.ftl соответственно
К текстурам вопросов нету

@github-actions github-actions bot added Status: Awaiting Changes Ожидание изменений and removed Status: Needs Review labels Jul 31, 2024
@Schrodinger71 Schrodinger71 requested a review from 1Stepka1 July 31, 2024 09:43
@github-actions github-actions bot added Status: Needs Review and removed Status: Awaiting Changes Ожидание изменений labels Jul 31, 2024
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.

nice ass bro

@Schrodinger71 Schrodinger71 added this pull request to the merge queue Jul 31, 2024
Merged via the queue into master with commit 870372a Jul 31, 2024
16 checks passed
@Schrodinger71 Schrodinger71 deleted the adt_food branch July 31, 2024 09:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C#
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants