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

Serv3 rework content changes (#7145)

Browse Source
This commit is contained in:
Paul Ritter
2022-04-03 02:01:22 +02:00
committed by GitHub
parent 6b01ab17a6
commit 2ff40d5a1f
133 changed files with 476 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,10 +1,7 @@
using Content.Shared.Stacks;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
using Robust.Shared.Utility;
using Robust.Shared.ViewVariables;
namespace Content.Shared.Materials
{
@@ -16,15 +13,15 @@ namespace Content.Shared.Materials
public sealed class MaterialPrototype : IPrototype, IInheritingPrototype
{
[ViewVariables]
[DataField("parent")]
[ParentDataField(typeof(PrototypeIdSerializer<MaterialPrototype>))]
public string? Parent { get; } = null;
[ViewVariables]
[DataField("abstract")]
[AbstractDataFieldAttribute]
public bool Abstract { get; } = false;
[ViewVariables]
[DataField("id", required: true)]
[IdDataFieldAttribute]
public string ID { get; } = default!;
[ViewVariables]