tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

abstract prototype id validation (#7519)

Browse Source
This commit is contained in:
Paul Ritter
2022-04-15 23:34:28 +02:00
committed by GitHub
parent f17b2835c5
commit f12b9fd511
5 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
View File

@@ -34,7 +34,7 @@ namespace Content.Shared.Chemistry.Reagent
[DataField("group")]
public string Group { get; } = "Unknown";
[ParentDataFieldAttribute(typeof(PrototypeIdSerializer<ReagentPrototype>))]
[ParentDataFieldAttribute(typeof(AbstractPrototypeIdSerializer<ReagentPrototype>))]
public string? Parent { get; private set; }
[NeverPushInheritance]

2
Content.Shared/Disease/DiseasePrototype.cs
View File

@@ -18,7 +18,7 @@ namespace Content.Shared.Disease
[DataField("name")]
public string Name { get; } = string.Empty;
[ParentDataFieldAttribute(typeof(PrototypeIdSerializer<DiseasePrototype>))]
[ParentDataFieldAttribute(typeof(AbstractPrototypeIdSerializer<DiseasePrototype>))]
public string? Parent { get; private set; }
[NeverPushInheritance]

2
Content.Shared/Maps/ContentTileDefinition.cs
View File

@@ -13,7 +13,7 @@ namespace Content.Shared.Maps
[Prototype("tile")]
public sealed class ContentTileDefinition : IPrototype, IInheritingPrototype, ITileDefinition
{
[ParentDataFieldAttribute(typeof(PrototypeIdSerializer<ContentTileDefinition>))]
[ParentDataFieldAttribute(typeof(AbstractPrototypeIdSerializer<ContentTileDefinition>))]
public string? Parent { get; private set; }
[NeverPushInheritance]

2
Content.Shared/Materials/MaterialPrototype.cs
View File

@@ -13,7 +13,7 @@ namespace Content.Shared.Materials
public sealed class MaterialPrototype : IPrototype, IInheritingPrototype
{
[ViewVariables]
[ParentDataField(typeof(PrototypeIdSerializer<MaterialPrototype>))]
[ParentDataField(typeof(AbstractPrototypeIdSerializer<MaterialPrototype>))]
public string? Parent { get; } = null;
[ViewVariables]

1
Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
View File

@@ -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: