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

Фикс звуков эмоции молей (Ниан) #326

Merged
merged 4 commits into from
Aug 21, 2024

Conversation

Lonkuk
Copy link
Contributor

@Lonkuk Lonkuk commented Aug 21, 2024

Описание PR

Медиа

Desktop-2024.08.21-18.22.37.02.mp4

Проверки

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

Изменения

🆑 Nezervou

  • fix: Возвращены звуки эмоций Нианов.

@github-actions github-actions bot added No C# Changes: Localization Изменение локализации labels Aug 21, 2024
Copy link
Contributor

@Darkiich Darkiich left a comment

Choose a reason for hiding this comment

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

Ну в принципе, все ок

Copy link
Contributor

@Bolper Bolper left a comment

Choose a reason for hiding this comment

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

У меня нет вопросов в целом по данному ПРу кроме двух данных файлов.

Copy link
Contributor

Choose a reason for hiding this comment

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

Это зачем трогали

Copy link
Contributor

Choose a reason for hiding this comment

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

И это тоже зачем трогали

Copy link
Contributor

Choose a reason for hiding this comment

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

Чтобы локализация была русская, ее попросту нету

Copy link
Contributor

Choose a reason for hiding this comment

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

Она есть в файлах адт, как я помню

Copy link
Contributor

Choose a reason for hiding this comment

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

Она есть в файлах адт, как я помню

Повторюсь, в игре она не используется

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Локализация была сломана
было
Screenshot_1292
стало
Screenshot_1293

Copy link
Contributor

Choose a reason for hiding this comment

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

Так. Ладно
У нас есть такая локализация, которую я вижу
Screenshot_2024-08-21-19-03-14-595_com.github.android.png

Тогда было бы не плохо заменить это на МакНиан

Copy link
Contributor

Choose a reason for hiding this comment

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

Согласны? Нет?
Мне апрув то дать не тяжело, если лень изменить.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Щяс...

Copy link
Contributor

@Bolper Bolper left a comment

Choose a reason for hiding this comment

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

Желание изменить на МакНиан остаётся за вами.

@Lonkuk Lonkuk added this pull request to the merge queue Aug 21, 2024
Merged via the queue into AdventureTimeSS14:master with commit ad2120b Aug 21, 2024
8 of 9 checks passed
@Lonkuk Lonkuk deleted the moth branch August 21, 2024 16:18
@Darkiich
Copy link
Contributor

Отлично

Ratyyy added a commit that referenced this pull request Sep 11, 2024
* Plasma-recharge system for cutters

* Cutters rebalance

* Asteroid rock fix

* Remove ATLAS from pull, yea (#326)

* How did it get here?

* Shit happens

* Cutters system upgrade

* Add funny shape for cutters (+RP)

* Adv cutter recipe & craft nerf

* "Ion cutters" are no more!

* "shitty code" is now less "shitty"

* "Equipment" to "Weapon"

* Clear code

* Add `technologyPrerequisites:`

* I don't know how this happen

* `AddCharge` raises localevent now
# Conflicts:
#	Resources/Locale/en-US/research/technologies.ftl
#	Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl
#	Resources/Locale/ru-RU/research/technologies.ftl
#	Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Recipes/Lathes/security.yml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации No C#
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants