diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs index 083026e73e552f..bac6afe0d4ca2d 100644 --- a/Content.Server/Traits/TraitSystem.cs +++ b/Content.Server/Traits/TraitSystem.cs @@ -40,6 +40,9 @@ private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent args) // 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); diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 3a0159a124a7ea..9bf88af0dc8f25 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -55,3 +55,9 @@ Entries: type: Tweak id: 9 time: '2023-05-16T08:00:00.0000000+00:00' + - author: Debug + changes: + - message: Mimes with the muted trait should no longer cause round restart loops, if only they spoke up about it sooner. + type: Fix + id: 10 + time: '2023-05-18T00:00:00.0000000+00:00'