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

head garment bag #219

Merged
merged 5 commits into from
Aug 17, 2023
Merged

head garment bag #219

merged 5 commits into from
Aug 17, 2023

Conversation

Elst28
Copy link

@Elst28 Elst28 commented Aug 15, 2023 •
edited
Loading

О запросе слияния

Добавила мешки с одеждой (Прям как на ТГ). Которые делают шкафы глав менее мусорными
Медиа
Няда

  • Я добавила скриншоты/видео к этому запросу слияния, демонстрирующие его изменения в игре, или этот запрос слияния не требует демонстрации в игре

Чейнджлог

🆑

  • add: Добавлены мешки с одеждой глав в их шкафы

@github-actions
Copy link

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

@github-actions
Copy link

github-actions bot commented Aug 15, 2023 •
edited
Loading

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

Resources/Textures/Objects/Storage/Briefcases/garment_bag.rsi

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

Edit: diff updated after 9f1bb60

@Barbatros
Copy link

:uncannycat:

@Mr0maks
Copy link

Mr0maks commented Aug 16, 2023 •
edited
Loading

Зарезолвил конфликт, тебе надо немного добавить новой одежды КМа в сумку.

@Mr0maks
Copy link

Mr0maks commented Aug 16, 2023 •
edited
Loading

Failed TestSufficientSpaceForFill [22 ms]
У сумки HoS'а недостаточно места для наполнения одеждой, ботинки видимо не влезли.

@Elst28
Copy link
Author

Elst28 commented Aug 17, 2023

Мгм, водолазки КМа добавила, и увеличила вместимость до 105

@Barbatros
Copy link

:uncannycat:

Mr0maks
Mr0maks approved these changes Aug 17, 2023
View reviewed changes
Copy link

@Mr0maks Mr0maks left a comment

Choose a reason for hiding this comment

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

LGTM

@Mr0maks Mr0maks merged commit 5618b6b into Workbench-Team:arumoon-server Aug 17, 2023
17 checks passed
@Elst28 Elst28 deleted the clothhead branch August 17, 2023 19:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mr0maks Mr0maks Mr0maks approved these changes

Assignees
No one assigned
Labels
Changes: Sprites No C#
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Elst28 @Barbatros @Mr0maks