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

Обновка #150

Merged
merged 3 commits into from
Nov 22, 2023
Merged

Обновка #150

merged 3 commits into from
Nov 22, 2023

Conversation

Schrodinger71
Copy link
Collaborator

@Schrodinger71 Schrodinger71 commented Nov 22, 2023 •
edited
Loading

Описание PR

Изменения
🆑

  • add: АКСу-74
  • add: АКСу-74 Йохана
  • add: Плюшевая игрушка Софи

Проверки

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

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 22, 2023 •
edited
Loading

RSI Diff Bot; head commit 9b14da7 merging into 8bbd2ae
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_sofy Added

Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/aksy.rsi

State Old New Status
base Added
bolt-open Added
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added

Resources/Textures/ADT/Objects/Weapons/Guns/Rifels/aksy_iohana.rsi

State Old New Status
base Added
bolt-open Added
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added
mag-0 Added

Edit: diff updated after 9b14da7

@Schrodinger71
Copy link
Collaborator Author

Ля, откуда эта ошибка если я туда не лазил

JustKekc
JustKekc approved these changes Nov 22, 2023
View reviewed changes
Copy link
Collaborator

@JustKekc JustKekc left a comment

Choose a reason for hiding this comment

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

👍

@Schrodinger71 Schrodinger71 merged commit 40252b8 into AdventureTimeSS14:master Nov 22, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JustKekc JustKekc JustKekc 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
@Schrodinger71 @JustKekc