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

[ПЕРЕНОС] Именные вещи #335

Merged
merged 5 commits into from
Aug 24, 2024
Merged

[ПЕРЕНОС] Именные вещи #335

merged 5 commits into from
Aug 24, 2024

Conversation

Darkiich
Copy link
Contributor

@Darkiich Darkiich commented Aug 22, 2024 •
edited by Schrodinger71
Loading

Описание PR

Этот ПР переносить именные вещи команды (возможно не все). Старался по максимуму перенести все которые попадали под раздачу
Медиа

Проверки

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

Изменения

🆑

  • add: Добавлены именные вещи команды

@Darkiich Darkiich self-assigned this Aug 22, 2024
@github-actions github-actions bot added Changes: Sprites Изменение спрайтов No C# Changes: Localization Изменение локализации labels Aug 22, 2024
@Darkiich Darkiich requested a review from 1Stepka1 August 22, 2024 21:46
@Darkiich Darkiich removed Changes: Sprites Изменение спрайтов No C# Changes: Localization Изменение локализации labels Aug 22, 2024
@Darkiich Darkiich linked an issue Aug 22, 2024 that may be closed by this pull request
Вернуть именные вещи #272
Closed
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 22, 2024 •
edited
Loading

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

Resources/Textures/ADT/Objects/Misc/sec_auditor_briefcase.rsi

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

Resources/Textures/ADT/Personalization/Rock_guitar.rsi

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

Resources/Textures/ADT/Personalization/aidan_coat.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/ADT/Personalization/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

Resources/Textures/ADT/Personalization/decard_gold.rsi

State Old New Status
base Added
equipped-BELT Added
inhand-left Added
inhand-right Added
mag-unshaded-0 Added
mag-unshaded-1 Added
mag-unshaded-2 Added
mag-unshaded-3 Added

Resources/Textures/ADT/Personalization/flippolighter_johan.rsi

State Old New Status
inhand-left-flame Added
inhand-left Added
inhand-right-flame Added
inhand-right Added
lighter_flame Added
zippo-inhand-left-flame Added
zippo-inhand-left Added
zippo-inhand-right-flame Added
zippo-inhand-right Added
zippo_icon_base Added
zippo_open Added
zippo_top Added

Resources/Textures/ADT/Personalization/flippolighter_schrodinger.rsi

State Old New Status
inhand-left-flame Added
inhand-left Added
inhand-right-flame Added
inhand-right Added
lighter_flame Added
zippo-inhand-left-flame Added
zippo-inhand-left Added
zippo-inhand-right-flame Added
zippo-inhand-right Added
zippo_icon_base Added
zippo_open Added
zippo_top Added

Resources/Textures/ADT/Personalization/johan_cap.rsi

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

Resources/Textures/ADT/Personalization/johan_coat.rsi

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

Resources/Textures/ADT/Personalization/johan_pants.rsi

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

Resources/Textures/ADT/Personalization/kivchikset_beret.rsi

State Old New Status
equipped-HELMET-hamster Added
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Personalization/kivchikset_boots.rsi

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

Resources/Textures/ADT/Personalization/kivchikset_cloak.rsi

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

Resources/Textures/ADT/Personalization/kivchikset_gloves.rsi

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

Resources/Textures/ADT/Personalization/kivchikset_satchel.rsi

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

Resources/Textures/ADT/Personalization/kivchikset_skirt.rsi

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

Resources/Textures/ADT/Personalization/melnikov_case.rsi

State Old New Status
burnt-icon Added
cigar1 Added
cigar2 Added
cigar3 Added
cigar4 Added
cigar5 Added
cigar6 Added
cigar7 Added
cigar8 Added
closed Added
inhand-left Added
inhand-right Added
open Added

Resources/Textures/ADT/Personalization/mendosa_soft.rsi

State Old New Status
equipped-HELMET-hamster Added
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/ADT/Personalization/pyotr_cap.rsi

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

Resources/Textures/ADT/Personalization/pyotr_cloak.rsi

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

Resources/Textures/ADT/Personalization/pyotr_coat.rsi

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

Resources/Textures/ADT/Personalization/pyotr_jumpsuit.rsi

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

Resources/Textures/ADT/Personalization/pyotr_officialsuit.rsi

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

Resources/Textures/ADT/Personalization/pyotr_sabre.rsi

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

Resources/Textures/ADT/Personalization/pyotr_sheath.rsi

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

Resources/Textures/ADT/Personalization/pyotr_uniform.rsi

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

Resources/Textures/ADT/Personalization/schrodinger_coat.rsi

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

Resources/Textures/ADT/Personalization/suit_aidan.rsi

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

Resources/Textures/ADT/Personalization/toys.rsi

State Old New Status
holoplush Added
magicplush Added
ntb-inhand-left Added
ntb-inhand-right Added
ntb Added
plushie_abigail Added
plushie_afi Added
plushie_akula Added
plushie_amira Added
plushie_ayus Added
plushie_azalia Added
plushie_bob Added
plushie_darina Added
plushie_dekus Added
plushie_ellis Added
plushie_evgeniy Added
plushie_fries Added
plushie_ilumi Added
plushie_iohan Added
plushie_jan Added
plushie_jason Added
plushie_jessie Added
plushie_jungar Added
plushie_koff Added
plushie_kus Added
plushie_liexer Added
plushie_lilit Added
plushie_lo Added
plushie_luke Added
plushie_lya Added
plushie_ma Added
plushie_migel Added
plushie_nova Added
plushie_ovai Added
plushie_peter Added
plushie_pochita Added
plushie_prazat Added
plushie_rebecca Added
plushie_riker Added
plushie_sati Added
plushie_schrodinger Added
plushie_sofy Added
plushie_teo Added
plushie_terenty Added
plushie_timrika Added
plushie_uma Added
plushie_ursus Added
plushie_uvarov Added
plushie_valtor Added
plushie_walter Added
plusie_mio Added
pochita-inhand-left Added
pochita-inhand-right Added
rainbowcarpplush Added
shark_inhand-left Added
shark_inhand-right Added
shark_mini_pink Added

Edit: diff updated after d3dca0f

@Bolper
Copy link
Contributor

Bolper commented Aug 23, 2024

Меня опять дубик забулил

@github-actions github-actions bot added Changes: Sprites Изменение спрайтов No C# Changes: Localization Изменение локализации labels Aug 23, 2024
@Darkiich Darkiich requested a review from Bolper August 23, 2024 13:59
@Darkiich
Copy link
Contributor Author

Капец, ошибки вылезли после апстрима

1Stepka1
1Stepka1 reviewed Aug 23, 2024
View reviewed changes
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

Bolper commented Aug 24, 2024

Капец, ошибки вылезли после апстрима

апстрим говно!

@Darkiich Darkiich added this pull request to the merge queue Aug 24, 2024
Merged via the queue into AdventureTimeSS14:master with commit 6190085 Aug 24, 2024
15 checks passed
@Darkiich Darkiich deleted the person branch August 24, 2024 17:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@1Stepka1 1Stepka1 1Stepka1 approved these changes

@Bolper Bolper Awaiting requested review from Bolper

Assignees

@Darkiich Darkiich

Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов No C# Status: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Вернуть именные вещи
3 participants
@Darkiich @Bolper @1Stepka1