EyeColorFix

Mnemotechnician · Oct 9, 2024 · 15eb37b · 15eb37b
1 parent 93f2951
commit 15eb37b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/Content.Server/Shadowkin/ShadowkinSystem.cs b/Content.Server/Shadowkin/ShadowkinSystem.cs
@@ -35,6 +35,7 @@ public override void Initialize()
         SubscribeLocalEvent<ShadowkinComponent, OnAttemptPowerUseEvent>(OnAttemptPowerUse);
         SubscribeLocalEvent<ShadowkinComponent, OnManaUpdateEvent>(OnManaUpdate);
         SubscribeLocalEvent<ShadowkinComponent, RejuvenateEvent>(OnRejuvenate);
+        SubscribeLocalEvent<ShadowkinComponent, EyeColorInitEvent>(OnEyeColorChange);
     }
 
     private void OnInit(EntityUid uid, ShadowkinComponent component, ComponentStartup args)
@@ -47,6 +48,18 @@ private void OnInit(EntityUid uid, ShadowkinComponent component, ComponentStartu
         UpdateShadowkinAlert(uid, component);
     }
 
+    private void OnEyeColorChange(EntityUid uid, ShadowkinComponent component, EyeColorInitEvent args)
+    {
+        if (!TryComp<HumanoidAppearanceComponent>(uid, out var humanoid)
+            || !component.BlackeyeSpawn
+            || humanoid.EyeColor == component.OldEyeColor)
+            return;
+
+        component.OldEyeColor = humanoid.EyeColor;
+        humanoid.EyeColor = component.BlackEyeColor;
+        Dirty(humanoid);
+    }
+
     private void OnExamined(EntityUid uid, ShadowkinComponent component, ExaminedEvent args)
     {
         if (!args.IsInDetailsRange

diff --git a/Content.Shared/Humanoid/EyeColor.cs b/Content.Shared/Humanoid/EyeColor.cs
@@ -0,0 +1,4 @@
+namespace Content.Shared.Humanoid;
+
+[ByRefEvent]
+public record struct EyeColorInitEvent();
diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
@@ -345,9 +345,11 @@ public virtual void LoadProfile(EntityUid uid, HumanoidCharacterProfile? profile
             return;
         }
 
-        humanoid.EyeColor = profile.Appearance.EyeColor;
         SetSpecies(uid, profile.Species, false, humanoid);
         SetSex(uid, profile.Sex, false, humanoid);
+        humanoid.EyeColor = profile.Appearance.EyeColor;
+        var ev = new EyeColorInitEvent();
+        RaiseLocalEvent(uid, ref ev);
 
         SetSkinColor(uid, profile.Appearance.SkinColor, false);