Add undergarments & "Censor Nudity" toggle to options #33185

SlamBamActionman · 2024-11-06T00:17:22Z

About the PR

This PR adds the ability to equip undergarments to characters, as well as a Censor Nudity Toggle. This toggle is available as a client option in the Accessibility tab of the Options menu, and as a server variable.

There are 4 top and 3 bottom undergarments added:

Tanktop (default with toggle)
Binder
Classic Bra
Sports Bra

Boxers (default with toggle)
Briefs
Satin

These undergarments can be found as markings in the character creator.

The Censor Nudity Toggle is available under the Accessibility tab in Options. If enabled, characters who have not selected a top/bottom undergarment will be outfitted with a default selection (Tanktop + Boxers). This default selection is overridden if another undergarment has been selected to that slot. Note that this option is clientside-only, and will not be replicated on other clients.

Servers have the ability to override the client selection via the CCvar server_nudity_toggle, which when set to true makes all clients behave as if they have the Censor Nudity Toggle option selected. If the CCvar is set to false, the client selection will take priority.

This PR is inspired by #31221.

Why / Balance

Nudity, even if it is just a single pixel or two, may cause discomfort for some players. This can manifest as discomfort at having their own character bared nude for other players, or other characters being nude around them. A nudity toggle allows for said players to engage with the game without impacting the game for other players.

Streamers may also have issues with nudity due to streaming platform Terms of Services.

Since nudity is not supposed to be a focus in the game (at least upstream) the selection of undergarments have been made intentionally very limited and lacks customization options. The selection should be enough for a player to select undergarments that is suitable for their character's presentation without putting undue focus on using it as a means of expression.

Reptilians and Vox have custom undergarments due to differences in sprites (Vox are self-explanatory, Reptilians have a higher-up crotch area).

Note that the specific sprites are not necessarily final representations, and are open to be resprited.

Technical details

LayerColoringType has been made nullable, as there was no option for a type that has a single color without a slider that isn't dependent on another property (unlike how eye/skincolor is). If it's null, it just uses the default color and won't allow it to be changed.

There's some basic options code and cvars, what's important is what happens in HumanoidAppearanceSystem.cs:

In UpdateSprite(), it checks whether nudity censoring is toggled either client- or serverside; if there already exists a marking that matches UndergarmentTop/UndergarmentBottom all is well and not much more happens, but if one is missing AddUndergarments() is ran and applies a marking set via HumanoidAppearanceComponent. These markings are also added to ClientOldMarkings so that they can be removed should the toggle turn off/a marking be selected in the character menu.

Media

Tanktop + Boxers; the default, which displays when Censor Nudity Toggle is enabled:

Classic Bra + Briefs:

Sports Bra + Satin:

Binder + Boxers:

Example lizard clothing, Tanktop + Boxers:

Example vox clothing, Tanktop + Boxers:

How to test

Boot up Dev map
Go into Options menu, Accessibility tab, toggle Censor Nudity Toggle on.
Observe how Urists in the Dev map have clothing.
Use the Command golobby to go to the lobby.
Enter character creation, select Hide Clothes and go to the Markings tab
Select a combination of undergarments and notice how they override the default clothing.
Save, go back to Options and toggle it off. Notice how the selected undergarments remain.
Go back into the Dev map, see that Urists are naked.
Type the Command > cvar accessibility.server_censor_nudity True.
Observe how Urists in the Dev map have clothing again.

Requirements

I have read and am following the Pull Request and Changelog Guidelines.
I have added media to this PR or it does not require an ingame showcase.

Breaking changes

Changelog

🆑

add: Added top and bottom undergarments, which can be found in the Markings tab of the character creator.
add: Added a Censor Nudity Toggle under the Accessibility tab of Options, which adds undergarments to all characters on your client. Undergarments selected in the character creator take priority.

github-actions · 2024-11-06T00:17:58Z

RSI Diff Bot; head commit a5ecd95 merging into 1ded8e7
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

Edit: diff updated after a5ecd95

PJB3005 · 2024-11-06T01:05:21Z

Content.Client/Humanoid/HumanoidAppearanceSystem.cs

@@ -12,19 +14,32 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
 {
    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
    [Dependency] private readonly MarkingManager _markingManager = default!;
+    [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+    [Dependency] private readonly IEntityManager _entManager = default!;


You don't need a dependency on IEntityManager, you're in an entity system.

PJB3005 · 2024-11-06T01:06:11Z

Content.Client/Humanoid/HumanoidAppearanceSystem.cs

+        var censorNudity = _configurationManager.GetCVar(CCVars.ClientCensorNudity) ||
+                           _configurationManager.GetCVar(CCVars.ClientCensorNudity);


One of these should be ServerCensorNudity?

PJB3005 · 2024-11-06T01:06:48Z

Content.Shared/CCVar/CCVars.cs

+        /// <summary>
+        /// If enabled, censors character nudity by forcing clothes markings on characters, selected by the client.
+        /// Both this and ServerCensorNudity must be false to display nudity on the client.
+        /// </summary>
+        public static readonly CVarDef<bool> ClientCensorNudity =
+            CVarDef.Create("accessibility.censor_nudity", false, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+        /// <summary>
+        /// If enabled, censors character nudity by forcing clothes markings on characters, selected by the server.
+        /// Both this and ClientCensorNudity must be false to display nudity on the client.
+        /// </summary>
+        public static readonly CVarDef<bool> ServerCensorNudity =
+            CVarDef.Create("accessibility.server_censor_nudity", false, CVar.ARCHIVE | CVar.REPLICATED | CVar.SERVER);


Prefix both of these C# names with "Accessibility".

PJB3005 · 2024-11-06T01:21:18Z

Content.Client/Humanoid/HumanoidAppearanceSystem.cs

+            _markingManager.TryGetMarking(marking, out var prototype);
+            if (prototype != null)


Suggested change

_markingManager.TryGetMarking(marking, out var prototype);

if (prototype != null)

if (_markingManager.TryGetMarking(marking, out var prototype))

PJB3005 · 2024-11-06T01:21:36Z

Content.Client/Humanoid/HumanoidAppearanceSystem.cs

+            _markingManager.TryGetMarking(marking, out var prototype);
+            if (prototype != null)


Suggested change

_markingManager.TryGetMarking(marking, out var prototype);

if (prototype != null)

if (_markingManager.TryGetMarking(marking, out var prototype))

PaulRuddsAssFuzz · 2024-11-06T02:10:28Z

Weh-the-weh is in shambles rn
(Why not only have it in the Decal menu for reasons like that?)

K-Dynamic · 2024-11-06T02:21:58Z

Weh-the-weh is in shambles rn (Why not only have it in the Decal menu for reasons like that?)

weh-the-weh will just wear a green jumpsuit, plus their appeal is in their funny face

SlamBamActionman · 2024-11-06T10:32:11Z

Added a "How to test" section in the PR description to help out how to test it.

SpaceLizardSky · 2024-11-06T14:10:19Z

are these colourable?

SlamBamActionman · 2024-11-06T14:12:27Z

are these colourable?

Since nudity is not supposed to be a focus in the game (at least upstream) the selection of undergarments have been made intentionally very limited and lacks customization options. The selection should be enough for a player to select undergarments that is suitable for their character's presentation without putting undue focus on using it as a means of expression.

Morp9x · 2024-11-06T14:55:04Z

I have concerns that this PR could significantly harm the development of NewMed. Has this issue been discussed with the maintainers?

SlamBamActionman · 2024-11-06T18:56:00Z

I have concerns that this PR could significantly harm the development of NewMed. Has this issue been discussed with the maintainers?

It's purely visual and does not have any gameplay implications whatsoever.

github-actions · 2024-11-13T19:09:07Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

bruhmogus · 2024-11-13T20:03:18Z

im not sure if anyone has checked this yet, but underclothes should be visually disabled when something's in the jumpsuit slot (except for the "colorful pants" item) as to not mess with clothes such as... other random colorful clothing. huh.

SlamBamActionman · 2024-11-13T20:08:24Z

im not sure if anyone has checked this yet, but underclothes should be visually disabled when something's in the jumpsuit slot (except for the "colorful pants" item) as to not mess with clothes such as... other random colorful clothing. huh.

There might be a need to check for clipping, but afaik the undergarments should follow the shape of the body and any undergarments that is visible underneath another piece of clothing (e.g. the open-chested randomized jumpsuit) just treats it as an undershirt/underpants.

SlamBamActionman added 2 commits November 6, 2024 00:35

Initial commit

870aaca

Attribution

7f4a1bf

SlamBamActionman requested a review from DrSmugleaf as a code owner November 6, 2024 00:17

PJB3005 requested changes Nov 6, 2024

View reviewed changes

Review changes

a5ecd95

SlamBamActionman requested a review from PJB3005 November 6, 2024 10:31

PJB3005 approved these changes Nov 6, 2024

View reviewed changes

github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Nov 13, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add undergarments & "Censor Nudity" toggle to options #33185

Add undergarments & "Censor Nudity" toggle to options #33185

SlamBamActionman commented Nov 6, 2024 •

edited

Loading

github-actions bot commented Nov 6, 2024 •

edited

Loading

PJB3005 Nov 6, 2024

PJB3005 Nov 6, 2024

PJB3005 Nov 6, 2024

PJB3005 Nov 6, 2024

PJB3005 Nov 6, 2024

PaulRuddsAssFuzz commented Nov 6, 2024

K-Dynamic commented Nov 6, 2024

SlamBamActionman commented Nov 6, 2024

SpaceLizardSky commented Nov 6, 2024

SlamBamActionman commented Nov 6, 2024

Morp9x commented Nov 6, 2024

SlamBamActionman commented Nov 6, 2024

github-actions bot commented Nov 13, 2024

bruhmogus commented Nov 13, 2024

SlamBamActionman commented Nov 13, 2024

		var censorNudity = _configurationManager.GetCVar(CCVars.ClientCensorNudity) \|\|
		_configurationManager.GetCVar(CCVars.ClientCensorNudity);

		_markingManager.TryGetMarking(marking, out var prototype);
		if (prototype != null)

	_markingManager.TryGetMarking(marking, out var prototype);
	if (prototype != null)
	if (_markingManager.TryGetMarking(marking, out var prototype))

Add undergarments & "Censor Nudity" toggle to options #33185

Are you sure you want to change the base?

Add undergarments & "Censor Nudity" toggle to options #33185

Conversation

SlamBamActionman commented Nov 6, 2024 • edited Loading

About the PR

Why / Balance

Technical details

Media

How to test

Requirements

Breaking changes

github-actions bot commented Nov 6, 2024 • edited Loading

PJB3005 Nov 6, 2024

Choose a reason for hiding this comment

PJB3005 Nov 6, 2024

Choose a reason for hiding this comment

PJB3005 Nov 6, 2024

Choose a reason for hiding this comment

PJB3005 Nov 6, 2024

Choose a reason for hiding this comment

PJB3005 Nov 6, 2024

Choose a reason for hiding this comment

PaulRuddsAssFuzz commented Nov 6, 2024

K-Dynamic commented Nov 6, 2024

SlamBamActionman commented Nov 6, 2024

SpaceLizardSky commented Nov 6, 2024

SlamBamActionman commented Nov 6, 2024

Morp9x commented Nov 6, 2024

SlamBamActionman commented Nov 6, 2024

github-actions bot commented Nov 13, 2024

bruhmogus commented Nov 13, 2024

SlamBamActionman commented Nov 13, 2024

SlamBamActionman commented Nov 6, 2024 •

edited

Loading

github-actions bot commented Nov 6, 2024 •

edited

Loading