From ed9060d56ac8fd0ea51de5dca8556ddd17372872 Mon Sep 17 00:00:00 2001
From: Flipp Syder <76629141+vulppine@users.noreply.github.com>
Date: Thu, 6 Oct 2022 21:18:30 -0700
Subject: [PATCH] Fix incorrect gender on humanoid appearance cloning (#11745)

---
 Content.Server/Humanoid/Systems/HumanoidSystem.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Humanoid/Systems/HumanoidSystem.cs b/Content.Server/Humanoid/Systems/HumanoidSystem.cs
index 81146afc2a..40eb8529c4 100644
--- a/Content.Server/Humanoid/Systems/HumanoidSystem.cs
+++ b/Content.Server/Humanoid/Systems/HumanoidSystem.cs
@@ -110,7 +110,6 @@ public sealed partial class HumanoidSystem : SharedHumanoidSystem
         EnsureDefaultMarkings(uid, humanoid);
 
         humanoid.Gender = profile.Gender;
-
         if (TryComp<GrammarComponent>(uid, out var grammar))
         {
             grammar.Gender = profile.Gender;
@@ -144,6 +143,12 @@ public sealed partial class HumanoidSystem : SharedHumanoidSystem
         targetHumanoid.CustomBaseLayers = new(sourceHumanoid.CustomBaseLayers);
         targetHumanoid.CurrentMarkings = new(sourceHumanoid.CurrentMarkings);
 
+        targetHumanoid.Gender = sourceHumanoid.Gender;
+        if (TryComp<GrammarComponent>(target, out var grammar))
+        {
+            grammar.Gender = sourceHumanoid.Gender;
+        }
+
         Synchronize(target, targetHumanoid);
     }