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

Command department #596

Merged
merged 3 commits into from
Nov 18, 2023
Merged

Command department #596

merged 3 commits into from
Nov 18, 2023

Conversation

Tunguso4ka
Copy link
Contributor

About the PR

Adds Commanding Officer, Executive Officer, clothes for them and for Staff Officer and SEA.

Why / Balance

Resolves #34, resolves #36, resolves #50, resolves #38, resolves #40, resolves #51, resolves #42, resolves #46

Media

image_2023-11-17_23-50-05

image_2023-11-17_23-58-39

image_2023-11-17_23-38-45

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

🆑 Tunguso4ka

  • add: Commanding and Executive officers has been added to the game.

@github-actions github-actions bot added Status: Needs Review Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design No C# For things that don't need code labels Nov 17, 2023
Copy link
Contributor

github-actions bot commented Nov 17, 2023

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

Resources/Textures/_CM14/Objects/Clothing/Head/Hats/cap.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_CM14/Objects/Clothing/Head/Hats/co_formal_black.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_CM14/Objects/Clothing/Head/Hats/co_formal_white.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_CM14/Objects/Clothing/Head/Hats/coberet.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_CM14/Objects/Clothing/Head/Hats/coberet_black.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_CM14/Objects/Clothing/Head/Hats/cocap.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_CM14/Objects/Clothing/Head/Hats/drillhat.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_CM14/Objects/Clothing/Head/Helmets/m10_co.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_CM14/Objects/Clothing/OuterClothing/Coats/aso.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_CM14/Objects/Clothing/OuterClothing/Coats/co_bomber.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_CM14/Objects/Clothing/OuterClothing/Coats/co_formal_black.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_CM14/Objects/Clothing/OuterClothing/Coats/co_formal_white.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_CM14/Objects/Clothing/OuterClothing/Coats/co_jacket.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_CM14/Objects/Clothing/OuterClothing/Coats/officer.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added

Resources/Textures/_CM14/Objects/Clothing/Uniforms/Jumpsuit/bo.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/_CM14/Objects/Clothing/Uniforms/Jumpsuit/co.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/_CM14/Objects/Clothing/Uniforms/Jumpsuit/co_formal_black.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/_CM14/Objects/Clothing/Uniforms/Jumpsuit/co_formal_white.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Resources/Textures/_CM14/Objects/Clothing/Uniforms/Jumpsuit/co_service.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added

Edit: diff updated after 896f4b2

@Tunguso4ka
Copy link
Contributor Author

ready to review.

@DrSmugleaf DrSmugleaf merged commit e4b04fd into RMC-14:master Nov 18, 2023
12 checks passed
@Tunguso4ka Tunguso4ka deleted the command branch November 18, 2023 18:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design No C# For things that don't need code Status: Needs Review
Projects
None yet
2 participants