Skip to content

Cherrypick: Add Undergarments & "Censor Nudity" Toggle to Options (#33185)#90

Merged
TheRealMasterChief117 merged 3 commits into
Triad-Sector:mainfrom
mnva0:cherrypickunderwear
May 17, 2026
Merged

Cherrypick: Add Undergarments & "Censor Nudity" Toggle to Options (#33185)#90
TheRealMasterChief117 merged 3 commits into
Triad-Sector:mainfrom
mnva0:cherrypickunderwear

Conversation

@mnva0
Copy link
Copy Markdown
Collaborator

@mnva0 mnva0 commented May 16, 2026

About the PR

This PR cherrypicks space-wizards/space-station-14#33185
This will undoubtedly conflict with #77 because I forgot I even had that open

Not all underwear markings might fit with all IPC torso markings but whatever
Resomi are excluded because they need special sprites or one hell of a displacement map. If even possible
Hydrakin would also require special sprites. Bottom undergarments technically fit them, but might look out-of-place without the possibility of top undergarments
I included normally-nonplayable-or-not-roundstart species because... why not? Non-zero chance they get made playable or somehow end up with underwear

There are some very minor problems:

  • Reptilian legs don't exactly fit into bottom underwear. Digitigrade and whatnot. They already have unique sprites which won't be too hard to adjust, so I've kept their access to bottom undergarments
  • Missing FTL entry at marking-UndergarmentBottomSatinReptilian-satin_reptilian (if I transcribed correctly). This is extremely trivial and only shows up in the color selection dropdown. I believe upstream tried fixing this before but I reverted the fix (on upstream) for breaking the marking names. May have to double up on entries or rewrite C# code to fix it
  • You can kinda see the Binder marking (maybe more) through a greyshirt Feroxi a bit? It's like 2 pixels on each side. This probably doesn't matter
  • There might be some weird layering issue with Harpy wings. I don't know. Maybe look into NF for a possible solution or something. Maybe DV. Not sure if this is even a problem or if I'm imagining it

By the way I had a HELL of a time getting this to work on the Git end. Tell me if something is off
I have taken an EXCEPTIONALLY LONG time to make this PR. My PRs do not get better in quality as I spend more time on them, they get worse

Why / Balance

This is a wholesome family-friendly server! Put some underwear on! \j
I understand making characters not totally nude will be a very controversial PR \j

At the very least me and one other person want underwear. Customization, plus people don't have to go completely nude. Some clothings are also kind of revealing so it's nice having another layer

Media

image image image

Requirements

  • I have read relevant guidelines/documentation to this PR found on our devwiki.
  • I have added media to this PR or it does not require an ingame showcase.
  • I can confirm this PR contains either no AI-generated content, or AI-generated content that meets our guidelines.

How to test

  1. Open character editor
  2. Try out the species. You shouldn't find any FTL issues and the underwears should fit
  3. Open the options and try out the new underwear-related accessibility option. It puts underwear on naked people

Changelog
🆑 SlamBamActionman, Minerva

  • add: Top and bottom undergarments can now be found in the Markings tab of the character creator.
  • add: The Accessibility tab of Options now has a Censor Nudity Toggle, which adds undergarments to all characters on your client. Undergarments selected in the character creator take priority.
  • remove: The following species were not given undergarments due to sprite body shape reasons: Resomi, Hydrakin. Reptilian legs don't quite fit into bottom undergarments, but they have kept access to those markings.

SlamBamActionman and others added 3 commits May 15, 2026 20:33
@Triad-Sector Triad-Sector changed the title Cherrypick: Add undergarments & "Censor Nudity" toggle to options (#33185) Cherrypick: Add Undergarments & "Censor Nudity" Toggle to Options (#33185) May 16, 2026
@github-actions
Copy link
Copy Markdown

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

Resources/Textures/Mobs/Customization/undergarments.rsi

State Old New Status
binder Added
binder_vox Added
boxers Added
boxers_reptilian Added
boxers_vox Added
briefs Added
briefs_reptilian Added
briefs_vox Added
classic Added
classic_vox Added
satin Added
satin_reptilian Added
satin_vox Added
sports Added
sports_vox Added
tanktop Added
tanktop_vox Added

Copy link
Copy Markdown
Collaborator

@TheRealMasterChief117 TheRealMasterChief117 left a comment

Choose a reason for hiding this comment

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

Fix sprites for hydrakin, reptilians, resomi, and any other species with different-looking legs please

Copy link
Copy Markdown
Collaborator

@TheRealMasterChief117 TheRealMasterChief117 left a comment

Choose a reason for hiding this comment

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

Fine for now, but we'll need custom underwear sprites for the other species or working displacements

@TheRealMasterChief117 TheRealMasterChief117 merged commit c0e7ef9 into Triad-Sector:main May 17, 2026
23 checks passed
Triad-Sector added a commit that referenced this pull request May 17, 2026
@mnva0 mnva0 deleted the cherrypickunderwear branch May 17, 2026 03:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

C# FTL Changes to localization files size/M Sprites UI YML

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants