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

[Port] CaptainDrobe #58

Merged
merged 2 commits into from
Nov 22, 2024
Merged

Conversation

PuroSlavKing
Copy link

@PuroSlavKing PuroSlavKing commented Nov 14, 2024

Описание PR

Taken from: WWhiteDreamProject/wwdpublic#123

Добавьте новые вещи в лодаут сами, я не хочу

Почему / Баланс

Потому-что забитый сверх вместимости шкаф, что аж вещи не закрываются в нём - отстой.
Потому-что блюспейс комод - отстой.
У капитана одежды больше чем в любом отделе, заслуживает шкаф, в отличии от ботаников.

Ссылка на ветку

Технические детали

Медиа

Примерка:
image

КапитанШкаф:
image
image

Критические изменения

Список изменений
🆑 PuroSlavKing

  • add: Добавлен КапитанШкаф, содержащий в себе все вещи капитана.
  • add: Добавлены новые стили одежды капитана: белый, шериф, командный.

Copy link

github-actions bot commented Nov 14, 2024

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

Resources/Textures/_CorvaxNext/Clothing/Belt/sheriff_sheath.rsi

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

Resources/Textures/_CorvaxNext/Clothing/Belt/white_sheath.rsi

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

Resources/Textures/_CorvaxNext/Clothing/Hands/sheriff_gloves.rsi

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

Resources/Textures/_CorvaxNext/Clothing/Hands/white_captain_gloves.rsi

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

Resources/Textures/_CorvaxNext/Clothing/Head/Hats/sheriff_beret.rsi

State Old New Status
equipped-HELMET-vox Added
equipped-HELMET Added
icon Added

Resources/Textures/_CorvaxNext/Clothing/Head/Hats/sheriff_capcap.rsi

State Old New Status
equipped-HELMET-hamster Added
equipped-HELMET-vox Added
equipped-HELMET Added
icon Added

Resources/Textures/_CorvaxNext/Clothing/Head/Hats/white_beret.rsi

State Old New Status
equipped-HELMET-vox Added
equipped-HELMET Added
icon Added

Resources/Textures/_CorvaxNext/Clothing/Head/Hats/white_capcap.rsi

State Old New Status
equipped-HELMET-hamster Added
equipped-HELMET Added
icon Added

Resources/Textures/_CorvaxNext/Clothing/Neck/Cloaks/royal_captain.rsi

State Old New Status
equipped-NECK-reptilian Added
equipped-NECK Added
icon Added

Resources/Textures/_CorvaxNext/Clothing/Neck/Cloaks/syndicate_admiral.rsi

State Old New Status
equipped-NECK-reptilian Added
equipped-NECK Added
icon Added

Resources/Textures/_CorvaxNext/Clothing/Neck/Cloaks/white_captain_mantle.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/_CorvaxNext/Clothing/Neck/Cloaks/wide_captain_cloak.rsi

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

Resources/Textures/_CorvaxNext/Clothing/Uniforms/Jumpskirt/white_captain.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Added
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/_CorvaxNext/Clothing/Uniforms/Jumpsuit/captain_command.rsi

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

Resources/Textures/_CorvaxNext/Clothing/Uniforms/Jumpsuit/captain_white.rsi

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

Resources/Textures/_CorvaxNext/Clothing/Uniforms/Jumpsuit/sheriff.rsi

State Old New Status
equipped-INNERCLOTHING-reptilian Added
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/_CorvaxNext/Structures/Machines/VendingMachines/captaindrobe.rsi

State Old New Status
broken Added
normal-unshaded Added
off Added
panel Added

Edit: diff updated after 874a37c

lzk228
lzk228 previously requested changes Nov 14, 2024
Copy link
Collaborator

@lzk228 lzk228 left a comment

Choose a reason for hiding this comment

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

не заполнил почему баланс

@PuroSlavKing
Copy link
Author

не заполнил почему баланс

Потому-что гибпалка не требует объяснений

AwareFoxy
AwareFoxy previously approved these changes Nov 15, 2024
@AwareFoxy
Copy link
Collaborator

Тесты не проходят.

@AwareFoxy
Copy link
Collaborator

Надо замаппить говно(мерге конфликтс)/добавить в лоадаут
Я могу и сам добавить, только чуть позже

@PuroSlavKing
Copy link
Author

Надо замаппить говно(мерге конфликтс)/добавить в лоадаут
Я могу и сам добавить, только чуть позже

Мерге конфликтс будут если его замаппить, кто будет при каждом обновлении карты заходить и переставлять тумбочку на капитан шкаф? Ответ на опережение: никто, а если кто-то скажет обратное, то расставит на двух картах из десятка и забьёт на это

Copy link
Collaborator

@AwareFoxy AwareFoxy left a comment

Choose a reason for hiding this comment

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

Норм

@AwareFoxy AwareFoxy requested review from Vonsant and removed request for Morb0 November 16, 2024 08:54
@AwareFoxy AwareFoxy merged commit 88be7b7 into space-syndicate:master Nov 22, 2024
17 checks passed
@PuroSlavKing PuroSlavKing deleted the CaptainDrobe branch November 22, 2024 18:35
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.

3 participants