From 73cef00aebe93f4d8a2c5005d74dbe720db14439 Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 5 Mar 2021 11:13:00 +0100 Subject: [PATCH] makes prototypeinheritance opt in --- Content.Server/AI/Utility/BehaviorSetPrototype.cs | 4 ---- Content.Server/Atmos/Reactions/GasReactionPrototype.cs | 6 +----- Content.Server/Botany/Seed.cs | 6 +----- .../GameObjects/Components/AI/AiFactionPrototype.cs | 4 ---- .../GameObjects/Components/BarSign/BarSignPrototype.cs | 3 --- Content.Server/Holiday/HolidayPrototype.cs | 4 ---- Content.Server/Objectives/ObjectivePrototype.cs | 4 ---- Content.Shared/Access/AccessLevelPrototype.cs | 4 ---- Content.Shared/Actions/BaseActionPrototype.cs | 6 +----- Content.Shared/Alert/AlertOrderPrototype.cs | 4 ---- Content.Shared/Alert/AlertPrototype.cs | 4 ---- Content.Shared/Atmos/GasPrototype.cs | 6 +----- Content.Shared/Audio/SoundCollectionPrototype.cs | 4 ---- Content.Shared/Chemistry/ReactionPrototype.cs | 4 ---- Content.Shared/Chemistry/ReagentPrototype.cs | 6 +----- Content.Shared/Construction/ConstructionGraphPrototype.cs | 2 -- Content.Shared/Construction/ConstructionPrototype.cs | 4 ---- .../Damage/DamageContainer/DamageContainerPrototype.cs | 4 ---- .../Damage/ResistanceSet/ResistanceSetPrototype.cs | 4 ---- .../Components/Body/Preset/BodyPresetPrototype.cs | 4 ---- .../Components/Body/Template/BodyTemplatePrototype.cs | 4 ---- .../ReagentDispenser/ReagentDispenserInventoryPrototype.cs | 4 ---- .../GameObjects/Components/SharedCrayonComponent.cs | 6 +----- .../Weapons/Melee/MeleeWeaponAnimationPrototype.cs | 4 ---- Content.Shared/Maps/ContentTileDefinition.cs | 6 +----- Content.Shared/Materials/Material.cs | 4 ---- Content.Shared/Prototypes/Cargo/CargoProductPrototype.cs | 4 ---- Content.Shared/Prototypes/DatasetPrototype.cs | 4 ---- .../Prototypes/Kitchen/MicrowaveMealRecipePrototype.cs | 4 ---- .../Prototypes/PDA/UplinkStoreListingPrototype.cs | 4 ---- Content.Shared/Prototypes/Tag/TagPrototype.cs | 4 ---- Content.Shared/Research/LatheRecipePrototype.cs | 4 ---- Content.Shared/Research/TechnologyPrototype.cs | 4 ---- Content.Shared/Roles/AntagPrototype.cs | 4 ---- Content.Shared/Roles/JobPrototype.cs | 4 ---- Content.Shared/Roles/StartingGearPrototype.cs | 4 ---- Content.Shared/Stacks/StackPrototype.cs | 4 ---- .../VendingMachines/VendingMachineInventoryPrototype.cs | 4 ---- 38 files changed, 7 insertions(+), 156 deletions(-) diff --git a/Content.Server/AI/Utility/BehaviorSetPrototype.cs b/Content.Server/AI/Utility/BehaviorSetPrototype.cs index b5f579239e..5519552e8b 100644 --- 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; } - /// /// Actions that this BehaviorSet grants to the entity. /// diff --git a/Content.Server/Atmos/Reactions/GasReactionPrototype.cs b/Content.Server/Atmos/Reactions/GasReactionPrototype.cs index 179864a04a..08ed811799 100644 --- 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; } - /// /// Minimum gas amount requirements. /// diff --git a/Content.Server/Botany/Seed.cs b/Content.Server/Botany/Seed.cs index 44b5ed898f..59c80e7f11 100644 --- 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; } - /// /// Unique identifier of this seed. Do NOT set this. /// diff --git a/Content.Server/GameObjects/Components/AI/AiFactionPrototype.cs b/Content.Server/GameObjects/Components/AI/AiFactionPrototype.cs index 02790d7b3d..e0b0e35204 100644 --- 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 Hostile { get; private set; } = new List(); } diff --git a/Content.Server/GameObjects/Components/BarSign/BarSignPrototype.cs b/Content.Server/GameObjects/Components/BarSign/BarSignPrototype.cs index 07b6975904..29101018ca 100644 --- 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; } = ""; diff --git a/Content.Server/Holiday/HolidayPrototype.cs b/Content.Server/Holiday/HolidayPrototype.cs index 7d9ada4894..4675943eab 100644 --- 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; diff --git a/Content.Server/Objectives/ObjectivePrototype.cs b/Content.Server/Objectives/ObjectivePrototype.cs index e804fb9a53..2a623da25f 100644 --- 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; diff --git a/Content.Shared/Access/AccessLevelPrototype.cs b/Content.Shared/Access/AccessLevelPrototype.cs index 9b2e3be96d..f422c52ea2 100644 --- 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; } - /// /// The player-visible name of the access level, in the ID card console and such. /// diff --git a/Content.Shared/Actions/BaseActionPrototype.cs b/Content.Shared/Actions/BaseActionPrototype.cs index 1102d35075..ba7fbc77aa 100644 --- 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; } - /// /// Icon representing this action in the UI. /// diff --git a/Content.Shared/Alert/AlertOrderPrototype.cs b/Content.Shared/Alert/AlertOrderPrototype.cs index 3618952589..c676d193f8 100644 --- 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 _typeToIdx = new(); diff --git a/Content.Shared/Alert/AlertPrototype.cs b/Content.Shared/Alert/AlertPrototype.cs index 27413be333..8ae4d2d414 100644 --- 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; } - /// /// Type of alert, no 2 alert prototypes should have the same one. /// diff --git a/Content.Shared/Atmos/GasPrototype.cs b/Content.Shared/Atmos/GasPrototype.cs index c698db82af..c4c6e5b692 100644 --- 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; } - /// /// Specific heat for gas. /// diff --git a/Content.Shared/Audio/SoundCollectionPrototype.cs b/Content.Shared/Audio/SoundCollectionPrototype.cs index 780c40174b..4b291ba27f 100644 --- 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 PickFiles { get; } = new(); } } diff --git a/Content.Shared/Chemistry/ReactionPrototype.cs b/Content.Shared/Chemistry/ReactionPrototype.cs index 3952807bcc..e5a1239374 100644 --- 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; diff --git a/Content.Shared/Chemistry/ReagentPrototype.cs b/Content.Shared/Chemistry/ReagentPrototype.cs index b2ded8b550..c143d7bda2 100644 --- 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; diff --git a/Content.Shared/Construction/ConstructionGraphPrototype.cs b/Content.Shared/Construction/ConstructionGraphPrototype.cs index 0be4934790..2323f7ac70 100644 --- 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; } diff --git a/Content.Shared/Construction/ConstructionPrototype.cs b/Content.Shared/Construction/ConstructionPrototype.cs index abb05b05e1..64eea30dec 100644 --- 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"; diff --git a/Content.Shared/Damage/DamageContainer/DamageContainerPrototype.cs b/Content.Shared/Damage/DamageContainer/DamageContainerPrototype.cs index 5a81827c88..de618f7752 100644 --- 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) diff --git a/Content.Shared/Damage/ResistanceSet/ResistanceSetPrototype.cs b/Content.Shared/Damage/ResistanceSet/ResistanceSetPrototype.cs index 13484c41c4..9354a690d1 100644 --- 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(); diff --git a/Content.Shared/GameObjects/Components/Body/Preset/BodyPresetPrototype.cs b/Content.Shared/GameObjects/Components/Body/Preset/BodyPresetPrototype.cs index 996bb972ef..7e040ca331 100644 --- 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 _partIDs = new(); diff --git a/Content.Shared/GameObjects/Components/Body/Template/BodyTemplatePrototype.cs b/Content.Shared/GameObjects/Components/Body/Template/BodyTemplatePrototype.cs index e0a097f977..b4fb11f4c8 100644 --- 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; diff --git a/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserInventoryPrototype.cs b/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserInventoryPrototype.cs index 8221a6982a..ad94c74380 100644 --- 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 Inventory => _inventory; } } diff --git a/Content.Shared/GameObjects/Components/SharedCrayonComponent.cs b/Content.Shared/GameObjects/Components/SharedCrayonComponent.cs index 44e4ce12d0..03fa960ab6 100644 --- 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 Decals { get; } = new(); diff --git a/Content.Shared/GameObjects/Components/Weapons/Melee/MeleeWeaponAnimationPrototype.cs b/Content.Shared/GameObjects/Components/Weapons/Melee/MeleeWeaponAnimationPrototype.cs index db3057c275..24a77b8f4b 100644 --- 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; diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs index 3f8b315b42..d006272265 100644 --- 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; } diff --git a/Content.Shared/Materials/Material.cs b/Content.Shared/Materials/Material.cs index ced689cfe3..0a52570dae 100644 --- 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; diff --git a/Content.Shared/Prototypes/Cargo/CargoProductPrototype.cs b/Content.Shared/Prototypes/Cargo/CargoProductPrototype.cs index 32e9b19609..711b0e85f9 100644 --- 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; } - /// /// Product name. /// diff --git a/Content.Shared/Prototypes/DatasetPrototype.cs b/Content.Shared/Prototypes/DatasetPrototype.cs index 7b0ad3798f..ae3b1655df 100644 --- 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 Values { get; } = new List(); } } diff --git a/Content.Shared/Prototypes/Kitchen/MicrowaveMealRecipePrototype.cs b/Content.Shared/Prototypes/Kitchen/MicrowaveMealRecipePrototype.cs index 35ed37c532..0f3733c9d7 100644 --- 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; diff --git a/Content.Shared/Prototypes/PDA/UplinkStoreListingPrototype.cs b/Content.Shared/Prototypes/PDA/UplinkStoreListingPrototype.cs index 01788120d4..d93b2e7386 100644 --- 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; diff --git a/Content.Shared/Prototypes/Tag/TagPrototype.cs b/Content.Shared/Prototypes/Tag/TagPrototype.cs index 0cb3676657..81d5561916 100644 --- 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; } } } diff --git a/Content.Shared/Research/LatheRecipePrototype.cs b/Content.Shared/Research/LatheRecipePrototype.cs index 8a6217b1b0..438023f07c 100644 --- 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; diff --git a/Content.Shared/Research/TechnologyPrototype.cs b/Content.Shared/Research/TechnologyPrototype.cs index 4c81b05861..c11cb5dfa2 100644 --- 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; } - /// /// The name this technology will have on user interfaces. /// diff --git a/Content.Shared/Roles/AntagPrototype.cs b/Content.Shared/Roles/AntagPrototype.cs index 440b3e4f97..64e29ab866 100644 --- 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; } - /// /// The name of this antag as displayed to players. /// diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs index c5eeab079f..977436278b 100644 --- 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; } - /// /// The name of this job as displayed to players. /// diff --git a/Content.Shared/Roles/StartingGearPrototype.cs b/Content.Shared/Roles/StartingGearPrototype.cs index 9e3f1c0170..9d4bdf7bd0 100644 --- 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) diff --git a/Content.Shared/Stacks/StackPrototype.cs b/Content.Shared/Stacks/StackPrototype.cs index 0d35c0e027..ea596585d2 100644 --- 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; diff --git a/Content.Shared/VendingMachines/VendingMachineInventoryPrototype.cs b/Content.Shared/VendingMachines/VendingMachineInventoryPrototype.cs index 66f9967945..8821822ab0 100644 --- 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;