Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

5
Content.Shared/Inventory/InventoryComponent.cs
View File

@@ -1,10 +1,9 @@
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
namespace Content.Shared.Inventory;
public abstract class InventoryComponent : Component
{
[DataField("templateId", required: true,
customTypeSerializer: typeof(PrototypeIdSerializer<InventoryTemplatePrototype>))]
[DataField("templateId", customTypeSerializer: typeof(PrototypeIdSerializer<InventoryTemplatePrototype>))]
public string TemplateId { get; } = "human";
}

2
Content.Shared/Inventory/InventoryTemplatePrototype.cs
View File

@@ -10,7 +10,7 @@ namespace Content.Shared.Inventory;
[Prototype("inventoryTemplate")]
public sealed class InventoryTemplatePrototype : IPrototype
{
[DataField("id", required: true)]
[IdDataFieldAttribute]
public string ID { get; } = string.Empty;
[DataField("slots")]