diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs index 35316db64c3..847a4aec9f6 100644 --- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs +++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs @@ -15,7 +15,7 @@ public sealed partial class SpeciesPrototype : IPrototype /// /// User visible name of the species. /// - [DataField("name", required: true)] + [DataField(required: true)] public string Name { get; private set; } = default!; /// @@ -23,13 +23,13 @@ public sealed partial class SpeciesPrototype : IPrototype /// for an eventual integration into IdentitySystem /// (i.e., young human person, young lizard person, etc.) /// - [DataField("descriptor")] + [DataField] public string Descriptor { get; private set; } = "humanoid"; /// /// Whether the species is available "at round start" (In the character editor) /// - [DataField("roundStart", required: true)] + [DataField(required: true)] public bool RoundStart { get; private set; } = false; // Corvax-Sponsors-Start @@ -55,14 +55,14 @@ public sealed partial class SpeciesPrototype : IPrototype /// /// Default skin tone for this species. This applies for non-human skin tones. /// - [DataField("defaultSkinTone")] + [DataField] public Color DefaultSkinTone { get; private set; } = Color.White; /// /// Default human skin tone for this species. This applies for human skin tones. /// See for the valid range of skin tones. /// - [DataField("defaultHumanSkinTone")] + [DataField] public int DefaultHumanSkinTone { get; private set; } = 20; /// @@ -74,7 +74,7 @@ public sealed partial class SpeciesPrototype : IPrototype /// /// Humanoid species variant used by this entity. /// - [DataField("prototype", required: true, customTypeSerializer:typeof(PrototypeIdSerializer))] + [DataField(required: true, customTypeSerializer:typeof(PrototypeIdSerializer))] public string Prototype { get; private set; } = default!; /// @@ -86,13 +86,13 @@ public sealed partial class SpeciesPrototype : IPrototype /// /// Method of skin coloration used by the species. /// - [DataField("skinColoration", required: true)] + [DataField(required: true)] public HumanoidSkinColor SkinColoration { get; private set; } - [DataField("maleFirstNames")] + [DataField] public string MaleFirstNames { get; private set; } = "names_first_male"; - [DataField("femaleFirstNames")] + [DataField] public string FemaleFirstNames { get; private set; } = "names_first_female"; // Corvax-LastnameGender-Start: Split lastname field by gender @@ -103,35 +103,35 @@ public sealed partial class SpeciesPrototype : IPrototype public string FemaleLastNames { get; private set; } = "names_last_female"; // Corvax-LastnameGender-End - [DataField("naming")] + [DataField] public SpeciesNaming Naming { get; private set; } = SpeciesNaming.FirstLast; - [DataField("sexes")] + [DataField] public List Sexes { get; private set; } = new() { Sex.Male, Sex.Female }; /// /// Characters younger than this are too young to be hired by Nanotrasen. /// - [DataField("minAge")] + [DataField] public int MinAge = 18; /// /// Characters younger than this appear young. /// - [DataField("youngAge")] + [DataField] public int YoungAge = 30; /// /// Characters older than this appear old. Characters in between young and old age appear middle aged. /// - [DataField("oldAge")] + [DataField] public int OldAge = 60; /// /// Characters cannot be older than this. Only used for restrictions... /// although imagine if ghosts could age people WYCI... /// - [DataField("maxAge")] + [DataField] public int MaxAge = 120; } @@ -140,6 +140,5 @@ public enum SpeciesNaming : byte First, FirstLast, FirstDashFirst, - XnoY, TheFirstofLast, }