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

Bluesec Updates/Changes #172

Merged
merged 3 commits into from
Nov 10, 2024

Conversation

BoskiYourk
Copy link

About the PR

  • Changed the sprites of the blue suit and tie and head of security's blue jumpsuit
  • Updated the name of the Blue Suit and Tie to Security Blue Suit to reflect it's security status
  • Added a security level contraband disclaimer for the security blue suit
  • Updated the name of the Head of Security's Blue Jumpsuit to be in line with the Security Blue Jumpsuit
  • Added both the Security Blue Suit and Head of Security's Blue Suit to their respective loadout menus

Why / Balance

It has been a while since security has been given something cool and interesting to use for outfits, so I've decided it's time for bluesec to get it's much deserved resprite and updates to be in line with the rest of security's clothing!

Technical details

_Harmony namescape

Resources/Prototypes/_Harmony/Loadouts/Jobs/Command/head_of_security.yml -- HoS loudout options
Resources/Prototypes/_Harmony/Loadouts/Jobs/Security/security_officer.yml -- Secoff loudout options
Resources/Textures/_Harmony/Clothing/Uniforms/Jumpsuit/hos_blue.rsi -- HoS's Blue Suit Texture Location
Resources/Textures/_Harmony/Clothing/Uniforms/Jumpsuit/security_blue.rsi -- Officer Blue Suit Texture Location

Upstream Files

Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml -- Updating the names/file locations/contraband level of the blue suits
Resources/Prototypes/Loadouts/loadout_groups.yml -- Adds the blue suits to their respective Officer and HoS Jumpsuit loadout groups

Media

Both the Security Blue Suit and Head of Security's Blue Suit:
PR SS 2
PR SS1

HoS's Blue suit in the loudout menu:
SS PR 3

The Security Blue Suit in the loudout menu:
SS PR 4

Requirements

Breaking changes

Changelog

🆑

  • tweak: Updated the blue security uniforms to fit with the rest of security's clothing.
  • add: Added the security blue suits to their respective loadout menus.

Copy link

github-actions bot commented Nov 10, 2024

RSI Diff Bot; head commit a1fbb44 merging into b008bc2
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-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Harmony/Clothing/Uniforms/Jumpsuit/security_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 a1fbb44

@DieselMohawk
Copy link
Collaborator

Looking good!

@DieselMohawk
Copy link
Collaborator

image
Screenshot 2024-11-09 184933
Screenshot 2024-11-09 184951

Tested on private server, all seems to be working.

@FluffMe FluffMe self-assigned this Nov 10, 2024
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.

This looks great!

Minor request to change the comments in upstream files, and that should be it.
Thank you for the contribution!

@FluffMe FluffMe removed their assignment Nov 10, 2024
@FluffMe
Copy link
Collaborator

FluffMe commented Nov 10, 2024

@DieselMohawk if you merge, use squash, please. Or after approval you can leave merging to me <3

@DieselMohawk
Copy link
Collaborator

One sec, it came back red, gonna see why that is

@DieselMohawk
Copy link
Collaborator

All of it works properly, build failure unrelated

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.

All of it works from what I can tell. Good work.

@DieselMohawk DieselMohawk merged commit 6bc04af into ss14-harmony:master Nov 10, 2024
13 of 14 checks passed
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