Skip to content

Port undergarments from ImpStation#2719

Merged
Radezolid merged 1 commit intoDeltaV-Station:masterfrom
alterae:undergarments
Jan 14, 2025
Merged

Port undergarments from ImpStation#2719
Radezolid merged 1 commit intoDeltaV-Station:masterfrom
alterae:undergarments

Conversation

@alterae
Copy link
Copy Markdown
Contributor

@alterae alterae commented Jan 13, 2025 •
edited
Loading

All races available in the character creator may wear undergarments.
Also lets slimefolk wear chest tattoos.

About the PR

Ports the undergarment markings from ImpStation.
A pretty direct port of impstation/imp-station-14#384.
EDIT: Actually a port of space-wizards/space-station-14#31221 by way of the above.

Why / Balance

With the recent addition of surgery, characters have to be stripped much more frequently than used to be the case.
This change helps preserve some dignity.

Additionally, it just allows for a little bit more RP flavor and variety in how characters present. And it will tie in nicely with the ability to tie jumpsuit jackets around your waist once I port impstation/imp-station-14#375.

Technical details

Markings. So many markings. Almost all YAML and locale files except for, like, two six lines of C#.

Media

image
image
image
image
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

To my knowledge there are no breaking changes. Two enums gain new fields, but this seems to not pose any issues (unless something is relying on enum variants' numerical indicies, which I'm pretty sure isn't really a thing in C#).

Changelog
🆑

  • add: Ported undergarments from Impstation
  • tweak: Slimefolk can now wear chest tattoos

@alterae alterae requested a review from a team as a code owner January 13, 2025 16:36
@alterae alterae requested a review from a team January 13, 2025 16:36
@alterae alterae requested a review from a team as a code owner January 13, 2025 16:36
@github-actions github-actions Bot added S: Needs Review Awaiting review from a Maintainer Changes: YML Changes any yml files size/L 256-1023 lines Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi and removed S: Needs Review Awaiting review from a Maintainer labels Jan 13, 2025
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jan 13, 2025 •
edited
Loading

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

Resources/Textures/_DV/Mobs/Customization/tattoos.rsi

State Old New Status
tattoo_nanotrasen_chest Added

Resources/Textures/_Impstation/Mobs/Customization/undershirt.rsi

State Old New Status
binder Added
classic Added
gross_sleeveless Added
nanotrasen Added
rolled_undershirt Added
rolled_undershirt_sleeveless Added
sleeveless Added
sports Added
strapless Added
undershirt Added

Resources/Textures/_Impstation/Mobs/Customization/underwear.rsi

State Old New Status
boxers Added
briefs Added
lowriders Added
satin Added
tanga Added

Edit: diff updated after f6c4ad3

Radezolid
Radezolid requested changes Jan 13, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@Radezolid Radezolid left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Review time!

Any files that are actually from imp station place them in their folder _Impstation

Comment thread Resources/Locale/en-US/_DV/markings/tattoos.ftl
Comment thread Resources/Locale/en-US/_DV/markings/undershirt.ftl
Comment thread Resources/Locale/en-US/_DV/markings/underwear.ftl
Comment thread Resources/Locale/en-US/preferences/ui/markings-picker.ftl
Comment thread Resources/Prototypes/Entities/Mobs/Species/base.yml Outdated
Comment thread Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/undershirt.yml
Comment thread Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/underwear.yml
Comment thread Resources/Textures/_DV/Mobs/Customization/tattoos.rsi/meta.json
Comment thread Resources/Textures/_DV/Mobs/Customization/undershirt.rsi/meta.json Outdated
Comment thread Resources/Textures/_DV/Mobs/Customization/underwear.rsi/meta.json Outdated
@dvir001
Copy link
Copy Markdown
Contributor

dvir001 commented Jan 13, 2025

space-wizards/space-station-14#33185
I like this implementation way more IMO

@alterae
Copy link
Copy Markdown
Contributor Author

alterae commented Jan 13, 2025

space-wizards/space-station-14#33185 I like this implementation way more IMO

Interesting. However, I feel that it makes some changes that are out of scope, at least for my own priorities in implementing this change.

@alterae
Copy link
Copy Markdown
Contributor Author

alterae commented Jan 13, 2025

Any files that are actually from imp station place them in their folder _Impstation

Done!

@alterae
Copy link
Copy Markdown
Contributor Author

alterae commented Jan 13, 2025

Any files that are actually from imp station place them in their folder _Impstation

Done!

ahahaha whoops forgot to update file paths hang on :elp:

@alterae
Copy link
Copy Markdown
Contributor Author

alterae commented Jan 13, 2025

ahahaha whoops forgot to update file paths hang on :elp:

THERE we go

@alterae alterae requested a review from Radezolid January 13, 2025 17:33
Radezolid
Radezolid approved these changes Jan 13, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@Radezolid Radezolid left a comment

Choose a reason for hiding this comment

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

I lack permits as of right now, so I'll notify direction via discord.

@alterae
Copy link
Copy Markdown
Contributor Author

alterae commented Jan 13, 2025

Interesting. However, I feel that it makes some changes that are out of scope, at least for my own priorities in implementing this change.

to expand on this, i'm also not a fan of a toggle changing how other players' characters look without their input. is this a rational distaste? idk. but i don't like the vibe

@hivehum
Copy link
Copy Markdown
Contributor

hivehum commented Jan 13, 2025 •
edited
Loading

hey heads up that this is a port of space-wizards/space-station-14#31221. pinkbat5 brought it to impstation and modified the sprites but the code is originally from a upstream PR. sorry about our poor attribution from our earlier features, we didnt have standards for a while

edit: foldablecomponent is also originally from a closed or in limbo upstream PR, im asking airfryer to source it properly

@alterae
Copy link
Copy Markdown
Contributor Author

alterae commented Jan 13, 2025

hey heads up that this is a port of space-wizards/space-station-14#31221. pinkbat5 brought it to impstation and modified the sprites but the code is originally from a upstream PR.

noted. does this necessitate any changes to the contents of the PR?

@hivehum
Copy link
Copy Markdown
Contributor

hivehum commented Jan 13, 2025

hey heads up that this is a port of space-wizards/space-station-14#31221. pinkbat5 brought it to impstation and modified the sprites but the code is originally from a upstream PR.

noted. does this necessitate any changes to the contents of the PR?

nope, you're all good, i just wanted to make sure we werent being mistakenly credited for code we didnt work on

@deltanedas
Copy link
Copy Markdown
Contributor

deltanedas commented Jan 13, 2025

@Radezolid join the team you were invited to :trollface:

@Radezolid
Copy link
Copy Markdown
Contributor

Radezolid commented Jan 13, 2025

@Radezolid join the team you were invited to :trollface:

Lmao, didn't get the notification, thanks.

@ThataKat
Copy link
Copy Markdown
Contributor

ThataKat commented Jan 14, 2025

Direction is reviewing, get back to you in about a day!

@alterae
Port undergarments from ImpStation
f6c4ad3 
All races available in the character creator may wear undergarments.
Also lets slimefolk wear chest tattoos.
@LadyDanger2743
Copy link
Copy Markdown

LadyDanger2743 commented Jan 14, 2025

Direction approval! Go ahead and hit it!

@Radezolid Radezolid merged commit 97492b3 into DeltaV-Station:master Jan 14, 2025
@alterae alterae deleted the undergarments branch January 14, 2025 15:46
@AgentePanela AgentePanela mentioned this pull request Aug 1, 2025
Merged
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Radezolid Radezolid Radezolid approved these changes

Assignees

No one assigned

Labels

Changes: C# Changes any cs files 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 Awaiting review from a Maintainer size/L 256-1023 lines

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@alterae @dvir001 @hivehum @deltanedas @Radezolid @ThataKat @LadyDanger2743