diff --git a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs index 3618c22d40..e80e132b1d 100644 --- a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs +++ b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs @@ -34,7 +34,7 @@ namespace Content.Shared.Chemistry.Reagent [DataField("group")] public string Group { get; } = "Unknown"; - [ParentDataFieldAttribute(typeof(PrototypeIdSerializer))] + [ParentDataFieldAttribute(typeof(AbstractPrototypeIdSerializer))] public string? Parent { get; private set; } [NeverPushInheritance] diff --git a/Content.Shared/Disease/DiseasePrototype.cs b/Content.Shared/Disease/DiseasePrototype.cs index 93c3a51aaf..b6bdff519d 100644 --- a/Content.Shared/Disease/DiseasePrototype.cs +++ b/Content.Shared/Disease/DiseasePrototype.cs @@ -18,7 +18,7 @@ namespace Content.Shared.Disease [DataField("name")] public string Name { get; } = string.Empty; - [ParentDataFieldAttribute(typeof(PrototypeIdSerializer))] + [ParentDataFieldAttribute(typeof(AbstractPrototypeIdSerializer))] public string? Parent { get; private set; } [NeverPushInheritance] diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs index ebbb6e727f..f2bd7e6362 100644 --- a/Content.Shared/Maps/ContentTileDefinition.cs +++ b/Content.Shared/Maps/ContentTileDefinition.cs @@ -13,7 +13,7 @@ namespace Content.Shared.Maps [Prototype("tile")] public sealed class ContentTileDefinition : IPrototype, IInheritingPrototype, ITileDefinition { - [ParentDataFieldAttribute(typeof(PrototypeIdSerializer))] + [ParentDataFieldAttribute(typeof(AbstractPrototypeIdSerializer))] public string? Parent { get; private set; } [NeverPushInheritance] diff --git a/Content.Shared/Materials/MaterialPrototype.cs b/Content.Shared/Materials/MaterialPrototype.cs index 0b9d6c59ac..5dd95c8048 100644 --- a/Content.Shared/Materials/MaterialPrototype.cs +++ b/Content.Shared/Materials/MaterialPrototype.cs @@ -13,7 +13,7 @@ namespace Content.Shared.Materials public sealed class MaterialPrototype : IPrototype, IInheritingPrototype { [ViewVariables] - [ParentDataField(typeof(PrototypeIdSerializer))] + [ParentDataField(typeof(AbstractPrototypeIdSerializer))] public string? Parent { get; } = null; [ViewVariables] diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml index 03b01b8bee..e8f81fb0d3 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml @@ -348,7 +348,6 @@ id: GasCanisterBrokenBase name: broken gas canister description: A broken gas canister. Not useless yet, as it can be salvaged for high quality materials. - abstract: true components: - type: Destructible thresholds: