Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Humanoid fixes (#11538)

Browse Source 
* humanoid sexmorph sprite restoration

can't believe i broke sex/gender AGAIN

* fixes default species appearances with no profile, tweaks randomization to no longer randomize species

* A

* fixes an oops

#11494
This commit is contained in:
Flipp Syder
2022-09-26 12:46:57 -07:00
committed by GitHub
parent 66e9c1975a
commit 0e1a190e0e
14 changed files with 107 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Client/Humanoid/HumanoidSystem.cs
View File

@@ -57,6 +57,7 @@ public sealed class HumanoidSystem : SharedHumanoidSystem
profile.Species,
customBaseLayers,
profile.Appearance.SkinColor,
profile.Sex,
new(), // doesn't exist yet
markings.GetForwardEnumerator().ToList());
}

6
Content.Client/Humanoid/HumanoidVisualizerSystem.cs
View File

@@ -36,7 +36,9 @@ public sealed class HumanoidVisualizerSystem : VisualizerSystem<HumanoidComponen
return;
}
bool dirty = data.SkinColor != component.SkinColor;
var dirty = data.SkinColor != component.SkinColor || data.Sex != component.Sex;
component.Sex = data.Sex;
if (data.CustomBaseLayerInfo.Count != 0)
{
dirty |= MergeCustomBaseSprites(uid, baseSprites.Sprites, data.CustomBaseLayerInfo, component);
@@ -442,6 +444,4 @@ public sealed class HumanoidVisualizerSystem : VisualizerSystem<HumanoidComponen
}
}
}
}

3
Content.Client/Humanoid/MarkingPicker.xaml.cs
View File

@@ -179,8 +179,7 @@ public sealed partial class MarkingPicker : Control
foreach (var marking in markings.Values)
{
if (_currentMarkings.TryGetCategory(_selectedMarkingCategory, out var listing)
&& listing.Contains(marking.AsMarking()))
if (_currentMarkings.TryGetMarking(_selectedMarkingCategory, marking.ID, out _))
{
continue;
}