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

добавление именных вещичек #377

Merged
merged 6 commits into from
Aug 30, 2024

Conversation

Bolper
Copy link
Contributor

@Bolper Bolper commented Aug 30, 2024

Описание PR

Ссылка на публикацию в Discord

Медиа

Проверки

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

Изменения
Добавлены именные вещи
Pangarii: Американка без рукавов
Bolper: Ножны, катана, бутсы, плащик, униформа
Rip_zoro:мантия

@github-actions github-actions bot added Changes: Sprites Изменение спрайтов No C# labels Aug 30, 2024
@Bolper
Copy link
Contributor Author

Bolper commented Aug 30, 2024

@Schrodinger71

Copy link
Contributor

github-actions bot commented Aug 30, 2024

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

Resources/Textures/ADT/Personalization/bolper_boots.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/ADT/Personalization/bolper_cloak.rsi

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

Resources/Textures/ADT/Personalization/bolper_jumpsuit.rsi

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

Resources/Textures/ADT/Personalization/bolper_katana.rsi

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

Resources/Textures/ADT/Personalization/bolper_sheaths.rsi

State Old New Status
equipped-BACKPACK Added
sheath-sabre-equipped-BACKPACK Added
sheath-sabre Added
sheath Added

Resources/Textures/ADT/Personalization/pangaari_american_sleeveless.rsi

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

Resources/Textures/ADT/Personalization/rip_zoro_mantle.rsi

State Old New Status
equipped-NECK Added
icon Added

Edit: diff updated after c8ce999

@Schrodinger71
Copy link
Collaborator

Такс

@COTE-LAPYX
Copy link

COTE-LAPYX commented Aug 30, 2024

Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml
312 строка - опечатка в слове pecent -> percent

Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml
935 строка - опечатка, и думаю ты имел ввиду Plus 5 percent attack speed

@Bolper
Copy link
Contributor Author

Bolper commented Aug 30, 2024

Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml 312 строка - опечатка в слове pecent -> percent

0-0

@Bolper Bolper requested a review from Schrodinger71 August 30, 2024 19:08
@github-actions github-actions bot added Changes: Localization Изменение локализации Status: Needs Review labels Aug 30, 2024
@Bolper Bolper requested review from Darkiich and 1Stepka1 August 30, 2024 19:08
@Bolper Bolper changed the title добавление именных вещичек, недоделано добавление именных вещичек Aug 30, 2024
@Bolper
Copy link
Contributor Author

Bolper commented Aug 30, 2024

Resources/Prototypes/ADT/Entities/Personalization/Clothing/personalization_clothing.yml
312 строка - опечатка в слове pecent -> percent

Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml
935 строка - опечатка, и думаю ты имел ввиду Plus 5 percent attack speed

Screenshot_2024-08-30-22-16-12-647_com.github.android.png

@COTE-LAPYX
Copy link

Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml
935 строка, не исправил опечатку в слове pecent -> percent

Copy link
Collaborator

@1Stepka1 1Stepka1 left a comment

Choose a reason for hiding this comment

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

Каких-то проблем не вижу,если тесты ок то в основном все ок,если есть что-то допилить тут то допиливай

@Bolper
Copy link
Contributor Author

Bolper commented Aug 30, 2024

Resources/Prototypes/ADT/Entities/Personalization/Objects/personalization_items.yml
935 строка, не исправил опечатку в слове pecent -> percent

Пиздец душат

@Bolper
Copy link
Contributor Author

Bolper commented Aug 30, 2024

Каких-то проблем не вижу,если тесты ок то в основном все ок,если есть что-то допилить тут то допиливай

Всё допилено

@Bolper
Copy link
Contributor Author

Bolper commented Aug 30, 2024

Просто в следущий раз нахрен удалю описания вне фтл

@Bolper Bolper added this pull request to the merge queue Aug 30, 2024
@COTE-LAPYX
Copy link

COTE-LAPYX commented Aug 30, 2024

Пиздец душат

Если делать, то делать правильно.

Merged via the queue into AdventureTimeSS14:master with commit 0db8d80 Aug 30, 2024
11 checks passed
@Bolper Bolper deleted the name`s_Clothing branch August 30, 2024 19:56
@Bolper
Copy link
Contributor Author

Bolper commented Aug 30, 2024

Пиздец душат
Если делать, то делать правильно.

Дак это понятно и не возражаю

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C#
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants