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

Игрушки. #262

Merged
merged 6 commits into from
Dec 31, 2023
Merged

Игрушки. #262

merged 6 commits into from
Dec 31, 2023

Conversation

1Altius
Copy link
Collaborator

@1Altius 1Altius commented Dec 31, 2023 •
edited
Loading

Описание PR

Проверки

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

Изменения

🆑

  • add: Игрушка Тео
  • add: Игрушка Джунгарика
  • add: Игрушка Мигеля

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 31, 2023 •
edited
Loading

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

Resources/Textures/ADT/Objects/Fun/toys.rsi

State Old New Status
plushie_jungar Added
plushie_migel Added
plushie_teo Added

Edit: diff updated after ccc31d9

@1Altius
Revert "Игрушки."
363707d 
This reverts commit c94b8fe.
@Schrodinger71
Copy link
Collaborator

По новой всё

Schrodinger71
Schrodinger71 approved these changes Dec 31, 2023
View reviewed changes
Copy link
Collaborator

@Schrodinger71 Schrodinger71 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Пойдёт

@Schrodinger71 Schrodinger71 merged commit e7cf270 into AdventureTimeSS14:master Dec 31, 2023
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Schrodinger71 Schrodinger71 Schrodinger71 approved these changes

Assignees
No one assigned
Labels
Changes: Localization Changes: Sprites No C#
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@1Altius @Schrodinger71