From d254a7d2cb8ace9119c2328f3cc1931197bdc91a Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sun, 14 May 2023 21:18:18 +1000
Subject: [PATCH] Don't add trait comps if present (#16424)

---
 Content.Server/Traits/TraitSystem.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs
index 114c0ea914..91b0d6caea 100644
--- a/Content.Server/Traits/TraitSystem.cs
+++ b/Content.Server/Traits/TraitSystem.cs
@@ -40,6 +40,9 @@ public sealed class TraitSystem : EntitySystem
             // Add all components required by the prototype
             foreach (var entry in traitPrototype.Components.Values)
             {
+                if (HasComp(args.Mob, entry.Component.GetType()))
+                    continue;
+
                 var comp = (Component) _serializationManager.CreateCopy(entry.Component, notNullableOverride: true);
                 comp.Owner = args.Mob;
                 EntityManager.AddComponent(args.Mob, comp);
-- 
2.51.2