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

добавление именной гитары #311

Merged

Conversation

walter-no-orochi
Copy link
Contributor

@walter-no-orochi walter-no-orochi commented Jan 11, 2024

Описание PR

Проверки

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

Изменения

🆑

  • add: Именная гитара Харитона.

@github-actions github-actions bot added the No C# label Jan 11, 2024
@Schrodinger71 Schrodinger71 added the DO NOT MERGE Не мерджить label Jan 11, 2024
description: The guitar of strict colors of one strict person. Black keys like a synthesizer are visible on the side of the guitar.
components:
- type: Sprite
sprite: ADT/Objects/Fun/Rock-guitar.rsi
Copy link
Collaborator

Choose a reason for hiding this comment

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

Rock-guitar.rsi заменить на Rock_guitar.rsi и снизу также

@@ -0,0 +1,18 @@
{
Copy link
Collaborator

Choose a reason for hiding this comment

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

Изменить название папки на новое Rock_guitar.rsi

state: icon
- type: Item
size: Normal
sprite: ADT/Objects/Fun/Rock-guitar.rsi
Copy link
Collaborator

Choose a reason for hiding this comment

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

Rock_guitar.rsi на конце

Copy link
Contributor

github-actions bot commented Jan 12, 2024

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

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

State Old New Status
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after 26c1453

@Schrodinger71 Schrodinger71 removed the DO NOT MERGE Не мерджить label Jan 16, 2024
@Schrodinger71 Schrodinger71 merged commit ab78ee1 into AdventureTimeSS14:master Jan 16, 2024
8 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants