tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sex restriction for markings (#19894)

Browse Source 
* Add sex restriction to markings

* Apply to existing systems
This commit is contained in:
Morb
2023-09-19 23:56:10 +03:00
committed by GitHub
parent 1b2fd313a0
commit 835bde4c6e
13 changed files with 169 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
View File

@@ -748,6 +748,7 @@ namespace Content.Client.Preferences.UI
break;
}
UpdateGenderControls();
CMarkings.SetSex(newSex);
IsDirty = true;
}
@@ -917,7 +918,7 @@ namespace Content.Client.Preferences.UI
}
CMarkings.SetData(Profile.Appearance.Markings, Profile.Species,
Profile.Appearance.SkinColor, Profile.Appearance.EyeColor
Profile.Sex, Profile.Appearance.SkinColor, Profile.Appearance.EyeColor
);
}
@@ -1002,7 +1003,7 @@ namespace Content.Client.Preferences.UI
_markingManager.Markings.TryGetValue(Profile.Appearance.HairStyleId, out var hairProto)
)
{
if (_markingManager.CanBeApplied(Profile.Species, hairProto, _prototypeManager))
if (_markingManager.CanBeApplied(Profile.Species, Profile.Sex, hairProto, _prototypeManager))
{
if (_markingManager.MustMatchSkin(Profile.Species, HumanoidVisualLayers.Hair, out var _, _prototypeManager))
{
@@ -1037,7 +1038,7 @@ namespace Content.Client.Preferences.UI
_markingManager.Markings.TryGetValue(Profile.Appearance.FacialHairStyleId, out var facialHairProto)
)
{
if (_markingManager.CanBeApplied(Profile.Species, facialHairProto, _prototypeManager))
if (_markingManager.CanBeApplied(Profile.Species, Profile.Sex, facialHairProto, _prototypeManager))
{
if (_markingManager.MustMatchSkin(Profile.Species, HumanoidVisualLayers.Hair, out var _, _prototypeManager))
{