From 0948c5c5784113b2efc30d74e7fa626bcd1626c6 Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 5 Mar 2021 12:29:44 +0100 Subject: [PATCH] makes materials inherit again --- Content.Shared/Materials/Material.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Materials/Material.cs b/Content.Shared/Materials/Material.cs index 0a52570dae..dfdc401cae 100644 --- a/Content.Shared/Materials/Material.cs +++ b/Content.Shared/Materials/Material.cs @@ -13,7 +13,7 @@ namespace Content.Shared.Materials /// [Prototype("material")] [DataDefinition] - public class MaterialPrototype : IPrototype + public class MaterialPrototype : IPrototype, IInheritingPrototype { [ViewVariables] [field: DataField("id", required: true)] @@ -81,5 +81,11 @@ namespace Content.Shared.Materials /// [DataField("icon")] public SpriteSpecifier Icon { get; private set; } = SpriteSpecifier.Invalid; + + [field: DataField("parent")] + public string? Parent { get; } + + [field: DataField("abstract")] + public bool Abstract { get; } } }