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

prototype composition (#9979) & updates submodule

Browse Source 
* prototype composition

* a

* fixes build

* fixes test

* updates submodule

Co-authored-by: Paul Ritter <ritter.paul1@gmail.com>
This commit is contained in:
Paul Ritter
2022-08-01 14:39:37 +02:00
committed by GitHub
parent aae6da27f9
commit f77aff7b94
9 changed files with 33 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
using Content.Shared.Stacks;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
using Robust.Shared.Utility;
namespace Content.Shared.Materials
@@ -13,8 +14,8 @@ namespace Content.Shared.Materials
public sealed class MaterialPrototype : IPrototype, IInheritingPrototype
{
[ViewVariables]
[ParentDataField(typeof(AbstractPrototypeIdSerializer<MaterialPrototype>))]
public string? Parent { get; } = null;
[ParentDataField(typeof(AbstractPrototypeIdArraySerializer<MaterialPrototype>))]
public string[]? Parents { get; }
[ViewVariables]
[AbstractDataFieldAttribute]