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

[Port] Hobo and Maid #20

Merged
merged 13 commits into from
Sep 1, 2024
Merged

[Port] Hobo and Maid #20

merged 13 commits into from
Sep 1, 2024

Conversation

RedBurningPhoenix
Copy link
Contributor

@RedBurningPhoenix RedBurningPhoenix commented Aug 26, 2024 •
edited by Remuchi
Loading

Описание PR

2 роли. Без ограничений по ролям.

Изменения

🆑 Warete

  • add: Added two roles Maid and Hobo / Добавлено две роли Прислуга и Бомж

@riddleridou riddleridou changed the title Bomzhara and meidochka Bomzhara and Meidochka Aug 26, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

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

Resources/Textures/Interface/Misc/job_icons.rsi

State Old New Status
Hobo Added
Maid Added

Resources/Textures/Markers/jobs.rsi

State Old New Status
hobo Added
maid Added

Resources/Textures/Objects/Devices/pda.rsi

State Old New Status
pda-hobo Added
pda-maid Added

Resources/Textures/Objects/Misc/id_cards.rsi

State Old New Status
idhobo Added
idmaid Added

Resources/Textures/_White/Clothing/Eyes/Glasses/maidglasses.rsi

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

Resources/Textures/_White/Clothing/Head/hobocap.rsi

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

Resources/Textures/_White/Clothing/Head/hobohat.rsi

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

Resources/Textures/_White/Clothing/Head/maidhat.rsi

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

Resources/Textures/_White/Clothing/OuterClothing/Coats/jacket.rsi

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

Resources/Textures/_White/Clothing/Shoes/maidshoes.rsi

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

Resources/Textures/_White/Clothing/Underwear/Socks/stockings_white.rsi

State Old New Status
equipped-SOCKS-body-slim Added
equipped-SOCKS Added
icon Added

Resources/Textures/_White/Clothing/Uniforms/Jumpskirt/maid.rsi

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

Resources/Textures/_White/Clothing/Uniforms/Jumpskirt/maidmini.rsi

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

Resources/Textures/_White/Clothing/Uniforms/Jumpsuit/hobo.rsi

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

Edit: diff updated after 63a24fc

@RedBurningPhoenix RedBurningPhoenix changed the title Bomzhara and Meidochka [PORT] Bomzhara and Meidochka Aug 27, 2024
@RedBurningPhoenix RedBurningPhoenix changed the title [PORT] Bomzhara and Meidochka [Port] Bomzhara and Meidochka Aug 27, 2024
Remuchi
Remuchi requested changes Aug 27, 2024
View reviewed changes
Copy link
Collaborator

@Remuchi Remuchi left a comment

Choose a reason for hiding this comment

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

Перенести все прототипы и переводы в соответствующие подпапки вайта.

Resources/Locale/en-US/job/job-names.ftl Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Clothing/Shoes/specific.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Markers/Spawners/jobs.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Roles/Jobs/departments.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Roles/Jobs/departments.yml Outdated Show resolved Hide resolved
@Remuchi Remuchi changed the title [Port] Bomzhara and Meidochka [Port] Hobo and Maid Aug 27, 2024
Remuchi
Remuchi requested changes Aug 30, 2024
View reviewed changes
Copy link
Collaborator

@Remuchi Remuchi left a comment

Choose a reason for hiding this comment

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

все хорошо, только два замечания

  1. Роли Служанки и Бомжа не отображают их снаряжение в лобби.
  2. У бомжа форма капитана. Фича?

@Remuchi Remuchi merged commit 60d7000 into WWhiteDreamProject:master Sep 1, 2024
13 checks passed
riddleridou added a commit that referenced this pull request Sep 1, 2024
@riddleridou
Automatic Changelog Update (#20)
eae3e14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Remuchi Remuchi Remuchi approved these changes

Assignees
No one assigned
Labels
Changes: C# Changes: Localization Changes: Sprite Changes: YML
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@RedBurningPhoenix @Remuchi