Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

makes materials inherit again

Browse Source
This commit is contained in:
Paul
2021-03-05 12:29:44 +01:00
parent 3d5f496a3c
commit 0948c5c578
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/Materials/Material.cs
View File

@@ -13,7 +13,7 @@ namespace Content.Shared.Materials
/// </summary> /// </summary>
[Prototype("material")] [Prototype("material")]
[DataDefinition] [DataDefinition]
public class MaterialPrototype : IPrototype public class MaterialPrototype : IPrototype, IInheritingPrototype
{ {
[ViewVariables] [ViewVariables]
[field: DataField("id", required: true)] [field: DataField("id", required: true)]
@@ -81,5 +81,11 @@ namespace Content.Shared.Materials
/// </summary> /// </summary>
[DataField("icon")] [DataField("icon")]
public SpriteSpecifier Icon { get; private set; } = SpriteSpecifier.Invalid; public SpriteSpecifier Icon { get; private set; } = SpriteSpecifier.Invalid;
[field: DataField("parent")]
public string? Parent { get; }
[field: DataField("abstract")]
public bool Abstract { get; }
} }
} }