Cherrypick: Add Undergarments & "Censor Nudity" Toggle to Options (#33185)#90
Merged
TheRealMasterChief117 merged 3 commits intoMay 17, 2026
Merged
Conversation
* Initial commit * Attribution * Review changes * Added comment for upstream
|
RSI Diff Bot; head commit 0b9716d merging into 3ffd2e1 Resources/Textures/Mobs/Customization/undergarments.rsi
|
TheRealMasterChief117
requested changes
May 16, 2026
Collaborator
TheRealMasterChief117
left a comment
There was a problem hiding this comment.
Fix sprites for hydrakin, reptilians, resomi, and any other species with different-looking legs please
TheRealMasterChief117
approved these changes
May 17, 2026
Collaborator
TheRealMasterChief117
left a comment
There was a problem hiding this comment.
Fine for now, but we'll need custom underwear sprites for the other species or working displacements
Triad-Sector
added a commit
that referenced
this pull request
May 17, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.

















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:
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 itBy 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
Requirements
How to test
Changelog
🆑 SlamBamActionman, Minerva