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

Blue Sec Update Two: Seclectric Bluegaloo #210

Merged

Conversation

BoskiYourk
Copy link

@BoskiYourk BoskiYourk commented Nov 25, 2024

About the PR

  • Added a bluesuit outfit for the detective
  • Added a new bluesuit jumpsuit for the warden
  • Added new hats to match the officer blue suit
  • Added everything to the loadout menus and uniform printer

Why / Balance

HoS and officers get blue suits, so why not the warden and detective too?

Technical details

_Harmony Namescape

Resources/Prototypes/_Harmony/Entities/Clothing/Head/hats.yml -- Adds the beret and fedora entities
Resources/Prototypes/_Harmony/Entities/Clothing/Head/soft.yml -- Adds the blue cap entity
Resources/Prototypes/_Harmony/Entities/Clothing/OuterClothing/coats.yml -- Adds the blue coat entity
Resources/Prototypes/_Harmony/Entities/Clothing/Uniforms/jumpsuits.yml -- Adds the blue warden and det suit entities
Resources/Prototypes/_Harmony/Loadouts/Jobs/Security/detective.yml -- Detective loadout options
Resources/Prototypes/_Harmony/Loadouts/Jobs/Security/security_officer.yml -- Officer loadout options
Resources/Prototypes/_Harmony/Loadouts/Jobs/Security/warden.yml -- Warden loadout options
Resources/Prototypes/_Harmony/Recipes/Lathes/clothing.yml -- Lathe recipes
Resources/Textures/_Harmony/Clothing/Head/Hats/beret_security_blue.rsi -- Beret sprite location
Resources/Textures/_Harmony/Clothing/Head/Hats/bluefedora.rsi -- Fedora sprite location
Resources/Textures/_Harmony/Clothing/Head/Soft/secbluesoft.rsi -- Cap sprite location
Resources/Textures/_Harmony/Clothing/OuterClothing/Coats/detective_blue.rsi -- Coat sprite location
Resources/Textures/_Harmony/Clothing/Uniforms/Jumpsuit/det_blue.rsi -- Detective suit sprite location
Resources/Textures/_Harmony/Clothing/Uniforms/Jumpsuit/warden_blue.rsi -- Warden suit sprite location

Upstream Files

Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml -- Added the detective clothes to the detdrobe
Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml -- Added the beret and cap to the secdrobe
Resources/Prototypes/Entities/Structures/Machines/lathe.yml -- IDs for clothing printer
Resources/Prototypes/Loadouts/loadout_groups.yml -- Adds the new items to the loadout menu

Media

Blue Det
Blue Ward 2
Blue Hat
Blue Beret

Requirements

Breaking changes

Changelog

🆑

  • add: Finished adding blue sec options for the rest of the security team.

Copy link

github-actions bot commented Nov 25, 2024

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

Resources/Textures/_Harmony/Clothing/Uniforms/Jumpsuit/hos_blue.rsi

State Old New Status
equipped-INNERCLOTHING Modified

Resources/Textures/_Harmony/Clothing/Uniforms/Jumpsuit/security_blue.rsi

State Old New Status
equipped-INNERCLOTHING Modified

Resources/Textures/_Harmony/Clothing/Head/Hats/beret_security_blue.rsi

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

Resources/Textures/_Harmony/Clothing/Head/Hats/bluefedora.rsi

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

Resources/Textures/_Harmony/Clothing/Head/Soft/secbluesoft.rsi

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

Resources/Textures/_Harmony/Clothing/OuterClothing/Coats/detective_blue.rsi

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

Resources/Textures/_Harmony/Clothing/Uniforms/Jumpsuit/det_blue.rsi

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

Resources/Textures/_Harmony/Clothing/Uniforms/Jumpsuit/warden_blue.rsi

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

Edit: diff updated after 8c48bfe

@BoskiYourk
Copy link
Author

Not sure what's up with the HoS hat showing up as having some bits removed, so hopefully that isn't too big of a deal...

Copy link
Collaborator

@DieselMohawk DieselMohawk left a comment

Choose a reason for hiding this comment

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

Fix the icon size for the blue beret. That's likely causing the test failure.

@FluffMe FluffMe added S: Awaiting Changes Reviewer requested changes and removed S: Needs Review Review is requested size/L labels Nov 25, 2024
@github-actions github-actions bot added S: Needs Review Review is requested and removed S: Awaiting Changes Reviewer requested changes labels Nov 26, 2024
@DieselMohawk
Copy link
Collaborator

Damn, test failure, time to look at it again

Copy link
Collaborator

@FluffMe FluffMe left a comment

Choose a reason for hiding this comment

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

Resources/Textures/_Harmony/Clothing/OuterClothing/Coats/detective_blue.rsi: PNG not defined in metadata: Inhand-right.png
Resources/Textures/_Harmony/Clothing/OuterClothing/Coats/detective_blue.rsi: PNG not defined in metadata: Equipped-OUTERCLOTHING.png
Resources/Textures/_Harmony/Clothing/OuterClothing/Coats/detective_blue.rsi: equipped-OUTERCLOTHING: failed to open state equipped-OUTERCLOTHING.png
Resources/Textures/_Harmony/Clothing/OuterClothing/Coats/detective_blue.rsi: inhand-right: failed to open state inhand-right.png

While files for states are present in RSI, the states and file names are case sensitive.

Inhand-right.png and Equipped-OUTERCLOTHING.png should be renamed (uncapitalize first letter of the file name).

@FluffMe FluffMe added S: Awaiting Changes Reviewer requested changes and removed S: Needs Review Review is requested labels Nov 26, 2024
@BoskiYourk BoskiYourk requested a review from FluffMe November 27, 2024 05:15
@github-actions github-actions bot added S: Needs Review Review is requested and removed S: Awaiting Changes Reviewer requested changes labels Nov 27, 2024
DieselMohawk
DieselMohawk previously approved these changes Nov 27, 2024
Copy link
Collaborator

@DieselMohawk DieselMohawk left a comment

Choose a reason for hiding this comment

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

Turns out I forgot to send my review, looks good now though

@DieselMohawk
Copy link
Collaborator

Me when I don't send my pending reviews by accident :)

Copy link
Collaborator

@FluffMe FluffMe left a comment

Choose a reason for hiding this comment

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

Only two minor changes, and it's good to go!
Thank you very much for working on this.

@FluffMe FluffMe added S: Awaiting Changes Reviewer requested changes and removed S: Needs Review Review is requested labels Nov 27, 2024
@BoskiYourk
Copy link
Author

Capitalization is fixed, so this will hopefully be the last commit needed.

@github-actions github-actions bot added S: Needs Review Review is requested and removed S: Awaiting Changes Reviewer requested changes labels Nov 27, 2024
@FluffMe FluffMe merged commit 0347d2c into ss14-harmony:master Nov 28, 2024
15 checks passed
FluffMe added a commit that referenced this pull request Nov 28, 2024
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