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

Allow tying jumpsuits around waists (Impstation port) #2742

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

alterae
Copy link
Contributor

@alterae alterae commented Jan 15, 2025

Port of impstation/imp-station-14#375

About the PR

Allows (some) jumpsuits to be tied around the waist. Mostly upstream ones. There are some weird omissions.

Notable jumpsuits NOT made foldable include:

  • The Salvage Specialist and HoP jumpsuits, which use _DV sprites at the moment.
  • Numerous security jumpsuits (due to rollable sleeves).
  • Pretty much all the colored jumpsuits for some reason.
  • The prisoner jumpsuit (this one in particular feels like a huge oversight).
  • All DeltaV-, Nyano-, EE-, and Impstation-specific jumpsuits.
  • Several seemingly random upstream jumpsuits including the reporter's jumpsuit and all variant bartender uniforms.
  • All skirts.

Important

I will not be doing any spritework for this PR myself, but will GLADLY accept additional sprites and do the YAML for them.

Why / Balance

Butch lesbians of the world rejoice (especially now that we have undershirts).

Technical details

Adds two new locale keys and one new YAML prototype. Modifies nearly forty upstream YAML prototypes and nearly forty RSI meta.jsons. Adds nearly forty new sprite PNGs. Does not conflict with the existing mechanism for rolling up the sleeves on certain security uniforms.

Media

image image image image image

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

Some prototypes have an additional parent. I don't think there's any actual work needed to deal with this.

Changelog
🆑

  • add: Ported the ability to tie (some) jumpsuit jackets around your waist from Impstation. Jumpskirts not included

@alterae alterae requested review from a team as code owners January 15, 2025 17:29
@github-actions github-actions bot added S: Needs Review size/M 64-255 lines Changes: YML Changes any yml files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi and removed size/M 64-255 lines labels Jan 15, 2025
Copy link
Contributor

github-actions bot commented Jan 15, 2025

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

Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

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

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi

State Old New Status
folded-equipped-INNERCLOTHING Added

Edit: diff updated after d902a42

@github-actions github-actions bot added the size/M 64-255 lines label Jan 15, 2025
@alterae alterae requested a review from Radezolid January 15, 2025 20:54
@alterae alterae force-pushed the slut-style branch 4 times, most recently from 1fd99c5 to 63e4781 Compare January 16, 2025 14:04
Lyndomen
Lyndomen previously approved these changes Jan 16, 2025
Copy link
Contributor

@Lyndomen Lyndomen left a comment

Choose a reason for hiding this comment

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

Lots of spriting work on the horizon!

@alterae
Copy link
Contributor Author

alterae commented Jan 16, 2025

Lots of spriting work on the horizon!

does this constitute Direction approval or just lyndo approval?

@ewokswagger
Copy link
Contributor

does this constitute Direction approval or just lyndo approval?

Direction approved 👍

@alterae
Copy link
Contributor Author

alterae commented Jan 16, 2025

Direction approved 👍

epic
gimme about 4.5–5hrs to fix up the attribution like Razedolid wanted and then this should be ready for merge

@alterae
Copy link
Contributor Author

alterae commented Jan 17, 2025

Radezolid's desired attribution fix has been completed (as discussed on the Discord) so this should be ready for merge now…

Initial work on porting impstation/imp-station-14#375.
Component gets the Impstation suffix to not conflict with the existing
DeltaV component for rolled-up sleeves on some security uniforms.
Once again ported from impstation/imp-station-14#375. Only some of our
many, many jumpsuits are affected, and all of them are in the default
namespace.

Some of these sprites aren't even used because our own (unmodified) _DV
sprites take priority, so there is a lot of cleanup to be done.
Still porting impstation/imp-station-14#375. Notable jumpsuits NOT made
foldable include:
- The Salvage Specialist and HoP jumpsuits, which use _DV sprites at
  the moment.
- Numerous security jumpsuits (due to rollable sleeves).
- Pretty much all the colored jumpsuits for some reason.
- The prisoner jumpsuit (this one in particular feels like a huge
  oversight).
- All DeltaV-, Nyano-, EE-, and Impstation-specific jumpsuits.
- Several seemingly random upstream jumpsuits including the reporter's
  jumpsuit and all variant bartender uniforms.
- All skirts.

Uncertain at this time whether to let those come in a separate PR.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review size/M 64-255 lines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants