From f93bdcd226e06daa3ae14d15c4cbb0c5b98316fb Mon Sep 17 00:00:00 2001 From: mirrorcult Date: Sat, 31 Jul 2021 01:59:18 -0700 Subject: [PATCH] Fix serv warnings (#4400) --- .../Chemistry/ReagentEntityReactions/AddToSolutionReaction.cs | 1 - .../Chemistry/ReagentEntityReactions/ExtinguishReaction.cs | 1 - .../Chemistry/ReagentEntityReactions/FlammableReaction.cs | 1 - .../Chemistry/ReagentEntityReactions/WashCreamPieReaction.cs | 1 - Content.Shared/Chemistry/Reagent/ReagentEntityReaction.cs | 2 +- Content.Shared/Sound/SoundSpecifier.cs | 4 +--- 6 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Content.Server/Chemistry/ReagentEntityReactions/AddToSolutionReaction.cs b/Content.Server/Chemistry/ReagentEntityReactions/AddToSolutionReaction.cs index 3218e4f983..f509fa0d56 100644 --- a/Content.Server/Chemistry/ReagentEntityReactions/AddToSolutionReaction.cs +++ b/Content.Server/Chemistry/ReagentEntityReactions/AddToSolutionReaction.cs @@ -10,7 +10,6 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy namespace Content.Server.Chemistry.ReagentEntityReactions { [UsedImplicitly] - [DataDefinition] public class AddToSolutionReaction : ReagentEntityReaction { [DataField("reagents", true, customTypeSerializer:typeof(PrototypeIdHashSetSerializer))] diff --git a/Content.Server/Chemistry/ReagentEntityReactions/ExtinguishReaction.cs b/Content.Server/Chemistry/ReagentEntityReactions/ExtinguishReaction.cs index 9078eef2d1..860df2c423 100644 --- a/Content.Server/Chemistry/ReagentEntityReactions/ExtinguishReaction.cs +++ b/Content.Server/Chemistry/ReagentEntityReactions/ExtinguishReaction.cs @@ -10,7 +10,6 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy namespace Content.Server.Chemistry.ReagentEntityReactions { [UsedImplicitly] - [DataDefinition] public class ExtinguishReaction : ReagentEntityReaction { [DataField("reagents", true, customTypeSerializer:typeof(PrototypeIdHashSetSerializer))] diff --git a/Content.Server/Chemistry/ReagentEntityReactions/FlammableReaction.cs b/Content.Server/Chemistry/ReagentEntityReactions/FlammableReaction.cs index 5242565e0e..8c71a8904d 100644 --- a/Content.Server/Chemistry/ReagentEntityReactions/FlammableReaction.cs +++ b/Content.Server/Chemistry/ReagentEntityReactions/FlammableReaction.cs @@ -10,7 +10,6 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy namespace Content.Server.Chemistry.ReagentEntityReactions { [UsedImplicitly] - [DataDefinition] public class FlammableReaction : ReagentEntityReaction { [DataField("reagents", true, customTypeSerializer:typeof(PrototypeIdHashSetSerializer))] diff --git a/Content.Server/Chemistry/ReagentEntityReactions/WashCreamPieReaction.cs b/Content.Server/Chemistry/ReagentEntityReactions/WashCreamPieReaction.cs index 44774ffcc9..8005384562 100644 --- a/Content.Server/Chemistry/ReagentEntityReactions/WashCreamPieReaction.cs +++ b/Content.Server/Chemistry/ReagentEntityReactions/WashCreamPieReaction.cs @@ -10,7 +10,6 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy namespace Content.Server.Chemistry.ReagentEntityReactions { [UsedImplicitly] - [DataDefinition] public class WashCreamPieReaction : ReagentEntityReaction { [DataField("reagents", true, customTypeSerializer:typeof(PrototypeIdHashSetSerializer))] diff --git a/Content.Shared/Chemistry/Reagent/ReagentEntityReaction.cs b/Content.Shared/Chemistry/Reagent/ReagentEntityReaction.cs index 59f931e871..fe8e081e25 100644 --- a/Content.Shared/Chemistry/Reagent/ReagentEntityReaction.cs +++ b/Content.Shared/Chemistry/Reagent/ReagentEntityReaction.cs @@ -12,7 +12,7 @@ namespace Content.Shared.Chemistry.Reagent Ingestion, } - [DataDefinition] + [ImplicitDataDefinitionForInheritors] public abstract class ReagentEntityReaction { [ViewVariables] diff --git a/Content.Shared/Sound/SoundSpecifier.cs b/Content.Shared/Sound/SoundSpecifier.cs index 616ccf9551..bb74337e8a 100644 --- a/Content.Shared/Sound/SoundSpecifier.cs +++ b/Content.Shared/Sound/SoundSpecifier.cs @@ -8,13 +8,12 @@ using Robust.Shared.Utility; namespace Content.Shared.Sound { - [DataDefinition] + [ImplicitDataDefinitionForInheritors] public abstract class SoundSpecifier { public abstract string GetSound(); } - [DataDefinition] public sealed class SoundPathSpecifier : SoundSpecifier { public const string Node = "path"; @@ -42,7 +41,6 @@ namespace Content.Shared.Sound } } - [DataDefinition] public sealed class SoundCollectionSpecifier : SoundSpecifier { public const string Node = "collection";