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

Новые плюшки + удалил ебучий звук, заебавший всех #546

Closed
wants to merge 3 commits into from
Closed

Новые плюшки + удалил ебучий звук, заебавший всех #546

wants to merge 3 commits into from

Conversation

pxc1984
Copy link
Contributor

@pxc1984 pxc1984 commented Oct 24, 2024 •
edited
Loading

🆑 Pacable

  • add: Добавлены 3 новые плюшки.
  • remove: Удалены звуки Папича у некоторых плюшек.

@pxc1984 pxc1984 requested a review from VigersRay as a code owner October 24, 2024 14:12
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 24, 2024 •
edited
Loading

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

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

State Old New Status
plushie-agata Added
plushie-lu Added
plushie-milos-tan Added
syndie-visor Added

Edit: diff updated after 306a210

@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

VigersRay
VigersRay requested changes Oct 30, 2024
View reviewed changes
Copy link
Collaborator

@VigersRay VigersRay left a comment

Choose a reason for hiding this comment

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

Кооооонфликты

@Rinary1
Copy link
Contributor

Rinary1 commented Oct 30, 2024

перевооооооод

@Rinary1 Rinary1 mentioned this pull request Oct 30, 2024
Merged
3 tasks
@VigersRay
Copy link
Collaborator

Перезалито в #568

@VigersRay VigersRay closed this Oct 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@VigersRay VigersRay VigersRay requested changes

Assignees
No one assigned
Labels
Merge Conflict Изменения: Спрайты Нет C#
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@pxc1984 @Rinary1 @VigersRay