-
Notifications
You must be signed in to change notification settings - Fork 370
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
base: master
Are you sure you want to change the base?
Conversation
RSI Diff Bot; head commit d902a42 merging into 90629ee Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi
Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi
|
Resources/Locale/en-US/_Impstation/foldable/components/foldable-component.ftl
Outdated
Show resolved
Hide resolved
Resources/Prototypes/_Impstation/Entities/Clothing/Uniforms/base_clothinguniforms.yml
Outdated
Show resolved
Hide resolved
Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json
Outdated
Show resolved
Hide resolved
1fd99c5
to
63e4781
Compare
There was a problem hiding this 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!
does this constitute Direction approval or just lyndo approval? |
Direction approved 👍 |
epic |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
for the meta.json put deltav specific stuff after a |
not ,
or .
like monkey made by brainfood1183 (github) for ss14 | Folded version taken
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:
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.json
s. Adds nearly forty new sprite PNGs. Does not conflict with the existing mechanism for rolling up the sleeves on certain security uniforms.Media
Requirements
Breaking changes
Some prototypes have an additional parent. I don't think there's any actual work needed to deal with this.
Changelog
🆑