From ef52145c88337717b2797ae4f74543ef2b102fec Mon Sep 17 00:00:00 2001 From: FaDeOkno Date: Fri, 6 Dec 2024 21:34:16 +0400 Subject: [PATCH] =?UTF-8?q?=D1=8B=D1=8B=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Shared/ADT/Bark/BarkPrototype.cs | 11 +++++++++++ .../Preferences/HumanoidCharacterProfile.cs | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Content.Shared/ADT/Bark/BarkPrototype.cs b/Content.Shared/ADT/Bark/BarkPrototype.cs index 9df1efb3161..a318d494c6c 100644 --- a/Content.Shared/ADT/Bark/BarkPrototype.cs +++ b/Content.Shared/ADT/Bark/BarkPrototype.cs @@ -1,3 +1,4 @@ +using Content.Shared.Humanoid; using JetBrains.Annotations; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; @@ -89,4 +90,14 @@ public BarkData Copy() MaxVar = MaxVar }; } + + public bool MemberwiseEquals(BarkData other) + { + if (Proto != other.Proto) return false; + if (Sound != other.Sound) return false; + if (Pitch != other.Pitch) return false; + if (MinVar != other.MinVar) return false; + if (MaxVar != other.MaxVar) return false; + return true; + } } diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs index e13974814ae..3fbad0dc2ea 100644 --- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs +++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs @@ -538,7 +538,7 @@ public bool MemberwiseEquals(ICharacterProfile maybeOther) if (!Loadouts.SequenceEqual(other.Loadouts)) return false; if (FlavorText != other.FlavorText) return false; // ADT Barks start - if (!Bark.Equals(other.Bark)) return false; + if (!Bark.MemberwiseEquals(other.Bark)) return false; // ADT Barks end return Appearance.MemberwiseEquals(other.Appearance); }