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

Fix incorrect gender on humanoid appearance cloning (#11745)

Browse Source
This commit is contained in:
Flipp Syder
2022-10-06 21:18:30 -07:00
committed by GitHub
parent 9a8248a3f9
commit ed9060d56a
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Humanoid/Systems/HumanoidSystem.cs
View File

@@ -110,7 +110,6 @@ public sealed partial class HumanoidSystem : SharedHumanoidSystem
EnsureDefaultMarkings(uid, humanoid); EnsureDefaultMarkings(uid, humanoid);
humanoid.Gender = profile.Gender; humanoid.Gender = profile.Gender;
if (TryComp<GrammarComponent>(uid, out var grammar)) if (TryComp<GrammarComponent>(uid, out var grammar))
{ {
grammar.Gender = profile.Gender; grammar.Gender = profile.Gender;
@@ -144,6 +143,12 @@ public sealed partial class HumanoidSystem : SharedHumanoidSystem
targetHumanoid.CustomBaseLayers = new(sourceHumanoid.CustomBaseLayers); targetHumanoid.CustomBaseLayers = new(sourceHumanoid.CustomBaseLayers);
targetHumanoid.CurrentMarkings = new(sourceHumanoid.CurrentMarkings); targetHumanoid.CurrentMarkings = new(sourceHumanoid.CurrentMarkings);
targetHumanoid.Gender = sourceHumanoid.Gender;
if (TryComp<GrammarComponent>(target, out var grammar))
{
grammar.Gender = sourceHumanoid.Gender;
}
Synchronize(target, targetHumanoid); Synchronize(target, targetHumanoid);
} }