makes prototypeinheritance opt in

2021-03-05 11:13:00 +01:00
parent 14f2deb47f
commit 73cef00aeb
38 changed files with 7 additions and 156 deletions
--- a/Content.Server/AI/Utility/BehaviorSetPrototype.cs
+++ b/Content.Server/AI/Utility/BehaviorSetPrototype.cs
@@ -16,10 +16,6 @@ namespace Content.Server.AI.Utility
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        /// <summary>
        ///     Actions that this BehaviorSet grants to the entity.
        /// </summary>
--- a/Content.Server/Atmos/Reactions/GasReactionPrototype.cs
+++ b/Content.Server/Atmos/Reactions/GasReactionPrototype.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using System;
 using System.Collections.Generic;
 using Content.Server.Interfaces;
@@ -30,10 +30,6 @@ namespace Content.Server.Atmos.Reactions
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        /// <summary>
        ///     Minimum gas amount requirements.
        /// </summary>
--- a/Content.Server/Botany/Seed.cs
+++ b/Content.Server/Botany/Seed.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -79,10 +79,6 @@ namespace Content.Server.Botany
        [field: DataField("id", required: true)]
        public string ID { get; private init; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        /// <summary>
        ///     Unique identifier of this seed. Do NOT set this.
        /// </summary>
--- a/Content.Server/GameObjects/Components/AI/AiFactionPrototype.cs
+++ b/Content.Server/GameObjects/Components/AI/AiFactionPrototype.cs
@@ -15,10 +15,6 @@ namespace Content.Server.GameObjects.Components.AI
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        [DataField("hostile")]
        public IReadOnlyList<string> Hostile { get; private set; } = new List<string>();
    }
--- a/Content.Server/GameObjects/Components/BarSign/BarSignPrototype.cs
+++ b/Content.Server/GameObjects/Components/BarSign/BarSignPrototype.cs
@@ -16,9 +16,6 @@ namespace Content.Server.GameObjects.Components.BarSign
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }

        [DataField("icon")] public string Icon { get; private set; } = "";

--- a/Content.Server/Holiday/HolidayPrototype.cs
+++ b/Content.Server/Holiday/HolidayPrototype.cs
@@ -19,10 +19,6 @@ namespace Content.Server.Holiday
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        [ViewVariables]
        [DataField("beginDay")]
        public byte BeginDay { get; set; } = 1;
--- a/Content.Server/Objectives/ObjectivePrototype.cs
+++ b/Content.Server/Objectives/ObjectivePrototype.cs
@@ -16,10 +16,6 @@ namespace Content.Server.Objectives
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        [ViewVariables] [DataField("issuer")] public string Issuer { get; private set; } = "Unknown";

        [ViewVariables] [DataField("prob")] public float Probability { get; private set; } = 0.3f;
--- a/Content.Shared/Access/AccessLevelPrototype.cs
+++ b/Content.Shared/Access/AccessLevelPrototype.cs
@@ -16,10 +16,6 @@ namespace Content.Shared.Access
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        /// <summary>
        ///     The player-visible name of the access level, in the ID card console and such.
        /// </summary>
--- a/Content.Shared/Actions/BaseActionPrototype.cs
+++ b/Content.Shared/Actions/BaseActionPrototype.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using System;
 using System.Collections.Generic;
 using Robust.Shared.Log;
@@ -18,10 +18,6 @@ namespace Content.Shared.Actions
    {
        public abstract string ID { get; }

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        /// <summary>
        /// Icon representing this action in the UI.
        /// </summary>
--- a/Content.Shared/Alert/AlertOrderPrototype.cs
+++ b/Content.Shared/Alert/AlertOrderPrototype.cs
@@ -19,10 +19,6 @@ namespace Content.Shared.Alert
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        [DataField("order")] private readonly List<(string type, string alert)> _order = new();

        private readonly Dictionary<AlertType, int> _typeToIdx = new();
--- a/Content.Shared/Alert/AlertPrototype.cs
+++ b/Content.Shared/Alert/AlertPrototype.cs
@@ -20,10 +20,6 @@ namespace Content.Shared.Alert
        [ViewVariables]
        string IPrototype.ID => AlertType.ToString();

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        /// <summary>
        /// Type of alert, no 2 alert prototypes should have the same one.
        /// </summary>
--- a/Content.Shared/Atmos/GasPrototype.cs
+++ b/Content.Shared/Atmos/GasPrototype.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
@@ -17,10 +17,6 @@ namespace Content.Shared.Atmos
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        /// <summary>
        ///     Specific heat for gas.
        /// </summary>
--- a/Content.Shared/Audio/SoundCollectionPrototype.cs
+++ b/Content.Shared/Audio/SoundCollectionPrototype.cs
@@ -13,10 +13,6 @@ namespace Content.Shared.Audio
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        [field: DataField("files")] public List<string> PickFiles { get; } = new();
    }
 }
--- a/Content.Shared/Chemistry/ReactionPrototype.cs
+++ b/Content.Shared/Chemistry/ReactionPrototype.cs
@@ -23,10 +23,6 @@ namespace Content.Shared.Chemistry
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        [field: DataField("name")]
        public string Name { get; } = string.Empty;

--- a/Content.Shared/Chemistry/ReagentPrototype.cs
+++ b/Content.Shared/Chemistry/ReagentPrototype.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using System;
 using System.Collections.Generic;
 using Content.Shared.Interfaces.Chemistry;
@@ -32,10 +32,6 @@ namespace Content.Shared.Chemistry
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        [field: DataField("name")]
        public string Name { get; } = string.Empty;

--- a/Content.Shared/Construction/ConstructionGraphPrototype.cs
+++ b/Content.Shared/Construction/ConstructionGraphPrototype.cs
@@ -19,8 +19,6 @@ namespace Content.Shared.Construction
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [field: DataField("parent")] public string Parent { get; }
-
        [ViewVariables]
        [field: DataField("start")]
        public string Start { get; }
--- a/Content.Shared/Construction/ConstructionPrototype.cs
+++ b/Content.Shared/Construction/ConstructionPrototype.cs
@@ -62,10 +62,6 @@ namespace Content.Shared.Construction
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        [field: DataField("placementMode")]
        public string PlacementMode { get; } = "PlaceFree";

--- a/Content.Shared/Damage/DamageContainer/DamageContainerPrototype.cs
+++ b/Content.Shared/Damage/DamageContainer/DamageContainerPrototype.cs
@@ -28,10 +28,6 @@ namespace Content.Shared.Damage.DamageContainer
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        void ISerializationHooks.AfterDeserialization()
        {
            if (_supportAll)
--- a/Content.Shared/Damage/ResistanceSet/ResistanceSetPrototype.cs
+++ b/Content.Shared/Damage/ResistanceSet/ResistanceSetPrototype.cs
@@ -30,10 +30,6 @@ namespace Content.Shared.Damage.ResistanceSet
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        void ISerializationHooks.AfterDeserialization()
        {
            Resistances = new Dictionary<DamageType, ResistanceSetSettings>();
--- a/Content.Shared/GameObjects/Components/Body/Preset/BodyPresetPrototype.cs
+++ b/Content.Shared/GameObjects/Components/Body/Preset/BodyPresetPrototype.cs
@@ -20,10 +20,6 @@ namespace Content.Shared.GameObjects.Components.Body.Preset
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        [DataField("partIDs")]
        private Dictionary<string, string> _partIDs = new();

--- a/Content.Shared/GameObjects/Components/Body/Template/BodyTemplatePrototype.cs
+++ b/Content.Shared/GameObjects/Components/Body/Template/BodyTemplatePrototype.cs
@@ -32,10 +32,6 @@ namespace Content.Shared.GameObjects.Components.Body.Template
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        [ViewVariables]
        [field: DataField("name")]
        public string Name { get; } = string.Empty;
--- a/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserInventoryPrototype.cs
+++ b/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserInventoryPrototype.cs
@@ -24,10 +24,6 @@ namespace Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        public List<string> Inventory => _inventory;
    }
 }
--- a/Content.Shared/GameObjects/Components/SharedCrayonComponent.cs
+++ b/Content.Shared/GameObjects/Components/SharedCrayonComponent.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using System;
 using System.Collections.Generic;
 using Robust.Shared.GameObjects;
@@ -81,10 +81,6 @@ namespace Content.Shared.GameObjects.Components
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        [field: DataField("spritePath")] public string SpritePath { get; } = string.Empty;

        [field: DataField("decals")] public List<string> Decals { get; } = new();
--- a/Content.Shared/GameObjects/Components/Weapons/Melee/MeleeWeaponAnimationPrototype.cs
+++ b/Content.Shared/GameObjects/Components/Weapons/Melee/MeleeWeaponAnimationPrototype.cs
@@ -14,10 +14,6 @@ namespace Content.Shared.GameObjects.Components.Weapons.Melee
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        [ViewVariables]
        [field: DataField("state")]
        public string State { get; } = string.Empty;
--- a/Content.Shared/Maps/ContentTileDefinition.cs
+++ b/Content.Shared/Maps/ContentTileDefinition.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using Robust.Shared.Map;
@@ -15,10 +15,6 @@ namespace Content.Shared.Maps
        [ViewVariables]
        string IPrototype.ID => Name;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        [field: DataField("name", required: true)] public string Name { get; } = string.Empty;

        public ushort TileId { get; private set; }
--- a/Content.Shared/Materials/Material.cs
+++ b/Content.Shared/Materials/Material.cs
@@ -19,10 +19,6 @@ namespace Content.Shared.Materials
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        [DataField("name")] public string Name { get; private set; } = "unobtanium";

        [DataField("color")] public Color Color { get; private set; } = Color.Gray;
--- a/Content.Shared/Prototypes/Cargo/CargoProductPrototype.cs
+++ b/Content.Shared/Prototypes/Cargo/CargoProductPrototype.cs
@@ -20,10 +20,6 @@ namespace Content.Shared.Prototypes.Cargo
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        /// <summary>
        ///     Product name.
        /// </summary>
--- a/Content.Shared/Prototypes/DatasetPrototype.cs
+++ b/Content.Shared/Prototypes/DatasetPrototype.cs
@@ -13,10 +13,6 @@ namespace Content.Shared.Prototypes
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        [field: DataField("values")] public IReadOnlyList<string> Values { get; } = new List<string>();
    }
 }
--- a/Content.Shared/Prototypes/Kitchen/MicrowaveMealRecipePrototype.cs
+++ b/Content.Shared/Prototypes/Kitchen/MicrowaveMealRecipePrototype.cs
@@ -17,10 +17,6 @@ namespace Content.Shared.Prototypes.Kitchen
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        [DataField("name")]
        private string _name = string.Empty;

--- a/Content.Shared/Prototypes/PDA/UplinkStoreListingPrototype.cs
+++ b/Content.Shared/Prototypes/PDA/UplinkStoreListingPrototype.cs
@@ -13,10 +13,6 @@ namespace Content.Shared.Prototypes.PDA
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        [field: DataField("itemId")]
        public string ItemId { get; } = string.Empty;

--- a/Content.Shared/Prototypes/Tag/TagPrototype.cs
+++ b/Content.Shared/Prototypes/Tag/TagPrototype.cs
@@ -16,9 +16,5 @@ namespace Content.Shared.Prototypes.Tag
        [ViewVariables]
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;
-
-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
    }
 }
--- a/Content.Shared/Research/LatheRecipePrototype.cs
+++ b/Content.Shared/Research/LatheRecipePrototype.cs
@@ -17,10 +17,6 @@ namespace Content.Shared.Research
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        [DataField("name")]
        private string _name = string.Empty;

--- a/Content.Shared/Research/TechnologyPrototype.cs
+++ b/Content.Shared/Research/TechnologyPrototype.cs
@@ -19,10 +19,6 @@ namespace Content.Shared.Research
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        /// <summary>
        ///     The name this technology will have on user interfaces.
        /// </summary>
--- a/Content.Shared/Roles/AntagPrototype.cs
+++ b/Content.Shared/Roles/AntagPrototype.cs
@@ -16,10 +16,6 @@ namespace Content.Shared.Roles
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        /// <summary>
        ///     The name of this antag as displayed to players.
        /// </summary>
--- a/Content.Shared/Roles/JobPrototype.cs
+++ b/Content.Shared/Roles/JobPrototype.cs
@@ -19,10 +19,6 @@ namespace Content.Shared.Roles
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        /// <summary>
        ///     The name of this job as displayed to players.
        /// </summary>
--- a/Content.Shared/Roles/StartingGearPrototype.cs
+++ b/Content.Shared/Roles/StartingGearPrototype.cs
@@ -36,10 +36,6 @@ namespace Content.Shared.Roles
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        public string GetGear(Slots slot, HumanoidCharacterProfile? profile)
        {
            if (profile != null)
--- a/Content.Shared/Stacks/StackPrototype.cs
+++ b/Content.Shared/Stacks/StackPrototype.cs
@@ -13,10 +13,6 @@ namespace Content.Shared.Stacks
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        [field: DataField("name")]
        public string Name { get; } = string.Empty;

--- a/Content.Shared/VendingMachines/VendingMachineInventoryPrototype.cs
+++ b/Content.Shared/VendingMachines/VendingMachineInventoryPrototype.cs
@@ -15,10 +15,6 @@ namespace Content.Shared.VendingMachines
        [field: DataField("id", required: true)]
        public string ID { get; } = default!;

-        [ViewVariables]
-        [field: DataField("parent")]
-        public string? Parent { get; }
-
        [field: DataField("name")]
        public string Name { get; } = string.Empty;