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

Tea #446

Merged
merged 19 commits into from
Sep 10, 2024
Merged

Tea #446

merged 19 commits into from
Sep 10, 2024
+236 −32

Conversation

Filokini
Copy link
Contributor

@Filokini Filokini commented Sep 10, 2024 •
edited by Schrodinger71
Loading

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

🆑 Filo

  • add: Добавлен свой рандомайзер имен для сумеречников
  • fix: Исправлены спрайты и локаль, чтобы не возникало проблем.

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

Если будут ошибки, то нахуй, я спать.

@github-actions GitHub Actions
Copy link
Contributor

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

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

Resources/Textures/ADT/Mobs/Customization/Shadekin/shadekin_tails_64x32.rsi

State Old New Status
hook_lines Modified
hook_snake Modified
hook_traced Modified
snail_gradient Modified
tail_hook Modified

Edit: diff updated after e20022c

@Filokini
Copy link
Contributor Author

Если когда я проснусь не будет мерджнуто, то я сделаю еще одну правку

Schrodinger71
Schrodinger71 approved these changes Sep 10, 2024
View reviewed changes
Copy link
Collaborator

@Schrodinger71 Schrodinger71 left a comment

Choose a reason for hiding this comment

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

гуд

@FaDeOkno
Copy link
Collaborator

Ъуъ

@FaDeOkno
Copy link
Collaborator

Опередил меня

@Filokini
Copy link
Contributor Author

Вы типо починили ошибки и шас смотрите тут?

FaDeOkno
FaDeOkno approved these changes Sep 10, 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.

Гуд гуд

@Schrodinger71
Copy link
Collaborator

Ждём тесты

@Filokini Filokini added this pull request to the merge queue Sep 10, 2024
Merged via the queue into AdventureTimeSS14:master with commit ee4cee3 Sep 10, 2024
13 checks passed
@Filokini Filokini deleted the tea branch September 10, 2024 10:37
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

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.
3 participants
@Filokini @FaDeOkno @Schrodinger71