From 82ddbfac0aa81b1f9a8b26d1328cbf1e5afc3010 Mon Sep 17 00:00:00 2001
From: EWanderer <6307595+Ewanderer@users.noreply.github.com>
Date: Sun, 26 Apr 2026 22:18:05 +0200
Subject: [PATCH 1/2] randomize markings, when building a random character
 appearance.

---
 .../Humanoid/HumanoidCharacterAppearance.cs   | 115 ++++++++++++++++--
 1 file changed, 103 insertions(+), 12 deletions(-)

diff --git a/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs b/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
index e9b1f0a076e..70a13dd9287 100644
--- a/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
+++ b/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
@@ -21,7 +21,11 @@ public sealed partial class HumanoidCharacterAppearance : IEquatable<HumanoidCha
     public Color SkinColor { get; set; } = Color.FromHsv(new Vector4(0.07f, 0.2f, 1f, 1f));
 
     [DataField]
-    public Dictionary<ProtoId<OrganCategoryPrototype>, Dictionary<HumanoidVisualLayers, List<Marking>>> Markings { get; set; } = new();
+    public Dictionary<ProtoId<OrganCategoryPrototype>, Dictionary<HumanoidVisualLayers, List<Marking>>> Markings
+    {
+        get;
+        set;
+    } = new();
 
     public HumanoidCharacterAppearance(
         Color eyeColor,
@@ -36,7 +40,6 @@ public sealed partial class HumanoidCharacterAppearance : IEquatable<HumanoidCha
     public HumanoidCharacterAppearance(HumanoidCharacterAppearance other) :
         this(other.EyeColor, other.SkinColor, new(other.Markings))
     {
-
     }
 
     public HumanoidCharacterAppearance WithEyeColor(Color newColor)
@@ -49,7 +52,8 @@ public sealed partial class HumanoidCharacterAppearance : IEquatable<HumanoidCha
         return new(EyeColor, newColor, Markings);
     }
 
-    public HumanoidCharacterAppearance WithMarkings(Dictionary<ProtoId<OrganCategoryPrototype>, Dictionary<HumanoidVisualLayers, List<Marking>>> newMarkings)
+    public HumanoidCharacterAppearance WithMarkings(
+        Dictionary<ProtoId<OrganCategoryPrototype>, Dictionary<HumanoidVisualLayers, List<Marking>>> newMarkings)
     {
         return new(EyeColor, SkinColor, newMarkings);
     }
@@ -87,23 +91,102 @@ public sealed partial class HumanoidCharacterAppearance : IEquatable<HumanoidCha
     {
         var random = IoCManager.Resolve<IRobustRandom>();
         var markingManager = IoCManager.Resolve<MarkingManager>();
+        var protoMan = IoCManager.Resolve<IPrototypeManager>();
+        var speciesPrototype = protoMan.Index<SpeciesPrototype>(species);
 
-        // TODO: Add random markings
+        Dictionary<ProtoId<OrganCategoryPrototype>, Dictionary<HumanoidVisualLayers, List<Marking>>> compiledMarkings =
+            new();
+        //build a color pallet for all parts.
+        var colours = Enumerable.Range(0, 255)
+            .Select(e => new Color(random.NextByte(), random.NextByte(), random.NextByte()))
+            .ToArray();
+        //most likely list of simple physical traits.
+        HumanoidVisualLayers[] layerFilter =
+        [
+        HumanoidVisualLayers.Hair,
+        HumanoidVisualLayers.Tail,
+        HumanoidVisualLayers.FacialHair,
+        HumanoidVisualLayers.Fire,
+        HumanoidVisualLayers.Snout,
+        ];
+
+        //build organ for organ
+        foreach (var organ in markingManager.GetOrgans(species))
+        {
+            //get the marking data for that organ
+            if (!markingManager.TryGetMarkingData(organ.Value, out var organMarkingData))
+                continue;
+            //extract the group based on the organ
+            var group = protoMan.Index<MarkingsGroupPrototype>(organMarkingData.Value.Group.Id);
+            // setup an empty dictionary of layers
+            compiledMarkings[organ.Key] = new();
+            //layer for layer.
+            foreach (var layer in organMarkingData.Value.Layers)
+            {
+                //only randomize physical traits.
+                if(!layerFilter.Contains(layer))
+                    continue;
+                //get all markings for that layer, sex, group and flatten to markings.
+                var markings =
+                    markingManager.MarkingsByLayerAndGroupAndSex(layer, organMarkingData.Value.Group, sex)
+                        .Select(e => e.Value.AsMarking())
+                        .ToArray();
+                //skip if no matches
+                if(markings.Length==0)
+                    continue;
+                //check restrictions for the layer
+                int limitOfMarking;
+                if (!group.Limits.TryGetValue(layer, out var limits))
+                {
+                    limitOfMarking = markings.Length;
+                }
+                else
+                {
+                    limitOfMarking = limits.Limit;
+                    //blatant skip chance unless required.
+                    if (!limits.Required && limitOfMarking==1 && random.NextDouble() < 0.5)
+                             continue;
+                }
+
+                //pick random feature list within limit
+                compiledMarkings[organ.Key][layer] = Enumerable.Range(0,limitOfMarking==1?1:random.Next(limitOfMarking))
+                    .Select(e =>
+                    {
+                       // return random.Pick(markings);
+                              var baseMarking = random.Pick(markings);
+                              for (var i = 0; i < baseMarking.MarkingColors.Count&&i<colours.Length; i++)
+                              {
+                               baseMarking= baseMarking.WithColorAt(i, colours[i]);
+                              }
+                              return baseMarking;
+                              //    return baseMarking.WithColor(color);
+                    })
+                    .ToList();
+            }
+        }
 
         var newEyeColor = random.Pick(_realisticEyeColors);
 
-        var protoMan = IoCManager.Resolve<IPrototypeManager>();
-        var skinType = protoMan.Index<SpeciesPrototype>(species).SkinColoration;
+        var skinType = speciesPrototype.SkinColoration;
         var strategy = protoMan.Index(skinType).Strategy;
 
         var newSkinColor = strategy.InputType switch
         {
             SkinColorationStrategyInput.Unary => strategy.FromUnary(random.NextFloat(0f, 100f)),
-            SkinColorationStrategyInput.Color => strategy.ClosestSkinColor(new Color(random.NextFloat(1), random.NextFloat(1), random.NextFloat(1), 1)),
+            SkinColorationStrategyInput.Color => strategy.ClosestSkinColor(new Color(random.NextFloat(1),
+                random.NextFloat(1),
+                random.NextFloat(1),
+                1)),
             _ => strategy.ClosestSkinColor(new Color(random.NextFloat(1), random.NextFloat(1), random.NextFloat(1), 1)),
         };
 
-        return new HumanoidCharacterAppearance(newEyeColor, newSkinColor, new());
+        // Safety step. Most systems which called Random() also called this, and not doing so caused issues with markings.
+        // In the future it could *maybe* be removed, but it's probably worth the extra CPU cycles to validate this info.
+
+        return EnsureValid(
+            new HumanoidCharacterAppearance(newEyeColor, newSkinColor, compiledMarkings),
+            species,
+            sex);
     }
 
     public static Color ClampColor(Color color)
@@ -111,7 +194,9 @@ public sealed partial class HumanoidCharacterAppearance : IEquatable<HumanoidCha
         return new(color.RByte, color.GByte, color.BByte);
     }
 
-    public static HumanoidCharacterAppearance EnsureValid(HumanoidCharacterAppearance appearance, ProtoId<SpeciesPrototype> species, Sex sex)
+    public static HumanoidCharacterAppearance EnsureValid(HumanoidCharacterAppearance appearance,
+        ProtoId<SpeciesPrototype> species,
+        Sex sex)
     {
         var eyeColor = ClampColor(appearance.EyeColor);
 
@@ -146,7 +231,11 @@ public sealed partial class HumanoidCharacterAppearance : IEquatable<HumanoidCha
                 markingManager.EnsureValidColors(actualMarkings);
                 markingManager.EnsureValidGroupAndSex(actualMarkings, organData.Value.Group, sex);
                 markingManager.EnsureValidLayers(actualMarkings, organData.Value.Layers);
-                markingManager.EnsureValidLimits(actualMarkings, organData.Value.Group, organData.Value.Layers, skinColor, eyeColor);
+                markingManager.EnsureValidLimits(actualMarkings,
+                    organData.Value.Group,
+                    organData.Value.Layers,
+                    skinColor,
+                    eyeColor);
 
                 validatedMarkings[organ] = actualMarkings;
             }
@@ -160,8 +249,10 @@ public sealed partial class HumanoidCharacterAppearance : IEquatable<HumanoidCha
 
     public bool Equals(HumanoidCharacterAppearance? other)
     {
-        if (ReferenceEquals(null, other)) return false;
-        if (ReferenceEquals(this, other)) return true;
+        if (ReferenceEquals(null, other))
+            return false;
+        if (ReferenceEquals(this, other))
+            return true;
         return EyeColor.Equals(other.EyeColor) &&
                SkinColor.Equals(other.SkinColor) &&
                MarkingManager.MarkingsAreEqual(Markings, other.Markings);

From 1718ff65d87eff6ac7dc645a790986f149c55fcb Mon Sep 17 00:00:00 2001
From: Coryler <coryler@gmail.com>
Date: Sat, 4 Jul 2026 16:15:27 +0200
Subject: [PATCH 2/2] Remove unnecesarry changes to whitespace/linebreak

---
 .../Humanoid/HumanoidCharacterAppearance.cs   | 37 +++++++------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs b/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
index 70a13dd9287..7e08e6dd80b 100644
--- a/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
+++ b/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
@@ -21,11 +21,7 @@ public sealed partial class HumanoidCharacterAppearance : IEquatable<HumanoidCha
     public Color SkinColor { get; set; } = Color.FromHsv(new Vector4(0.07f, 0.2f, 1f, 1f));
 
     [DataField]
-    public Dictionary<ProtoId<OrganCategoryPrototype>, Dictionary<HumanoidVisualLayers, List<Marking>>> Markings
-    {
-        get;
-        set;
-    } = new();
+    public Dictionary<ProtoId<OrganCategoryPrototype>, Dictionary<HumanoidVisualLayers, List<Marking>>> Markings { get; set; } = new();
 
     public HumanoidCharacterAppearance(
         Color eyeColor,
@@ -40,6 +36,7 @@ public sealed partial class HumanoidCharacterAppearance : IEquatable<HumanoidCha
     public HumanoidCharacterAppearance(HumanoidCharacterAppearance other) :
         this(other.EyeColor, other.SkinColor, new(other.Markings))
     {
+
     }
 
     public HumanoidCharacterAppearance WithEyeColor(Color newColor)
@@ -52,8 +49,7 @@ public sealed partial class HumanoidCharacterAppearance : IEquatable<HumanoidCha
         return new(EyeColor, newColor, Markings);
     }
 
-    public HumanoidCharacterAppearance WithMarkings(
-        Dictionary<ProtoId<OrganCategoryPrototype>, Dictionary<HumanoidVisualLayers, List<Marking>>> newMarkings)
+    public HumanoidCharacterAppearance WithMarkings(Dictionary<ProtoId<OrganCategoryPrototype>, Dictionary<HumanoidVisualLayers, List<Marking>>> newMarkings)
     {
         return new(EyeColor, SkinColor, newMarkings);
     }
@@ -91,6 +87,7 @@ public sealed partial class HumanoidCharacterAppearance : IEquatable<HumanoidCha
     {
         var random = IoCManager.Resolve<IRobustRandom>();
         var markingManager = IoCManager.Resolve<MarkingManager>();
+        // Delta V - Begin
         var protoMan = IoCManager.Resolve<IPrototypeManager>();
         var speciesPrototype = protoMan.Index<SpeciesPrototype>(species);
 
@@ -164,22 +161,21 @@ public sealed partial class HumanoidCharacterAppearance : IEquatable<HumanoidCha
                     .ToList();
             }
         }
+        // Delta V - End
 
         var newEyeColor = random.Pick(_realisticEyeColors);
 
-        var skinType = speciesPrototype.SkinColoration;
+        var skinType = speciesPrototype.SkinColoration; // Delta V
         var strategy = protoMan.Index(skinType).Strategy;
 
         var newSkinColor = strategy.InputType switch
         {
             SkinColorationStrategyInput.Unary => strategy.FromUnary(random.NextFloat(0f, 100f)),
-            SkinColorationStrategyInput.Color => strategy.ClosestSkinColor(new Color(random.NextFloat(1),
-                random.NextFloat(1),
-                random.NextFloat(1),
-                1)),
+            SkinColorationStrategyInput.Color => strategy.ClosestSkinColor(new Color(random.NextFloat(1), random.NextFloat(1), random.NextFloat(1), 1)),
             _ => strategy.ClosestSkinColor(new Color(random.NextFloat(1), random.NextFloat(1), random.NextFloat(1), 1)),
         };
 
+        // Delta V - Begin
         // Safety step. Most systems which called Random() also called this, and not doing so caused issues with markings.
         // In the future it could *maybe* be removed, but it's probably worth the extra CPU cycles to validate this info.
 
@@ -187,6 +183,7 @@ public sealed partial class HumanoidCharacterAppearance : IEquatable<HumanoidCha
             new HumanoidCharacterAppearance(newEyeColor, newSkinColor, compiledMarkings),
             species,
             sex);
+        // Delta V - End
     }
 
     public static Color ClampColor(Color color)
@@ -194,9 +191,7 @@ public sealed partial class HumanoidCharacterAppearance : IEquatable<HumanoidCha
         return new(color.RByte, color.GByte, color.BByte);
     }
 
-    public static HumanoidCharacterAppearance EnsureValid(HumanoidCharacterAppearance appearance,
-        ProtoId<SpeciesPrototype> species,
-        Sex sex)
+    public static HumanoidCharacterAppearance EnsureValid(HumanoidCharacterAppearance appearance, ProtoId<SpeciesPrototype> species, Sex sex)
     {
         var eyeColor = ClampColor(appearance.EyeColor);
 
@@ -231,11 +226,7 @@ public sealed partial class HumanoidCharacterAppearance : IEquatable<HumanoidCha
                 markingManager.EnsureValidColors(actualMarkings);
                 markingManager.EnsureValidGroupAndSex(actualMarkings, organData.Value.Group, sex);
                 markingManager.EnsureValidLayers(actualMarkings, organData.Value.Layers);
-                markingManager.EnsureValidLimits(actualMarkings,
-                    organData.Value.Group,
-                    organData.Value.Layers,
-                    skinColor,
-                    eyeColor);
+                markingManager.EnsureValidLimits(actualMarkings, organData.Value.Group, organData.Value.Layers, skinColor, eyeColor);
 
                 validatedMarkings[organ] = actualMarkings;
             }
@@ -249,10 +240,8 @@ public sealed partial class HumanoidCharacterAppearance : IEquatable<HumanoidCha
 
     public bool Equals(HumanoidCharacterAppearance? other)
     {
-        if (ReferenceEquals(null, other))
-            return false;
-        if (ReferenceEquals(this, other))
-            return true;
+        if (ReferenceEquals(null, other)) return false;
+        if (ReferenceEquals(this, other)) return true;
         return EyeColor.Equals(other.EyeColor) &&
                SkinColor.Equals(other.SkinColor) &&
                MarkingManager.MarkingsAreEqual(Markings, other.Markings);