Skip to content

Dedicated underwear slots#738

Open
Mnemotechnician wants to merge 19 commits into
Floof-Station:masterfrom
Mnemotechnician:feat/underwear-slots
Open

Dedicated underwear slots#738
Mnemotechnician wants to merge 19 commits into
Floof-Station:masterfrom
Mnemotechnician:feat/underwear-slots

Conversation

@Mnemotechnician

@Mnemotechnician Mnemotechnician commented Jun 23, 2026

Copy link
Copy Markdown
Collaborator

About the PR

See #737. This PR adds undergarment (top and bottom) and sock slots, and converts some of the existing clothing (socks, thigh-highs, fishnet tops/bottoms) to undergarment clothing. Fishnets in particular can be worn both in undergarment and in main clothing slots.

This PR also does the following:

  • Makes shoes render BELOW innerclothing, and innerclothing ABOVE hands and feet. This will fix the issue with tall shoes (workboots, highheels, etc.) rendering over skirts (especially the long ones, such as the petticoats and maid outfits).
  • Makes it so that certain slots can be permanently hidden in the stripping menu regardless of whether there's an item inside, and makes it so that slots can be hidden based on whether another slot is occupied. The new underwear slots are hidden unless the innerclothing slot is empty. This means that at the bottom line, you can prevent other people from spying on your character's underwear by simply wearing a nudity permit.
  • Makes inventory templates inheritable.

TODO:

  • Make sprites for other ui themes (i only made a set of sprites for the Default theme, i'll need to copy and hue-shift them to match the other themes.
  • Update loadouts and shuffle items around

While on it I also had to do a lot of housekeeping with loadouts. Holy fuck are they messy.

Why / Balance

SS14 characters (especially the non-furred ones) probably constantly suffer from calluses. It's time to put an end to their suffering by letting them wear socks.

Media

Click to show

WIP showcase:
https://github.com/user-attachments/assets/3ba822da-6500-4d0a-8bde-b60a6055f7b3

Each theme has its own sprite that i tried to match the color scheme of:
Default:
image
Minimalist:
image
Slimecore:
image
Plasmafire (not proud of this one, required manual edits):
image
Ashen:
image
Retro (also not proud, but i havent seen anyone use this theme):
image
Clockwork:
image

Loadouts:
image

image image image

Licensing:

Breaking changes

SharedStrippableSystem.IsStripHidden accepts an extra parameter - the inventory entity to which the slot belongs.

Changelog
🆑

  • add: Added 3 extra inventory slots: undergarment top, undergarment bottom, and socks. Currently the top slot only accepts fishnet tops, the bottom slot accepts thongs, and socks slot accepts thigh-high socks. There are plans to convert undergarment markings into clothing entities as well.
  • tweak: Janitor and command thigh-high socks no longer give mechanical benefit: instead, you can wear proper combat/no-slip shoes over them.
  • fix: Shoes will no longer draw over clothing (and especially skirts!).
  • fix: Zookeeper and Service Worker should now be able to choose more loadouts.
  • tweak: Leash and Remote Signaller have been moved to the "trinkets" loadouts category. You may need to re-select them if you had them selected in the other category. In compensation, the trinkets category now allows up to 4 items.

@ScarlettJFG

Copy link
Copy Markdown
Contributor

Oh this now gives me some idea's for like...things...

Also finally, now we just need to make it so that we can get command/departmental socks in loadouts and uh...yeah different PR kinda thing.

@Mnemotechnician Mnemotechnician removed the DO NOT MERGE Mrrow mrrp label Jun 29, 2026
@Mnemotechnician

Copy link
Copy Markdown
Collaborator Author

It is done

@SyaoranFox SyaoranFox left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Due to the size of the PR, I am asking for one more approval before merging.

I look forward to seeing crew throwing bras at each other.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants