diff --git a/Content.Benchmarks/EntityManagerGetAllComponents.cs b/Content.Benchmarks/EntityManagerGetAllComponents.cs index 25107662c79..e81e09c7a93 100644 --- a/Content.Benchmarks/EntityManagerGetAllComponents.cs +++ b/Content.Benchmarks/EntityManagerGetAllComponents.cs @@ -89,7 +89,6 @@ namespace Content.Benchmarks private class DummyComponent : Component { - public override string Name => "Dummy"; } } } diff --git a/Content.Client/Animations/AnimationsTestComponent.cs b/Content.Client/Animations/AnimationsTestComponent.cs index 92100ce33e7..ad9a72f81a3 100644 --- a/Content.Client/Animations/AnimationsTestComponent.cs +++ b/Content.Client/Animations/AnimationsTestComponent.cs @@ -11,8 +11,6 @@ namespace Content.Client.Animations [RegisterComponent] public sealed class AnimationsTestComponent : Component { - public override string Name => "AnimationsTest"; - protected override void Initialize() { base.Initialize(); diff --git a/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs b/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs index 37d04203417..bc9e7b73688 100644 --- a/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs +++ b/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs @@ -13,8 +13,6 @@ namespace Content.Client.CharacterInfo.Components [RegisterComponent] public sealed class CharacterInfoComponent : Component, ICharacterUI { - public override string Name => "CharacterInfo"; - public CharacterInfoControl Control = default!; public Control Scene { get; set; } = default!; diff --git a/Content.Client/CharacterInterface/CharacterInterfaceComponent.cs b/Content.Client/CharacterInterface/CharacterInterfaceComponent.cs index fd3d7e96cf1..033eda82d2f 100644 --- a/Content.Client/CharacterInterface/CharacterInterfaceComponent.cs +++ b/Content.Client/CharacterInterface/CharacterInterfaceComponent.cs @@ -14,8 +14,6 @@ namespace Content.Client.CharacterInterface [RegisterComponent] public class CharacterInterfaceComponent : Component { - public override string Name => "Character Interface Component"; - /// /// Window to hold each of the character interfaces /// diff --git a/Content.Client/Clickable/ClickableComponent.cs b/Content.Client/Clickable/ClickableComponent.cs index 6744a819ba5..564df8a706b 100644 --- a/Content.Client/Clickable/ClickableComponent.cs +++ b/Content.Client/Clickable/ClickableComponent.cs @@ -14,8 +14,6 @@ namespace Content.Client.Clickable [RegisterComponent] public sealed class ClickableComponent : Component { - public override string Name => "Clickable"; - [Dependency] private readonly IClickMapManager _clickMapManager = default!; [ViewVariables] [DataField("bounds")] private DirBoundData? _data; diff --git a/Content.Client/Clothing/ClothingComponent.cs b/Content.Client/Clothing/ClothingComponent.cs index c868938dd40..1dbaf33123b 100644 --- a/Content.Client/Clothing/ClothingComponent.cs +++ b/Content.Client/Clothing/ClothingComponent.cs @@ -13,8 +13,6 @@ namespace Content.Client.Clothing [NetworkedComponent()] public class ClothingComponent : ItemComponent { - public override string Name => "Clothing"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("femaleMask")] public FemaleClothingMask FemaleMask { get; } = FemaleClothingMask.UniformFull; diff --git a/Content.Client/Construction/ConstructionGhostComponent.cs b/Content.Client/Construction/ConstructionGhostComponent.cs index f15f23fd380..1d10a5dea07 100644 --- a/Content.Client/Construction/ConstructionGhostComponent.cs +++ b/Content.Client/Construction/ConstructionGhostComponent.cs @@ -7,8 +7,6 @@ namespace Content.Client.Construction [RegisterComponent] public class ConstructionGhostComponent : Component { - public override string Name => "ConstructionGhost"; - [ViewVariables] public ConstructionPrototype? Prototype { get; set; } [ViewVariables] public int GhostId { get; set; } } diff --git a/Content.Client/Damage/DamageVisualizerComponent.cs b/Content.Client/Damage/DamageVisualizerComponent.cs index 4e0e404ed33..6230ecb5719 100644 --- a/Content.Client/Damage/DamageVisualizerComponent.cs +++ b/Content.Client/Damage/DamageVisualizerComponent.cs @@ -13,8 +13,6 @@ namespace Content.Client.Damage [RegisterComponent] public class DamageVisualizerDataComponent : Component { - public override string Name => "DamageVisualizerData"; - public List TargetLayerMapKeys = new(); public bool Disabled = false; public bool Valid = true; diff --git a/Content.Client/DoAfter/DoAfterComponent.cs b/Content.Client/DoAfter/DoAfterComponent.cs index 879b15fbbcf..e759377caf1 100644 --- a/Content.Client/DoAfter/DoAfterComponent.cs +++ b/Content.Client/DoAfter/DoAfterComponent.cs @@ -13,8 +13,6 @@ namespace Content.Client.DoAfter [RegisterComponent] public sealed class DoAfterComponent : SharedDoAfterComponent { - public override string Name => "DoAfter"; - public IReadOnlyDictionary DoAfters => _doAfters; private readonly Dictionary _doAfters = new(); diff --git a/Content.Client/IconSmoothing/IconSmoothComponent.cs b/Content.Client/IconSmoothing/IconSmoothComponent.cs index 915deb72349..bfd786c7bbb 100644 --- a/Content.Client/IconSmoothing/IconSmoothComponent.cs +++ b/Content.Client/IconSmoothing/IconSmoothComponent.cs @@ -32,8 +32,6 @@ namespace Content.Client.IconSmoothing [DataField("mode")] private IconSmoothingMode _mode = IconSmoothingMode.Corners; - public override string Name => "IconSmooth"; - internal ISpriteComponent? Sprite { get; private set; } public (GridId, Vector2i)? LastPosition; diff --git a/Content.Client/Interactable/Components/InteractionOutlineComponent.cs b/Content.Client/Interactable/Components/InteractionOutlineComponent.cs index 17a313e3db8..e0d83885353 100644 --- a/Content.Client/Interactable/Components/InteractionOutlineComponent.cs +++ b/Content.Client/Interactable/Components/InteractionOutlineComponent.cs @@ -15,9 +15,6 @@ namespace Content.Client.Interactable.Components private const float DefaultWidth = 1; private const string ShaderInRange = "SelectionOutlineInrange"; private const string ShaderOutOfRange = "SelectionOutline"; - - public override string Name => "InteractionOutline"; - private bool _inRange; private ShaderInstance? _shader; private int _lastRenderScale; diff --git a/Content.Client/Items/Components/ItemStatusComponent.cs b/Content.Client/Items/Components/ItemStatusComponent.cs index a5aecc2bc0b..8bf2d1cda14 100644 --- a/Content.Client/Items/Components/ItemStatusComponent.cs +++ b/Content.Client/Items/Components/ItemStatusComponent.cs @@ -5,8 +5,5 @@ namespace Content.Client.Items.Components [RegisterComponent] public class ItemStatusComponent : Component { - public override string Name => "ItemStatus"; - - } } diff --git a/Content.Client/Markers/MarkerComponent.cs b/Content.Client/Markers/MarkerComponent.cs index 2ac08b33380..630ddba7ef5 100644 --- a/Content.Client/Markers/MarkerComponent.cs +++ b/Content.Client/Markers/MarkerComponent.cs @@ -7,8 +7,6 @@ namespace Content.Client.Markers [RegisterComponent] public sealed class MarkerComponent : Component { - public override string Name => "Marker"; - protected override void Startup() { base.Startup(); diff --git a/Content.Client/Spawners/ClientEntitySpawnerComponent.cs b/Content.Client/Spawners/ClientEntitySpawnerComponent.cs index 0c4b5848f40..79cafc399d9 100644 --- a/Content.Client/Spawners/ClientEntitySpawnerComponent.cs +++ b/Content.Client/Spawners/ClientEntitySpawnerComponent.cs @@ -9,12 +9,11 @@ namespace Content.Client.Spawners /// Spawns a set of entities on the client only, and removes them when this component is removed. /// [RegisterComponent] + [ComponentProtoName("ClientEntitySpawner")] public class ClientEntitySpawnerComponent : Component { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "ClientEntitySpawner"; - [DataField("prototypes")] private List _prototypes = new() { "HVDummyWire" }; private readonly List _entity = new(); diff --git a/Content.Client/Tools/Components/WelderComponent.cs b/Content.Client/Tools/Components/WelderComponent.cs index bd226f5ca03..ef9f89e9d0a 100644 --- a/Content.Client/Tools/Components/WelderComponent.cs +++ b/Content.Client/Tools/Components/WelderComponent.cs @@ -16,8 +16,6 @@ namespace Content.Client.Tools.Components [RegisterComponent, Friend(typeof(ToolSystem), typeof(StatusControl))] public class WelderComponent : SharedWelderComponent, IItemStatus { - public override string Name => "Welder"; - [ViewVariables(VVAccess.ReadWrite)] public bool UiUpdateNeeded { get; set; } diff --git a/Content.Client/Wall/Components/ReinforcedWallComponent.cs b/Content.Client/Wall/Components/ReinforcedWallComponent.cs index 0c1e99ce002..3e5dddfd60e 100644 --- a/Content.Client/Wall/Components/ReinforcedWallComponent.cs +++ b/Content.Client/Wall/Components/ReinforcedWallComponent.cs @@ -11,8 +11,6 @@ namespace Content.Client.Wall.Components [ComponentReference(typeof(IconSmoothComponent))] public class ReinforcedWallComponent : IconSmoothComponent // whyyyyyyyyy { - public override string Name => "ReinforcedWall"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("reinforcedBase")] private string? _reinforcedStateBase = default; diff --git a/Content.Client/Weapons/Melee/Components/MeleeLungeComponent.cs b/Content.Client/Weapons/Melee/Components/MeleeLungeComponent.cs index d9e91e894be..f400324de7c 100644 --- a/Content.Client/Weapons/Melee/Components/MeleeLungeComponent.cs +++ b/Content.Client/Weapons/Melee/Components/MeleeLungeComponent.cs @@ -8,8 +8,6 @@ namespace Content.Client.Weapons.Melee.Components [RegisterComponent] public sealed class MeleeLungeComponent : Component { - public override string Name => "MeleeLunge"; - private const float ResetTime = 0.3f; private const float BaseOffset = 0.25f; diff --git a/Content.Client/Weapons/Melee/Components/MeleeWeaponArcAnimationComponent.cs b/Content.Client/Weapons/Melee/Components/MeleeWeaponArcAnimationComponent.cs index 1860c0b1a0b..6d0ceaea0e8 100644 --- a/Content.Client/Weapons/Melee/Components/MeleeWeaponArcAnimationComponent.cs +++ b/Content.Client/Weapons/Melee/Components/MeleeWeaponArcAnimationComponent.cs @@ -11,9 +11,6 @@ namespace Content.Client.Weapons.Melee.Components public sealed class MeleeWeaponArcAnimationComponent : Component { [Dependency] private readonly IEntityManager _entMan = default!; - - public override string Name => "MeleeWeaponArcAnimation"; - private MeleeWeaponAnimationPrototype? _meleeWeaponAnimation; private float _timer; diff --git a/Content.Client/Weapons/Ranged/Barrels/Components/ClientBatteryBarrelComponent.cs b/Content.Client/Weapons/Ranged/Barrels/Components/ClientBatteryBarrelComponent.cs index 37583c46a29..537ed655dfd 100644 --- a/Content.Client/Weapons/Ranged/Barrels/Components/ClientBatteryBarrelComponent.cs +++ b/Content.Client/Weapons/Ranged/Barrels/Components/ClientBatteryBarrelComponent.cs @@ -19,8 +19,6 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components [NetworkedComponent()] public class ClientBatteryBarrelComponent : Component, IItemStatus { - public override string Name => "BatteryBarrel"; - private StatusControl? _statusControl; /// diff --git a/Content.Client/Weapons/Ranged/Barrels/Components/ClientBoltActionBarrelComponent.cs b/Content.Client/Weapons/Ranged/Barrels/Components/ClientBoltActionBarrelComponent.cs index 3b28481fc0c..870008da5f5 100644 --- a/Content.Client/Weapons/Ranged/Barrels/Components/ClientBoltActionBarrelComponent.cs +++ b/Content.Client/Weapons/Ranged/Barrels/Components/ClientBoltActionBarrelComponent.cs @@ -19,8 +19,6 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components [NetworkedComponent()] public class ClientBoltActionBarrelComponent : Component, IItemStatus { - public override string Name => "BoltActionBarrel"; - private StatusControl? _statusControl; /// diff --git a/Content.Client/Weapons/Ranged/Barrels/Components/ClientMagazineBarrelComponent.cs b/Content.Client/Weapons/Ranged/Barrels/Components/ClientMagazineBarrelComponent.cs index f148ff5359c..75692a92922 100644 --- a/Content.Client/Weapons/Ranged/Barrels/Components/ClientMagazineBarrelComponent.cs +++ b/Content.Client/Weapons/Ranged/Barrels/Components/ClientMagazineBarrelComponent.cs @@ -67,9 +67,6 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components } } }; - - public override string Name => "MagazineBarrel"; - private StatusControl? _statusControl; /// diff --git a/Content.Client/Weapons/Ranged/Barrels/Components/ClientPumpBarrelComponent.cs b/Content.Client/Weapons/Ranged/Barrels/Components/ClientPumpBarrelComponent.cs index 215b63235c6..59f81526d18 100644 --- a/Content.Client/Weapons/Ranged/Barrels/Components/ClientPumpBarrelComponent.cs +++ b/Content.Client/Weapons/Ranged/Barrels/Components/ClientPumpBarrelComponent.cs @@ -19,8 +19,6 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components [NetworkedComponent()] public class ClientPumpBarrelComponent : Component, IItemStatus { - public override string Name => "PumpBarrel"; - private StatusControl? _statusControl; /// diff --git a/Content.Client/Weapons/Ranged/Barrels/Components/ClientRevolverBarrelComponent.cs b/Content.Client/Weapons/Ranged/Barrels/Components/ClientRevolverBarrelComponent.cs index c4054a43a90..f100ab1705c 100644 --- a/Content.Client/Weapons/Ranged/Barrels/Components/ClientRevolverBarrelComponent.cs +++ b/Content.Client/Weapons/Ranged/Barrels/Components/ClientRevolverBarrelComponent.cs @@ -17,8 +17,6 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components [NetworkedComponent()] public class ClientRevolverBarrelComponent : Component, IItemStatus { - public override string Name => "RevolverBarrel"; - private StatusControl? _statusControl; /// diff --git a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs index 9a31a29f444..e913abf5971 100644 --- a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs +++ b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs @@ -392,8 +392,6 @@ namespace Content.IntegrationTests.Tests.Networking [NetworkedComponent()] private sealed class PredictionTestComponent : Component { - public override string Name => "PredictionTest"; - private bool _foo; public bool Foo diff --git a/Content.Server/AI/Components/AiControllerComponent.cs b/Content.Server/AI/Components/AiControllerComponent.cs index 0cf2cf33cf0..43a5474bb37 100644 --- a/Content.Server/AI/Components/AiControllerComponent.cs +++ b/Content.Server/AI/Components/AiControllerComponent.cs @@ -18,8 +18,6 @@ namespace Content.Server.AI.Components { [DataField("logic")] private float _visionRadius = 8.0f; - public override string Name => "AiController"; - // TODO: Need to ECS a lot more of the AI first before we can ECS this /// /// Whether the AI is actively iterated. diff --git a/Content.Server/AI/Components/AiFactionTagComponent.cs b/Content.Server/AI/Components/AiFactionTagComponent.cs index 5a7ca92326b..698b76a84c5 100644 --- a/Content.Server/AI/Components/AiFactionTagComponent.cs +++ b/Content.Server/AI/Components/AiFactionTagComponent.cs @@ -7,8 +7,6 @@ namespace Content.Server.AI.Components [RegisterComponent] public sealed class AiFactionTagComponent : Component { - public override string Name => "AiFactionTag"; - [DataField("factions")] public Faction Factions { get; private set; } = Faction.None; } diff --git a/Content.Server/AI/Utility/AiLogic/UtilityAI.cs b/Content.Server/AI/Utility/AiLogic/UtilityAI.cs index f4629108f66..a4c4476be8b 100644 --- a/Content.Server/AI/Utility/AiLogic/UtilityAI.cs +++ b/Content.Server/AI/Utility/AiLogic/UtilityAI.cs @@ -22,11 +22,10 @@ namespace Content.Server.AI.Utility.AiLogic { // TODO: Need to split out the IMover stuff for NPC to a generic one that can be used for hoomans as well. [RegisterComponent] + [ComponentProtoName("UtilityAI")] [ComponentReference(typeof(AiControllerComponent)), ComponentReference(typeof(IMoverComponent))] public sealed class UtilityAi : AiControllerComponent, ISerializationHooks { - public override string Name => "UtilityAI"; - // TODO: Look at having ParallelOperators (probably no more than that as then you'd have a full-blown BT) // Also RepeatOperators (e.g. if we're following an entity keep repeating MoveToEntity) private AiActionSystem _planner = default!; diff --git a/Content.Server/AME/Components/AMEFuelContainerComponent.cs b/Content.Server/AME/Components/AMEFuelContainerComponent.cs index ff5558c9175..30403a6e8ff 100644 --- a/Content.Server/AME/Components/AMEFuelContainerComponent.cs +++ b/Content.Server/AME/Components/AMEFuelContainerComponent.cs @@ -6,8 +6,6 @@ namespace Content.Server.AME.Components [RegisterComponent] public class AMEFuelContainerComponent : Component { - public override string Name => "AMEFuelContainer"; - private int _fuelAmount; private int _maxFuelAmount; diff --git a/Content.Server/AME/Components/AMEPartComponent.cs b/Content.Server/AME/Components/AMEPartComponent.cs index 4e33af6e8cd..5db4ad46fcf 100644 --- a/Content.Server/AME/Components/AMEPartComponent.cs +++ b/Content.Server/AME/Components/AMEPartComponent.cs @@ -25,8 +25,6 @@ namespace Content.Server.AME.Components [Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IServerEntityManager _serverEntityManager = default!; - public override string Name => "AMEPart"; - [DataField("unwrapSound")] private SoundSpecifier _unwrapSound = new SoundPathSpecifier("/Audio/Effects/unwrap.ogg"); diff --git a/Content.Server/Access/Components/PresetIdCardComponent.cs b/Content.Server/Access/Components/PresetIdCardComponent.cs index 56588d3640f..f0bfc0678aa 100644 --- a/Content.Server/Access/Components/PresetIdCardComponent.cs +++ b/Content.Server/Access/Components/PresetIdCardComponent.cs @@ -9,8 +9,6 @@ namespace Content.Server.Access.Components [RegisterComponent] public class PresetIdCardComponent : Component { - public override string Name => "PresetIdCard"; - [DataField("job")] public readonly string? JobName; } diff --git a/Content.Server/Advertise/AdvertiseComponent.cs b/Content.Server/Advertise/AdvertiseComponent.cs index d88f5c82458..797c78c1357 100644 --- a/Content.Server/Advertise/AdvertiseComponent.cs +++ b/Content.Server/Advertise/AdvertiseComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Advertise [RegisterComponent, Friend(typeof(AdvertiseSystem))] public class AdvertiseComponent : Component { - public override string Name => "Advertise"; - /// /// Minimum time in seconds to wait before saying a new ad, in seconds. Has to be larger than or equal to 1. /// diff --git a/Content.Server/Animals/Components/UdderComponent.cs b/Content.Server/Animals/Components/UdderComponent.cs index 97d8fee4b18..d0c68061ef8 100644 --- a/Content.Server/Animals/Components/UdderComponent.cs +++ b/Content.Server/Animals/Components/UdderComponent.cs @@ -13,8 +13,6 @@ namespace Content.Server.Animals.Components [RegisterComponent, Friend(typeof(UdderSystem))] internal class UdderComponent : Component { - public override string Name => "Udder"; - /// /// The reagent to produce. /// diff --git a/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs b/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs index 45d20e12612..c6f35c94fe7 100644 --- a/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs +++ b/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs @@ -20,9 +20,6 @@ namespace Content.Server.Arcade.Components public class BlockGameArcadeComponent : Component, IActivate { [Dependency] private readonly IRobustRandom _random = default!; - - public override string Name => "BlockGameArcade"; - [Dependency] private readonly IEntityManager _entityManager = default!; private bool Powered => _entityManager.TryGetComponent(Owner, out var powerReceiverComponent) && powerReceiverComponent.Powered; diff --git a/Content.Server/Armor/ArmorComponent.cs b/Content.Server/Armor/ArmorComponent.cs index b0d932572f9..81dd7ec74fd 100644 --- a/Content.Server/Armor/ArmorComponent.cs +++ b/Content.Server/Armor/ArmorComponent.cs @@ -7,8 +7,6 @@ namespace Content.Server.Armor [RegisterComponent] public class ArmorComponent : Component { - public override string Name => "Armor"; - [DataField("modifiers", required: true)] public DamageModifierSet Modifiers = default!; } diff --git a/Content.Server/Atmos/Components/AirtightComponent.cs b/Content.Server/Atmos/Components/AirtightComponent.cs index ef543e940fe..8cf4d733c5a 100644 --- a/Content.Server/Atmos/Components/AirtightComponent.cs +++ b/Content.Server/Atmos/Components/AirtightComponent.cs @@ -13,8 +13,6 @@ namespace Content.Server.Atmos.Components [RegisterComponent] public class AirtightComponent : Component { - public override string Name => "Airtight"; - public (GridId Grid, Vector2i Tile) LastPosition { get; set; } [DataField("airBlockedDirection", customTypeSerializer: typeof(FlagSerializer))] diff --git a/Content.Server/Atmos/Components/AtmosExposedComponent.cs b/Content.Server/Atmos/Components/AtmosExposedComponent.cs index e2573d9f7ff..8f29f5b3ad6 100644 --- a/Content.Server/Atmos/Components/AtmosExposedComponent.cs +++ b/Content.Server/Atmos/Components/AtmosExposedComponent.cs @@ -9,6 +9,5 @@ namespace Content.Server.Atmos.Components [RegisterComponent] public class AtmosExposedComponent : Component { - public override string Name => "AtmosExposed"; } } diff --git a/Content.Server/Atmos/Components/AtmosFixMarkerComponent.cs b/Content.Server/Atmos/Components/AtmosFixMarkerComponent.cs index 712f847fd50..337228aa306 100644 --- a/Content.Server/Atmos/Components/AtmosFixMarkerComponent.cs +++ b/Content.Server/Atmos/Components/AtmosFixMarkerComponent.cs @@ -9,8 +9,6 @@ namespace Content.Server.Atmos.Components [RegisterComponent] public class AtmosFixMarkerComponent : Component { - public override string Name => "AtmosFixMarker"; - // See FixGridAtmos for more details [DataField("mode")] public int Mode { get; set; } = 0; diff --git a/Content.Server/Atmos/Components/BarotraumaComponent.cs b/Content.Server/Atmos/Components/BarotraumaComponent.cs index 9dba64a22c9..0719d9befbf 100644 --- a/Content.Server/Atmos/Components/BarotraumaComponent.cs +++ b/Content.Server/Atmos/Components/BarotraumaComponent.cs @@ -12,8 +12,6 @@ namespace Content.Server.Atmos.Components [RegisterComponent] public class BarotraumaComponent : Component { - public override string Name => "Barotrauma"; - [DataField("damage", required: true)] [ViewVariables(VVAccess.ReadWrite)] public DamageSpecifier Damage = default!; diff --git a/Content.Server/Atmos/Components/BreathToolComponent.cs b/Content.Server/Atmos/Components/BreathToolComponent.cs index bee6c4c662e..536829ca88a 100644 --- a/Content.Server/Atmos/Components/BreathToolComponent.cs +++ b/Content.Server/Atmos/Components/BreathToolComponent.cs @@ -12,6 +12,7 @@ namespace Content.Server.Atmos.Components /// Used in internals as breath tool. /// [RegisterComponent] + [ComponentProtoName("BreathMask")] public class BreathToolComponent : Component { [Dependency] private readonly IEntityManager _entities = default!; @@ -21,8 +22,6 @@ namespace Content.Server.Atmos.Components /// [DataField("allowedSlots")] public SlotFlags AllowedSlots = SlotFlags.MASK; - - public override string Name => "BreathMask"; public bool IsFunctional; public EntityUid ConnectedInternalsEntity; diff --git a/Content.Server/Atmos/Components/FlammableComponent.cs b/Content.Server/Atmos/Components/FlammableComponent.cs index 88be46c850a..bc0d13c5b05 100644 --- a/Content.Server/Atmos/Components/FlammableComponent.cs +++ b/Content.Server/Atmos/Components/FlammableComponent.cs @@ -10,8 +10,6 @@ namespace Content.Server.Atmos.Components [RegisterComponent] public class FlammableComponent : Component { - public override string Name => "Flammable"; - [ViewVariables] public bool Resisting = false; diff --git a/Content.Server/Atmos/Components/GasMixtureHolderComponent.cs b/Content.Server/Atmos/Components/GasMixtureHolderComponent.cs index 50b5af62f8b..bf213354a72 100644 --- a/Content.Server/Atmos/Components/GasMixtureHolderComponent.cs +++ b/Content.Server/Atmos/Components/GasMixtureHolderComponent.cs @@ -7,8 +7,6 @@ namespace Content.Server.Atmos.Components [RegisterComponent] public class GasMixtureHolderComponent : Component, IGasMixtureHolder { - public override string Name => "GasMixtureHolder"; - [ViewVariables] [DataField("air")] public GasMixture Air { get; set; } = new GasMixture(); } } diff --git a/Content.Server/Atmos/Components/GasTankComponent.cs b/Content.Server/Atmos/Components/GasTankComponent.cs index b9dd51bf8c2..1a8c10e7aa7 100644 --- a/Content.Server/Atmos/Components/GasTankComponent.cs +++ b/Content.Server/Atmos/Components/GasTankComponent.cs @@ -36,8 +36,6 @@ namespace Content.Server.Atmos.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "GasTank"; - private const float MaxExplosionRange = 14f; private const float DefaultOutputPressure = Atmospherics.OneAtmosphere; diff --git a/Content.Server/Atmos/Components/GridAtmosphereComponent.cs b/Content.Server/Atmos/Components/GridAtmosphereComponent.cs index ad548f1b9db..570553923f0 100644 --- a/Content.Server/Atmos/Components/GridAtmosphereComponent.cs +++ b/Content.Server/Atmos/Components/GridAtmosphereComponent.cs @@ -20,8 +20,6 @@ namespace Content.Server.Atmos.Components [RegisterComponent, Serializable] public class GridAtmosphereComponent : Component, IAtmosphereComponent, ISerializationHooks { - public override string Name => "GridAtmosphere"; - public virtual bool Simulated => true; [ViewVariables] diff --git a/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs b/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs index f5c043e65ce..94cfdfcaa34 100644 --- a/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs +++ b/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs @@ -11,9 +11,7 @@ namespace Content.Server.Atmos.Components [RegisterComponent] public class IgniteOnCollideComponent : Component { - public override string Name => "IgniteOnCollide"; - [DataField("fireStacks")] - public float FireStacks { get; set; } + public float FireStacks { get; set; } } } diff --git a/Content.Server/Atmos/Components/MovedByPressureComponent.cs b/Content.Server/Atmos/Components/MovedByPressureComponent.cs index dc85ca7dded..afa40dd3fd6 100644 --- a/Content.Server/Atmos/Components/MovedByPressureComponent.cs +++ b/Content.Server/Atmos/Components/MovedByPressureComponent.cs @@ -20,8 +20,6 @@ namespace Content.Server.Atmos.Components [Dependency] private readonly IRobustRandom _robustRandom = default!; [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "MovedByPressure"; - private const float MoveForcePushRatio = 1f; private const float MoveForceForcePushRatio = 1f; private const float ProbabilityOffset = 25f; diff --git a/Content.Server/Atmos/Components/PressureProtectionComponent.cs b/Content.Server/Atmos/Components/PressureProtectionComponent.cs index f3160528a40..9eb086684bc 100644 --- a/Content.Server/Atmos/Components/PressureProtectionComponent.cs +++ b/Content.Server/Atmos/Components/PressureProtectionComponent.cs @@ -7,8 +7,6 @@ namespace Content.Server.Atmos.Components [RegisterComponent] public class PressureProtectionComponent : Component { - public override string Name => "PressureProtection"; - [DataField("highPressureMultiplier")] public float HighPressureMultiplier { get; } = 1f; diff --git a/Content.Server/Atmos/Components/SpaceAtmosphereComponent.cs b/Content.Server/Atmos/Components/SpaceAtmosphereComponent.cs index 3d42d247624..503bf261ae4 100644 --- a/Content.Server/Atmos/Components/SpaceAtmosphereComponent.cs +++ b/Content.Server/Atmos/Components/SpaceAtmosphereComponent.cs @@ -6,8 +6,6 @@ namespace Content.Server.Atmos.Components [ComponentReference(typeof(IAtmosphereComponent))] public class SpaceAtmosphereComponent : Component, IAtmosphereComponent { - public override string Name => "SpaceAtmosphere"; - public bool Simulated => false; } } diff --git a/Content.Server/Atmos/Components/TemperatureProtectionComponent.cs b/Content.Server/Atmos/Components/TemperatureProtectionComponent.cs index a7cb4a4915c..422249f1aa1 100644 --- a/Content.Server/Atmos/Components/TemperatureProtectionComponent.cs +++ b/Content.Server/Atmos/Components/TemperatureProtectionComponent.cs @@ -7,8 +7,6 @@ namespace Content.Server.Atmos.Components; [RegisterComponent] public class TemperatureProtectionComponent : Component { - public override string Name => "TemperatureProtection"; - /// /// How much to multiply temperature deltas by. /// diff --git a/Content.Server/Atmos/Components/UnsimulatedGridAtmosphereComponent.cs b/Content.Server/Atmos/Components/UnsimulatedGridAtmosphereComponent.cs index a01d98c1da0..2aebb27480d 100644 --- a/Content.Server/Atmos/Components/UnsimulatedGridAtmosphereComponent.cs +++ b/Content.Server/Atmos/Components/UnsimulatedGridAtmosphereComponent.cs @@ -12,8 +12,6 @@ namespace Content.Server.Atmos.Components [Serializable] public class UnsimulatedGridAtmosphereComponent : GridAtmosphereComponent { - public override string Name => "UnsimulatedGridAtmosphere"; - public override bool Simulated => false; } } diff --git a/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs b/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs index c0c48337f22..17dbd9b735f 100644 --- a/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs +++ b/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs @@ -29,8 +29,6 @@ namespace Content.Server.Atmos.Monitor.Components // Remember to null this afterwards. [ViewVariables] public IAirAlarmModeUpdate? CurrentModeUpdater { get; set; } - public override string Name => "AirAlarm"; - public Dictionary DeviceData = new(); public HashSet ActivePlayers = new(); diff --git a/Content.Server/Atmos/Monitor/Components/AtmosAlarmableComponent.cs b/Content.Server/Atmos/Monitor/Components/AtmosAlarmableComponent.cs index b3597c96397..6cb489f2be6 100644 --- a/Content.Server/Atmos/Monitor/Components/AtmosAlarmableComponent.cs +++ b/Content.Server/Atmos/Monitor/Components/AtmosAlarmableComponent.cs @@ -28,8 +28,6 @@ namespace Content.Server.Atmos.Monitor.Components [RegisterComponent] public class AtmosAlarmableComponent : Component { - public override string Name => "AtmosAlarmable"; - [ViewVariables] public List LinkedMonitors { get; set; } = new(); diff --git a/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs b/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs index 060ae31dc5c..f0bc53e5984 100644 --- a/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs +++ b/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs @@ -14,8 +14,6 @@ namespace Content.Server.Atmos.Monitor.Components [RegisterComponent] public class AtmosMonitorComponent : Component { - public override string Name => "AtmosMonitor"; - // Whether this monitor can send alarms, // or recieve atmos command events. // diff --git a/Content.Server/Atmos/Monitor/Components/FireAlarmComponent.cs b/Content.Server/Atmos/Monitor/Components/FireAlarmComponent.cs index 89088cba5c5..bcef870570d 100644 --- a/Content.Server/Atmos/Monitor/Components/FireAlarmComponent.cs +++ b/Content.Server/Atmos/Monitor/Components/FireAlarmComponent.cs @@ -24,9 +24,6 @@ namespace Content.Server.Atmos.Monitor.Components [Dependency] private readonly IEntityManager _entMan = default!; private AtmosMonitorSystem? _atmosMonitorSystem; - - public override string Name => "FireAlarm"; - private CancellationTokenSource _powerPulsedCancel = new(); private int PowerPulsedTimeout = 30; diff --git a/Content.Server/Atmos/Piping/Binary/Components/GasDualPortVentPumpComponent.cs b/Content.Server/Atmos/Piping/Binary/Components/GasDualPortVentPumpComponent.cs index e59833c8a47..c76d1b0928c 100644 --- a/Content.Server/Atmos/Piping/Binary/Components/GasDualPortVentPumpComponent.cs +++ b/Content.Server/Atmos/Piping/Binary/Components/GasDualPortVentPumpComponent.cs @@ -10,8 +10,6 @@ namespace Content.Server.Atmos.Piping.Binary.Components [RegisterComponent] public class GasDualPortVentPumpComponent : Component { - public override string Name => "GasDualPortVentPump"; - [ViewVariables(VVAccess.ReadWrite)] public bool Enabled { get; set; } = true; diff --git a/Content.Server/Atmos/Piping/Binary/Components/GasPassiveGateComponent.cs b/Content.Server/Atmos/Piping/Binary/Components/GasPassiveGateComponent.cs index 93366c67c5b..f7ea4b8adf6 100644 --- a/Content.Server/Atmos/Piping/Binary/Components/GasPassiveGateComponent.cs +++ b/Content.Server/Atmos/Piping/Binary/Components/GasPassiveGateComponent.cs @@ -8,8 +8,6 @@ namespace Content.Server.Atmos.Piping.Binary.Components [RegisterComponent] public class GasPassiveGateComponent : Component { - public override string Name => "GasPassiveGate"; - [DataField("enabled")] [ViewVariables(VVAccess.ReadWrite)] public bool Enabled { get; set; } = true; diff --git a/Content.Server/Atmos/Piping/Binary/Components/GasPortComponent.cs b/Content.Server/Atmos/Piping/Binary/Components/GasPortComponent.cs index 454a27f98ad..3707ff3d8cc 100644 --- a/Content.Server/Atmos/Piping/Binary/Components/GasPortComponent.cs +++ b/Content.Server/Atmos/Piping/Binary/Components/GasPortComponent.cs @@ -7,8 +7,6 @@ namespace Content.Server.Atmos.Piping.Binary.Components [RegisterComponent] public class GasPortComponent : Component { - public override string Name => "GasPort"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("pipe")] public string PipeName { get; set; } = "connected"; diff --git a/Content.Server/Atmos/Piping/Binary/Components/GasPressurePumpComponent.cs b/Content.Server/Atmos/Piping/Binary/Components/GasPressurePumpComponent.cs index 330f23c9a8d..0920e25dab1 100644 --- a/Content.Server/Atmos/Piping/Binary/Components/GasPressurePumpComponent.cs +++ b/Content.Server/Atmos/Piping/Binary/Components/GasPressurePumpComponent.cs @@ -8,8 +8,6 @@ namespace Content.Server.Atmos.Piping.Binary.Components [RegisterComponent] public class GasPressurePumpComponent : Component { - public override string Name => "GasPressurePump"; - [ViewVariables(VVAccess.ReadWrite)] public bool Enabled { get; set; } = true; diff --git a/Content.Server/Atmos/Piping/Binary/Components/GasValveComponent.cs b/Content.Server/Atmos/Piping/Binary/Components/GasValveComponent.cs index e9126853333..5669e454cc7 100644 --- a/Content.Server/Atmos/Piping/Binary/Components/GasValveComponent.cs +++ b/Content.Server/Atmos/Piping/Binary/Components/GasValveComponent.cs @@ -8,8 +8,6 @@ namespace Content.Server.Atmos.Piping.Binary.Components [RegisterComponent] public class GasValveComponent : Component { - public override string Name => "GasValve"; - [ViewVariables] [DataField("open")] public bool Open { get; set; } = true; diff --git a/Content.Server/Atmos/Piping/Binary/Components/GasVolumePumpComponent.cs b/Content.Server/Atmos/Piping/Binary/Components/GasVolumePumpComponent.cs index 45cac2a1e5d..eb3052d4ae1 100644 --- a/Content.Server/Atmos/Piping/Binary/Components/GasVolumePumpComponent.cs +++ b/Content.Server/Atmos/Piping/Binary/Components/GasVolumePumpComponent.cs @@ -8,8 +8,6 @@ namespace Content.Server.Atmos.Piping.Binary.Components [RegisterComponent] public class GasVolumePumpComponent : Component { - public override string Name => "GasVolumePump"; - [ViewVariables(VVAccess.ReadWrite)] public bool Enabled { get; set; } = true; diff --git a/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs b/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs index 00c36df4e0b..b83777cdb32 100644 --- a/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs +++ b/Content.Server/Atmos/Piping/Components/AtmosDeviceComponent.cs @@ -13,8 +13,6 @@ namespace Content.Server.Atmos.Piping.Components [RegisterComponent] public class AtmosDeviceComponent : Component { - public override string Name => "AtmosDevice"; - /// /// Whether this device requires being anchored to join an atmosphere. /// diff --git a/Content.Server/Atmos/Piping/Components/AtmosPipeColorComponent.cs b/Content.Server/Atmos/Piping/Components/AtmosPipeColorComponent.cs index 2057ae21181..a5de61634ec 100644 --- a/Content.Server/Atmos/Piping/Components/AtmosPipeColorComponent.cs +++ b/Content.Server/Atmos/Piping/Components/AtmosPipeColorComponent.cs @@ -10,8 +10,6 @@ namespace Content.Server.Atmos.Piping.Components [RegisterComponent] public class AtmosPipeColorComponent : Component { - public override string Name => "AtmosPipeColor"; - [DataField("color")] public Color Color { get; set; } = Color.White; diff --git a/Content.Server/Atmos/Piping/Components/AtmosUnsafeUnanchorComponent.cs b/Content.Server/Atmos/Piping/Components/AtmosUnsafeUnanchorComponent.cs index 039ac104ded..dd8754a0643 100644 --- a/Content.Server/Atmos/Piping/Components/AtmosUnsafeUnanchorComponent.cs +++ b/Content.Server/Atmos/Piping/Components/AtmosUnsafeUnanchorComponent.cs @@ -7,8 +7,6 @@ namespace Content.Server.Atmos.Piping.Components [RegisterComponent] public class AtmosUnsafeUnanchorComponent : Component { - public override string Name => "AtmosUnsafeUnanchor"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("enabled")] public bool Enabled { get; set; } = true; diff --git a/Content.Server/Atmos/Piping/Other/Components/GasMinerComponent.cs b/Content.Server/Atmos/Piping/Other/Components/GasMinerComponent.cs index ac7fc7a617e..e840b0d7e05 100644 --- a/Content.Server/Atmos/Piping/Other/Components/GasMinerComponent.cs +++ b/Content.Server/Atmos/Piping/Other/Components/GasMinerComponent.cs @@ -8,8 +8,6 @@ namespace Content.Server.Atmos.Piping.Other.Components [RegisterComponent] public class GasMinerComponent : Component { - public override string Name => "GasMiner"; - public bool Enabled { get; set; } = true; public bool Broken { get; set; } = false; diff --git a/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs b/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs index 4e0f2fd80e3..b6c1c2e92ce 100644 --- a/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs +++ b/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs @@ -10,8 +10,6 @@ namespace Content.Server.Atmos.Piping.Trinary.Components [RegisterComponent] public class GasFilterComponent : Component { - public override string Name => "GasFilter"; - [ViewVariables(VVAccess.ReadWrite)] public bool Enabled { get; set; } = true; diff --git a/Content.Server/Atmos/Piping/Trinary/Components/GasMixerComponent.cs b/Content.Server/Atmos/Piping/Trinary/Components/GasMixerComponent.cs index c7184ba7523..fdaf6c53533 100644 --- a/Content.Server/Atmos/Piping/Trinary/Components/GasMixerComponent.cs +++ b/Content.Server/Atmos/Piping/Trinary/Components/GasMixerComponent.cs @@ -8,8 +8,6 @@ namespace Content.Server.Atmos.Piping.Trinary.Components [RegisterComponent] public class GasMixerComponent : Component { - public override string Name => "GasMixer"; - [ViewVariables(VVAccess.ReadWrite)] public bool Enabled = true; diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasCanisterComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasCanisterComponent.cs index 5f2379b1e4f..a4bb5b4bd84 100644 --- a/Content.Server/Atmos/Piping/Unary/Components/GasCanisterComponent.cs +++ b/Content.Server/Atmos/Piping/Unary/Components/GasCanisterComponent.cs @@ -8,8 +8,6 @@ namespace Content.Server.Atmos.Piping.Unary.Components [RegisterComponent] public class GasCanisterComponent : Component { - public override string Name => "GasCanister"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("port")] public string PortName { get; set; } = "port"; diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasOutletInjectorComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasOutletInjectorComponent.cs index 752c71bd86b..26387b559d2 100644 --- a/Content.Server/Atmos/Piping/Unary/Components/GasOutletInjectorComponent.cs +++ b/Content.Server/Atmos/Piping/Unary/Components/GasOutletInjectorComponent.cs @@ -7,7 +7,6 @@ namespace Content.Server.Atmos.Piping.Unary.Components [RegisterComponent] public class GasOutletInjectorComponent : Component { - public override string Name => "GasOutletInjector"; [ViewVariables(VVAccess.ReadWrite)] public bool Enabled { get; set; } = true; diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasPassiveVentComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasPassiveVentComponent.cs index 924da3ae8f2..a55d3d26b47 100644 --- a/Content.Server/Atmos/Piping/Unary/Components/GasPassiveVentComponent.cs +++ b/Content.Server/Atmos/Piping/Unary/Components/GasPassiveVentComponent.cs @@ -6,8 +6,6 @@ namespace Content.Server.Atmos.Piping.Unary.Components [RegisterComponent] public class GasPassiveVentComponent : Component { - public override string Name => "GasPassiveVent"; - [DataField("inlet")] public string InletName = "pipe"; } diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasPortableComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasPortableComponent.cs index 0411ce1272d..9f6f0afca4e 100644 --- a/Content.Server/Atmos/Piping/Unary/Components/GasPortableComponent.cs +++ b/Content.Server/Atmos/Piping/Unary/Components/GasPortableComponent.cs @@ -7,8 +7,6 @@ namespace Content.Server.Atmos.Piping.Unary.Components [RegisterComponent] public class GasPortableComponent : Component { - public override string Name => "GasPortable"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("port")] public string PortName { get; set; } = "port"; diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasThermoMachineComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasThermoMachineComponent.cs index b4507be65fb..a8726d1a763 100644 --- a/Content.Server/Atmos/Piping/Unary/Components/GasThermoMachineComponent.cs +++ b/Content.Server/Atmos/Piping/Unary/Components/GasThermoMachineComponent.cs @@ -13,8 +13,6 @@ namespace Content.Server.Atmos.Piping.Unary.Components [RegisterComponent] public class GasThermoMachineComponent : Component, IRefreshParts, ISerializationHooks { - public override string Name => "GasThermoMachine"; - [DataField("inlet")] public string InletName { get; set; } = "pipe"; diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs index bb5cef2c8bc..7ecec9e390f 100644 --- a/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs +++ b/Content.Server/Atmos/Piping/Unary/Components/GasVentPumpComponent.cs @@ -10,8 +10,6 @@ namespace Content.Server.Atmos.Piping.Unary.Components [RegisterComponent] public class GasVentPumpComponent : Component { - public override string Name => "GasVentPump"; - [ViewVariables(VVAccess.ReadWrite)] public bool Enabled { get; set; } = true; diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs index f92adc1ff73..309277bb068 100644 --- a/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs +++ b/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Atmos.Piping.Unary.Components [RegisterComponent] public class GasVentScrubberComponent : Component { - public override string Name => "GasVentScrubber"; - [ViewVariables(VVAccess.ReadWrite)] public bool Enabled { get; set; } = true; diff --git a/Content.Server/Audio/AmbientOnPoweredComponent.cs b/Content.Server/Audio/AmbientOnPoweredComponent.cs index 1ffb2d03491..4d58271f8e7 100644 --- a/Content.Server/Audio/AmbientOnPoweredComponent.cs +++ b/Content.Server/Audio/AmbientOnPoweredComponent.cs @@ -9,6 +9,5 @@ namespace Content.Server.Audio [RegisterComponent] public class AmbientOnPoweredComponent : Component { - public override string Name => "AmbientOnPowered"; } } diff --git a/Content.Server/BarSign/BarSignComponent.cs b/Content.Server/BarSign/BarSignComponent.cs index 02dabdb58ba..bf77b7374e5 100644 --- a/Content.Server/BarSign/BarSignComponent.cs +++ b/Content.Server/BarSign/BarSignComponent.cs @@ -7,8 +7,6 @@ namespace Content.Server.BarSign [RegisterComponent] public class BarSignComponent : Component { - public override string Name => "BarSign"; - [DataField("current")] [ViewVariables(VVAccess.ReadOnly)] public string? CurrentSign; diff --git a/Content.Server/Body/Components/BloodstreamComponent.cs b/Content.Server/Body/Components/BloodstreamComponent.cs index ebaade62d6b..b00b99f6d4d 100644 --- a/Content.Server/Body/Components/BloodstreamComponent.cs +++ b/Content.Server/Body/Components/BloodstreamComponent.cs @@ -13,8 +13,6 @@ namespace Content.Server.Body.Components [RegisterComponent, Friend(typeof(BloodstreamSystem))] public class BloodstreamComponent : Component, IGasMixtureHolder { - public override string Name => "Bloodstream"; - /// /// Max volume of internal solution storage /// diff --git a/Content.Server/Body/Components/BrainComponent.cs b/Content.Server/Body/Components/BrainComponent.cs index 51865cbab7a..e3f52f55d17 100644 --- a/Content.Server/Body/Components/BrainComponent.cs +++ b/Content.Server/Body/Components/BrainComponent.cs @@ -7,6 +7,5 @@ namespace Content.Server.Body.Components [RegisterComponent, Friend(typeof(BrainSystem))] public class BrainComponent : Component { - public override string Name => "Brain"; } } diff --git a/Content.Server/Body/Components/InternalsComponent.cs b/Content.Server/Body/Components/InternalsComponent.cs index 26f6774d898..72e1f9f8c54 100644 --- a/Content.Server/Body/Components/InternalsComponent.cs +++ b/Content.Server/Body/Components/InternalsComponent.cs @@ -10,7 +10,6 @@ namespace Content.Server.Body.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "Internals"; [ViewVariables] public EntityUid? GasTankEntity { get; set; } [ViewVariables] public EntityUid? BreathToolEntity { get; set; } diff --git a/Content.Server/Body/Components/LungComponent.cs b/Content.Server/Body/Components/LungComponent.cs index ee5301ac8de..5da7fe9b875 100644 --- a/Content.Server/Body/Components/LungComponent.cs +++ b/Content.Server/Body/Components/LungComponent.cs @@ -12,8 +12,6 @@ namespace Content.Server.Body.Components; [RegisterComponent, Friend(typeof(LungSystem))] public class LungComponent : Component { - public override string Name => "Lung"; - public float AccumulatedFrametime; [ViewVariables] diff --git a/Content.Server/Body/Components/MetabolizerComponent.cs b/Content.Server/Body/Components/MetabolizerComponent.cs index 9581805bf31..29a2c6a3e87 100644 --- a/Content.Server/Body/Components/MetabolizerComponent.cs +++ b/Content.Server/Body/Components/MetabolizerComponent.cs @@ -17,8 +17,6 @@ namespace Content.Server.Body.Components [RegisterComponent, Friend(typeof(MetabolizerSystem))] public class MetabolizerComponent : Component { - public override string Name => "Metabolizer"; - public float AccumulatedFrametime = 0.0f; /// diff --git a/Content.Server/Body/Components/RespiratorComponent.cs b/Content.Server/Body/Components/RespiratorComponent.cs index fc241a1b51c..33c27e7b7ae 100644 --- a/Content.Server/Body/Components/RespiratorComponent.cs +++ b/Content.Server/Body/Components/RespiratorComponent.cs @@ -12,8 +12,6 @@ namespace Content.Server.Body.Components [RegisterComponent, Friend(typeof(RespiratorSystem))] public class RespiratorComponent : Component { - public override string Name => "Respirator"; - [ViewVariables] [DataField("needsGases")] public Dictionary NeedsGases { get; set; } = new(); diff --git a/Content.Server/Body/Components/StomachComponent.cs b/Content.Server/Body/Components/StomachComponent.cs index bdaaa6e9b4c..f977656c6a3 100644 --- a/Content.Server/Body/Components/StomachComponent.cs +++ b/Content.Server/Body/Components/StomachComponent.cs @@ -12,8 +12,6 @@ namespace Content.Server.Body.Components [RegisterComponent, Friend(typeof(StomachSystem))] public class StomachComponent : Component { - public override string Name => "Stomach"; - public float AccumulatedFrameTime; /// diff --git a/Content.Server/Body/Components/ThermalRegulatorComponent.cs b/Content.Server/Body/Components/ThermalRegulatorComponent.cs index 5b710207198..bb7f6aed83d 100644 --- a/Content.Server/Body/Components/ThermalRegulatorComponent.cs +++ b/Content.Server/Body/Components/ThermalRegulatorComponent.cs @@ -10,8 +10,6 @@ namespace Content.Server.Body.Components; [Friend(typeof(ThermalRegulatorSystem))] public class ThermalRegulatorComponent : Component { - public override string Name => "ThermalRegulator"; - /// /// Heat generated due to metabolism. It's generated via metabolism /// diff --git a/Content.Server/Botany/Components/LogComponent.cs b/Content.Server/Botany/Components/LogComponent.cs index 5b49e35719c..b956d77fccc 100644 --- a/Content.Server/Botany/Components/LogComponent.cs +++ b/Content.Server/Botany/Components/LogComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Botany.Components [RegisterComponent] public class LogComponent : Component, IInteractUsing { - public override string Name => "Log"; - async Task IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs) { if (!EntitySystem.Get().CanInteract(eventArgs.User)) diff --git a/Content.Server/Botany/Components/PlantHolderComponent.cs b/Content.Server/Botany/Components/PlantHolderComponent.cs index a423ebf43e5..c7c504c72a4 100644 --- a/Content.Server/Botany/Components/PlantHolderComponent.cs +++ b/Content.Server/Botany/Components/PlantHolderComponent.cs @@ -47,8 +47,6 @@ namespace Content.Server.Botany.Components [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "PlantHolder"; - [ViewVariables] private int _lastProduce; [ViewVariables(VVAccess.ReadWrite)] private int _missingGas; diff --git a/Content.Server/Botany/Components/ProduceComponent.cs b/Content.Server/Botany/Components/ProduceComponent.cs index c7623c5e615..206fb53b989 100644 --- a/Content.Server/Botany/Components/ProduceComponent.cs +++ b/Content.Server/Botany/Components/ProduceComponent.cs @@ -16,7 +16,6 @@ namespace Content.Server.Botany.Components [RegisterComponent] public class ProduceComponent : Component, ISerializationHooks { - public override string Name => "Produce"; [DataField("targetSolution")] public string SolutionName { get; set; } = "food"; [DataField("seed")] private string? _seedName; diff --git a/Content.Server/Botany/Components/SeedComponent.cs b/Content.Server/Botany/Components/SeedComponent.cs index 5131e76117d..cd6205f67bd 100644 --- a/Content.Server/Botany/Components/SeedComponent.cs +++ b/Content.Server/Botany/Components/SeedComponent.cs @@ -14,8 +14,6 @@ namespace Content.Server.Botany.Components public class SeedComponent : Component, IExamine #pragma warning restore 618 { - public override string Name => "Seed"; - [DataField("seed")] private string? _seedName; diff --git a/Content.Server/Botany/Components/SeedExtractorComponent.cs b/Content.Server/Botany/Components/SeedExtractorComponent.cs index f7f30ac41d1..bfdc0fc455e 100644 --- a/Content.Server/Botany/Components/SeedExtractorComponent.cs +++ b/Content.Server/Botany/Components/SeedExtractorComponent.cs @@ -15,8 +15,6 @@ namespace Content.Server.Botany.Components [Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IRobustRandom _random = default!; - public override string Name => "SeedExtractor"; - // TODO: Upgradeable machines. private int _minSeeds = 1; private int _maxSeeds = 4; diff --git a/Content.Server/Cabinet/ItemCabinetComponent.cs b/Content.Server/Cabinet/ItemCabinetComponent.cs index 457ec9631ef..f5a0e067e0a 100644 --- a/Content.Server/Cabinet/ItemCabinetComponent.cs +++ b/Content.Server/Cabinet/ItemCabinetComponent.cs @@ -12,8 +12,6 @@ namespace Content.Server.Cabinet [RegisterComponent] public class ItemCabinetComponent : Component { - public override string Name => "ItemCabinet"; - /// /// Sound to be played when the cabinet door is opened. /// diff --git a/Content.Server/Cargo/Components/CargoTelepadComponent.cs b/Content.Server/Cargo/Components/CargoTelepadComponent.cs index 8a8b1502cf7..e7314571e02 100644 --- a/Content.Server/Cargo/Components/CargoTelepadComponent.cs +++ b/Content.Server/Cargo/Components/CargoTelepadComponent.cs @@ -27,7 +27,6 @@ namespace Content.Server.Cargo.Components { [Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - public override string Name => "CargoTelepad"; private const float TeleportDuration = 0.5f; private const float TeleportDelay = 15f; diff --git a/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs b/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs index 367be9bb0c2..4d8fe072024 100644 --- a/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs +++ b/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs @@ -16,7 +16,6 @@ namespace Content.Server.Chemistry.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "FoamSolutionAreaEffect"; public new const string SolutionName = "solutionArea"; [DataField("foamedMetalPrototype")] private string? _foamedMetalPrototype; diff --git a/Content.Server/Chemistry/Components/MeleeChemicalInjectorComponent.cs b/Content.Server/Chemistry/Components/MeleeChemicalInjectorComponent.cs index 7da40e9c197..a21dae985f3 100644 --- a/Content.Server/Chemistry/Components/MeleeChemicalInjectorComponent.cs +++ b/Content.Server/Chemistry/Components/MeleeChemicalInjectorComponent.cs @@ -10,8 +10,6 @@ namespace Content.Server.Chemistry.Components [RegisterComponent] public class MeleeChemicalInjectorComponent : Component { - public override string Name => "MeleeChemicalInjector"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("transferAmount")] public FixedPoint2 TransferAmount { get; set; } = FixedPoint2.New(1); diff --git a/Content.Server/Chemistry/Components/ReagentTankComponent.cs b/Content.Server/Chemistry/Components/ReagentTankComponent.cs index 8e6bdb313c1..b232beb9364 100644 --- a/Content.Server/Chemistry/Components/ReagentTankComponent.cs +++ b/Content.Server/Chemistry/Components/ReagentTankComponent.cs @@ -10,8 +10,6 @@ namespace Content.Server.Chemistry.Components [RegisterComponent] public class ReagentTankComponent : Component { - public override string Name => "ReagentTank"; - [DataField("transferAmount")] [ViewVariables(VVAccess.ReadWrite)] public FixedPoint2 TransferAmount { get; set; } = FixedPoint2.New(10); diff --git a/Content.Server/Chemistry/Components/RehydratableComponent.cs b/Content.Server/Chemistry/Components/RehydratableComponent.cs index 291ae73481a..e31d03ec467 100644 --- a/Content.Server/Chemistry/Components/RehydratableComponent.cs +++ b/Content.Server/Chemistry/Components/RehydratableComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Chemistry.Components [RegisterComponent] public class RehydratableComponent : Component { - public override string Name => "Rehydratable"; - [ViewVariables] [DataField("catalyst")] internal string CatalystPrototype = "Water"; diff --git a/Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs b/Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs index 02bdc920c36..787ef5ed4c6 100644 --- a/Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs +++ b/Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs @@ -16,7 +16,6 @@ namespace Content.Server.Chemistry.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "SmokeSolutionAreaEffect"; public new const string SolutionName = "solutionArea"; protected override void UpdateVisuals() diff --git a/Content.Server/Chemistry/Components/SolutionAreaEffectInceptionComponent.cs b/Content.Server/Chemistry/Components/SolutionAreaEffectInceptionComponent.cs index 85d5b7d7e12..44b5e7bd358 100644 --- a/Content.Server/Chemistry/Components/SolutionAreaEffectInceptionComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionAreaEffectInceptionComponent.cs @@ -13,8 +13,6 @@ namespace Content.Server.Chemistry.Components [RegisterComponent] public class SolutionAreaEffectInceptionComponent : Component { - public override string Name => "AreaEffectInception"; - private const float ReactionDelay = 1.5f; private readonly HashSet _group = new(); diff --git a/Content.Server/Chemistry/Components/SolutionInjectOnCollideComponent.cs b/Content.Server/Chemistry/Components/SolutionInjectOnCollideComponent.cs index 9affe11de1b..66a09b79f4a 100644 --- a/Content.Server/Chemistry/Components/SolutionInjectOnCollideComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionInjectOnCollideComponent.cs @@ -13,7 +13,6 @@ namespace Content.Server.Chemistry.Components [RegisterComponent] internal sealed class SolutionInjectOnCollideComponent : Component { - public override string Name => "SolutionInjectOnCollide"; [ViewVariables(VVAccess.ReadWrite)] [DataField("transferAmount")] diff --git a/Content.Server/Chemistry/Components/SolutionManager/DrainableSolutionComponent.cs b/Content.Server/Chemistry/Components/SolutionManager/DrainableSolutionComponent.cs index 6e09fd31731..4651c18e010 100644 --- a/Content.Server/Chemistry/Components/SolutionManager/DrainableSolutionComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionManager/DrainableSolutionComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Chemistry.Components.SolutionManager [RegisterComponent] public class DrainableSolutionComponent : Component { - public override string Name => "DrainableSolution"; - /// /// Solution name that can be drained. /// diff --git a/Content.Server/Chemistry/Components/SolutionManager/DrawableSolutionComponent.cs b/Content.Server/Chemistry/Components/SolutionManager/DrawableSolutionComponent.cs index dd15164f5f9..89fda4a361c 100644 --- a/Content.Server/Chemistry/Components/SolutionManager/DrawableSolutionComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionManager/DrawableSolutionComponent.cs @@ -10,8 +10,6 @@ namespace Content.Server.Chemistry.Components.SolutionManager [RegisterComponent] public class DrawableSolutionComponent : Component { - public override string Name => "DrawableSolution"; - /// /// Solution name that can be removed with syringes. /// diff --git a/Content.Server/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs b/Content.Server/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs index 7a23a6a38d7..c443e6ccbcc 100644 --- a/Content.Server/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs @@ -7,8 +7,6 @@ namespace Content.Server.Chemistry.Components.SolutionManager [RegisterComponent] public class ExaminableSolutionComponent: Component { - public override string Name => "ExaminableSolution"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("solution")] public string Solution { get; set; } = "default"; diff --git a/Content.Server/Chemistry/Components/SolutionManager/InjectableSolutionComponent.cs b/Content.Server/Chemistry/Components/SolutionManager/InjectableSolutionComponent.cs index 8d93a4b722e..6f451fe3b61 100644 --- a/Content.Server/Chemistry/Components/SolutionManager/InjectableSolutionComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionManager/InjectableSolutionComponent.cs @@ -10,7 +10,6 @@ namespace Content.Server.Chemistry.Components.SolutionManager [RegisterComponent] public class InjectableSolutionComponent : Component { - public override string Name => "InjectableSolution"; /// /// Solution name which can be added with syringes. diff --git a/Content.Server/Chemistry/Components/SolutionManager/RefillableSolutionComponent.cs b/Content.Server/Chemistry/Components/SolutionManager/RefillableSolutionComponent.cs index 46c285c6c36..7cbef8728c6 100644 --- a/Content.Server/Chemistry/Components/SolutionManager/RefillableSolutionComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionManager/RefillableSolutionComponent.cs @@ -13,8 +13,6 @@ namespace Content.Server.Chemistry.Components.SolutionManager [RegisterComponent] public class RefillableSolutionComponent : Component { - public override string Name => "RefillableSolution"; - /// /// Solution name that can added to easily. /// diff --git a/Content.Server/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs b/Content.Server/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs index 9ddbc2a09a9..2e971b3612c 100644 --- a/Content.Server/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionManager/SolutionContainerManagerComponent.cs @@ -13,8 +13,6 @@ namespace Content.Server.Chemistry.Components.SolutionManager [Friend(typeof(SolutionContainerSystem))] public class SolutionContainerManagerComponent : Component { - public override string Name => "SolutionContainerManager"; - [ViewVariables] [DataField("solutions")] public readonly Dictionary Solutions = new(); diff --git a/Content.Server/Chemistry/Components/SolutionTransferComponent.cs b/Content.Server/Chemistry/Components/SolutionTransferComponent.cs index e008f58f04e..ee7bbe21829 100644 --- a/Content.Server/Chemistry/Components/SolutionTransferComponent.cs +++ b/Content.Server/Chemistry/Components/SolutionTransferComponent.cs @@ -31,8 +31,6 @@ namespace Content.Server.Chemistry.Components // If it's anything else, GIVE reagent. // Of course, only if possible. - public override string Name => "SolutionTransfer"; - /// /// The amount of solution to be transferred from this solution when clicking on other solutions with it. /// diff --git a/Content.Server/Chemistry/Components/TransformableContainerComponent.cs b/Content.Server/Chemistry/Components/TransformableContainerComponent.cs index 1e3b821327b..d19770cc151 100644 --- a/Content.Server/Chemistry/Components/TransformableContainerComponent.cs +++ b/Content.Server/Chemistry/Components/TransformableContainerComponent.cs @@ -13,8 +13,6 @@ namespace Content.Server.Chemistry.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "TransformableContainer"; - public SpriteSpecifier? InitialSprite; public string InitialName = default!; public string InitialDescription = default!; diff --git a/Content.Server/Cleanable/CleanableComponent.cs b/Content.Server/Cleanable/CleanableComponent.cs index d87103c87c1..aa9ea264b57 100644 --- a/Content.Server/Cleanable/CleanableComponent.cs +++ b/Content.Server/Cleanable/CleanableComponent.cs @@ -9,8 +9,6 @@ namespace Content.Server.Cleanable [RegisterComponent] public class CleanableComponent : Component { - public override string Name => "Cleanable"; - [DataField("cleanAmount")] private FixedPoint2 _cleanAmount = FixedPoint2.Zero; [ViewVariables(VVAccess.ReadWrite)] diff --git a/Content.Server/Cloning/Components/BeingClonedComponent.cs b/Content.Server/Cloning/Components/BeingClonedComponent.cs index 7ed98aec3da..92d4a986a3a 100644 --- a/Content.Server/Cloning/Components/BeingClonedComponent.cs +++ b/Content.Server/Cloning/Components/BeingClonedComponent.cs @@ -6,8 +6,6 @@ namespace Content.Server.Cloning.Components [RegisterComponent] public class BeingClonedComponent : Component { - public override string Name => "BeingCloned"; - [ViewVariables] public Mind.Mind? Mind = default; diff --git a/Content.Server/Clothing/Components/ClothingComponent.cs b/Content.Server/Clothing/Components/ClothingComponent.cs index 48c8721f264..0b3fabff34b 100644 --- a/Content.Server/Clothing/Components/ClothingComponent.cs +++ b/Content.Server/Clothing/Components/ClothingComponent.cs @@ -24,8 +24,6 @@ namespace Content.Server.Clothing.Components [Dependency] private readonly IEntityManager _entities = default!; [Dependency] private readonly IPrototypeManager _prototype = default!; - public override string Name => "Clothing"; - [DataField("QuickEquip")] private bool _quickEquipEnabled = true; diff --git a/Content.Server/Construction/Components/AnchorableComponent.cs b/Content.Server/Construction/Components/AnchorableComponent.cs index a8d6c04506d..78b1720e698 100644 --- a/Content.Server/Construction/Components/AnchorableComponent.cs +++ b/Content.Server/Construction/Components/AnchorableComponent.cs @@ -12,8 +12,6 @@ namespace Content.Server.Construction.Components [RegisterComponent, Friend(typeof(AnchorableSystem))] public class AnchorableComponent : Component { - public override string Name => "Anchorable"; - [DataField("tool", customTypeSerializer:typeof(PrototypeIdSerializer))] public string Tool { get; private set; } = "Anchoring"; diff --git a/Content.Server/Construction/Components/ComputerBoardComponent.cs b/Content.Server/Construction/Components/ComputerBoardComponent.cs index 73521dc38aa..62cf07c09d7 100644 --- a/Content.Server/Construction/Components/ComputerBoardComponent.cs +++ b/Content.Server/Construction/Components/ComputerBoardComponent.cs @@ -7,8 +7,6 @@ namespace Content.Server.Construction.Components [RegisterComponent] public class ComputerBoardComponent : Component { - public override string Name => "ComputerBoard"; - [ViewVariables] [DataField("prototype")] public string? Prototype { get; private set; } diff --git a/Content.Server/Construction/Components/ConstructionComponent.cs b/Content.Server/Construction/Components/ConstructionComponent.cs index 7abfa9c1458..69d54070a17 100644 --- a/Content.Server/Construction/Components/ConstructionComponent.cs +++ b/Content.Server/Construction/Components/ConstructionComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Construction.Components [RegisterComponent, Friend(typeof(ConstructionSystem))] public class ConstructionComponent : Component { - public override string Name => "Construction"; - [DataField("graph", required:true, customTypeSerializer:typeof(PrototypeIdSerializer))] public string Graph { get; set; } = string.Empty; diff --git a/Content.Server/Construction/Components/MachineBoardComponent.cs b/Content.Server/Construction/Components/MachineBoardComponent.cs index 9a9cfda6492..73ea5f82011 100644 --- a/Content.Server/Construction/Components/MachineBoardComponent.cs +++ b/Content.Server/Construction/Components/MachineBoardComponent.cs @@ -19,8 +19,6 @@ namespace Content.Server.Construction.Components { [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - public override string Name => "MachineBoard"; - [ViewVariables] [DataField("requirements")] public readonly Dictionary Requirements = new(); diff --git a/Content.Server/Construction/Components/MachineComponent.cs b/Content.Server/Construction/Components/MachineComponent.cs index 4614dd4cf53..a5e34f0a3e1 100644 --- a/Content.Server/Construction/Components/MachineComponent.cs +++ b/Content.Server/Construction/Components/MachineComponent.cs @@ -13,8 +13,6 @@ namespace Content.Server.Construction.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "Machine"; - [DataField("board")] public string? BoardPrototype { get; private set; } diff --git a/Content.Server/Construction/Components/MachineFrameComponent.cs b/Content.Server/Construction/Components/MachineFrameComponent.cs index 8b4eccb4d82..7b46ed29f65 100644 --- a/Content.Server/Construction/Components/MachineFrameComponent.cs +++ b/Content.Server/Construction/Components/MachineFrameComponent.cs @@ -21,8 +21,6 @@ namespace Content.Server.Construction.Components public const string PartContainer = "machine_parts"; public const string BoardContainer = "machine_board"; - public override string Name => "MachineFrame"; - [ViewVariables] public bool IsComplete { diff --git a/Content.Server/Construction/Components/MachinePartComponent.cs b/Content.Server/Construction/Components/MachinePartComponent.cs index d5f129df3f3..c4d89b7d132 100644 --- a/Content.Server/Construction/Components/MachinePartComponent.cs +++ b/Content.Server/Construction/Components/MachinePartComponent.cs @@ -29,9 +29,6 @@ namespace Content.Server.Construction.Components {MachinePart.Crystal, "CrystalSubspaceStockPart"}, {MachinePart.Transmitter, "TransmitterSubspaceStockPart"} }; - - public override string Name => "MachinePart"; - [ViewVariables] [DataField("part")] public MachinePart PartType { get; private set; } = MachinePart.Capacitor; [ViewVariables(VVAccess.ReadWrite)] diff --git a/Content.Server/Construction/Components/WelderRefinableComponent.cs b/Content.Server/Construction/Components/WelderRefinableComponent.cs index 8c549974378..c4d0ba1f4b8 100644 --- a/Content.Server/Construction/Components/WelderRefinableComponent.cs +++ b/Content.Server/Construction/Components/WelderRefinableComponent.cs @@ -35,8 +35,6 @@ namespace Content.Server.Construction.Components private bool _beingWelded; - public override string Name => "WelderRefinable"; - async Task IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs) { // check if object is welder diff --git a/Content.Server/Containers/EmptyOnMachineDeconstructComponent.cs b/Content.Server/Containers/EmptyOnMachineDeconstructComponent.cs index df36160665c..7075b8323f7 100644 --- a/Content.Server/Containers/EmptyOnMachineDeconstructComponent.cs +++ b/Content.Server/Containers/EmptyOnMachineDeconstructComponent.cs @@ -13,8 +13,6 @@ namespace Content.Server.Containers [RegisterComponent] public class EmptyOnMachineDeconstructComponent : Component { - public override string Name => "EmptyOnMachineDeconstruct"; - [ViewVariables] [DataField("containers")] public HashSet Containers { get; set; } = new(); diff --git a/Content.Server/Conveyor/ConveyorComponent.cs b/Content.Server/Conveyor/ConveyorComponent.cs index 83cc2cb1cad..9ddf992d0d1 100644 --- a/Content.Server/Conveyor/ConveyorComponent.cs +++ b/Content.Server/Conveyor/ConveyorComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Conveyor [Friend(typeof(ConveyorSystem))] public class ConveyorComponent : Component { - public override string Name => "Conveyor"; - /// /// The angle to move entities by in relation to the owner's rotation. /// diff --git a/Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs b/Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs index 2c211ffd3d4..c7f9fef5937 100644 --- a/Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs +++ b/Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs @@ -13,8 +13,6 @@ namespace Content.Server.Damage.Components [RegisterComponent] internal sealed class DamageOnHighSpeedImpactComponent : Component { - public override string Name => "DamageOnHighSpeedImpact"; - [DataField("minimumSpeed")] public float MinimumSpeed { get; set; } = 20f; [DataField("factor")] diff --git a/Content.Server/Damage/Components/DamageOnLandComponent.cs b/Content.Server/Damage/Components/DamageOnLandComponent.cs index bd8bef2ccc7..00900567715 100644 --- a/Content.Server/Damage/Components/DamageOnLandComponent.cs +++ b/Content.Server/Damage/Components/DamageOnLandComponent.cs @@ -8,8 +8,6 @@ namespace Content.Server.Damage.Components [RegisterComponent] public sealed class DamageOnLandComponent : Component { - public override string Name => "DamageOnLand"; - [DataField("ignoreResistances")] [ViewVariables(VVAccess.ReadWrite)] public bool IgnoreResistances = false; diff --git a/Content.Server/Damage/Components/DamageOnToolInteractComponent.cs b/Content.Server/Damage/Components/DamageOnToolInteractComponent.cs index 353a42b4e05..5178eb34999 100644 --- a/Content.Server/Damage/Components/DamageOnToolInteractComponent.cs +++ b/Content.Server/Damage/Components/DamageOnToolInteractComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Damage.Components [RegisterComponent] public class DamageOnToolInteractComponent : Component { - public override string Name => "DamageOnToolInteract"; - [DataField("tools")] public PrototypeFlags Tools { get; } = new (); diff --git a/Content.Server/Damage/Components/DamageOtherOnHitComponent.cs b/Content.Server/Damage/Components/DamageOtherOnHitComponent.cs index 2a59592b0ba..c1b1e652c0b 100644 --- a/Content.Server/Damage/Components/DamageOtherOnHitComponent.cs +++ b/Content.Server/Damage/Components/DamageOtherOnHitComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Damage.Components [RegisterComponent] public class DamageOtherOnHitComponent : Component { - public override string Name => "DamageOtherOnHit"; - [DataField("ignoreResistances")] [ViewVariables(VVAccess.ReadWrite)] public bool IgnoreResistances = false; diff --git a/Content.Server/Damage/Components/ExaminableDamageComponent.cs b/Content.Server/Damage/Components/ExaminableDamageComponent.cs index 7f008b79cfc..cdb6421c4e9 100644 --- a/Content.Server/Damage/Components/ExaminableDamageComponent.cs +++ b/Content.Server/Damage/Components/ExaminableDamageComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Damage.Components; [RegisterComponent] public class ExaminableDamageComponent : Component { - public override string Name => "ExaminableDamage"; - [DataField("messages", required: true, customTypeSerializer:typeof(PrototypeIdSerializer))] public string? MessagesProtoId; diff --git a/Content.Server/Destructible/DestructibleComponent.cs b/Content.Server/Destructible/DestructibleComponent.cs index aab1e5008aa..7e047b30b42 100644 --- a/Content.Server/Destructible/DestructibleComponent.cs +++ b/Content.Server/Destructible/DestructibleComponent.cs @@ -14,8 +14,6 @@ namespace Content.Server.Destructible [RegisterComponent] public class DestructibleComponent : Component { - public override string Name => "Destructible"; - [ViewVariables] [DataField("thresholds")] public List Thresholds = new(); diff --git a/Content.Server/DeviceNetwork/Components/ApcNetworkComponent.cs b/Content.Server/DeviceNetwork/Components/ApcNetworkComponent.cs index 202f98c3ff3..17e6d8d938d 100644 --- a/Content.Server/DeviceNetwork/Components/ApcNetworkComponent.cs +++ b/Content.Server/DeviceNetwork/Components/ApcNetworkComponent.cs @@ -7,11 +7,10 @@ using Robust.Shared.ViewVariables; namespace Content.Server.DeviceNetwork.Components { [RegisterComponent] + [ComponentProtoName("ApcNetworkConnection")] [Friend(typeof(ApcNetworkSystem))] public class ApcNetworkComponent : Component { - public override string Name => "ApcNetworkConnection"; - /// /// The node Group the ApcNetworkConnection is connected to /// diff --git a/Content.Server/DeviceNetwork/Components/DeviceNetworkComponent.cs b/Content.Server/DeviceNetwork/Components/DeviceNetworkComponent.cs index 918c035a0ba..6d3bb8df4f0 100644 --- a/Content.Server/DeviceNetwork/Components/DeviceNetworkComponent.cs +++ b/Content.Server/DeviceNetwork/Components/DeviceNetworkComponent.cs @@ -6,11 +6,9 @@ using Robust.Shared.ViewVariables; namespace Content.Server.DeviceNetwork.Components { [RegisterComponent] + [ComponentProtoName("DeviceNetworkComponent")] public class DeviceNetworkComponent : Component { - public override string Name => "DeviceNetworkComponent"; - - /// /// Valid device network NetIDs. /// The netID is used to separate device networks that shouldn't interact with each other e.g. wireless and wired. diff --git a/Content.Server/DeviceNetwork/Components/Devices/ApcNetSwitchComponent.cs b/Content.Server/DeviceNetwork/Components/Devices/ApcNetSwitchComponent.cs index e9f24388852..417a1c46f95 100644 --- a/Content.Server/DeviceNetwork/Components/Devices/ApcNetSwitchComponent.cs +++ b/Content.Server/DeviceNetwork/Components/Devices/ApcNetSwitchComponent.cs @@ -9,8 +9,6 @@ namespace Content.Server.DeviceNetwork.Components.Devices [Friend(typeof(ApcNetSwitchSystem))] public class ApcNetSwitchComponent : Component { - public override string Name => "ApcNetSwitch"; - [ViewVariables] public bool State; } } diff --git a/Content.Server/DeviceNetwork/Components/WiredNetworkComponent.cs b/Content.Server/DeviceNetwork/Components/WiredNetworkComponent.cs index 179c5e05994..833968ab928 100644 --- a/Content.Server/DeviceNetwork/Components/WiredNetworkComponent.cs +++ b/Content.Server/DeviceNetwork/Components/WiredNetworkComponent.cs @@ -3,8 +3,8 @@ using Robust.Shared.GameObjects; namespace Content.Server.DeviceNetwork.Components { [RegisterComponent] + [ComponentProtoName("WiredNetworkConnection")] public class WiredNetworkComponent : Component { - public override string Name => "WiredNetworkConnection"; } } diff --git a/Content.Server/DeviceNetwork/Components/WirelessNetworkComponent.cs b/Content.Server/DeviceNetwork/Components/WirelessNetworkComponent.cs index 75d122d74d1..35860fb2611 100644 --- a/Content.Server/DeviceNetwork/Components/WirelessNetworkComponent.cs +++ b/Content.Server/DeviceNetwork/Components/WirelessNetworkComponent.cs @@ -7,10 +7,9 @@ namespace Content.Server.DeviceNetwork.Components /// Sends and receives device network messages wirelessly. Devices sending and receiving need to be in range and on the same frequency. /// [RegisterComponent] + [ComponentProtoName("WirelessNetworkConnection")] public class WirelessNetworkComponent : Component { - public override string Name => "WirelessNetworkConnection"; - [DataField("range")] public int Range { get; set; } } diff --git a/Content.Server/Dice/DiceComponent.cs b/Content.Server/Dice/DiceComponent.cs index 57165e882a6..aa06ea2769d 100644 --- a/Content.Server/Dice/DiceComponent.cs +++ b/Content.Server/Dice/DiceComponent.cs @@ -9,8 +9,6 @@ namespace Content.Server.Dice [RegisterComponent, Friend(typeof(DiceSystem))] public class DiceComponent : Component { - public override string Name => "Dice"; - [ViewVariables] [DataField("sound")] public SoundSpecifier Sound { get; } = new SoundCollectionSpecifier("Dice"); diff --git a/Content.Server/Disposal/Tube/Components/DisposalBendComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalBendComponent.cs index e4610047346..83f677b5330 100644 --- a/Content.Server/Disposal/Tube/Components/DisposalBendComponent.cs +++ b/Content.Server/Disposal/Tube/Components/DisposalBendComponent.cs @@ -13,8 +13,6 @@ namespace Content.Server.Disposal.Tube.Components [DataField("sideDegrees")] private int _sideDegrees = -90; - public override string Name => "DisposalBend"; - protected override Direction[] ConnectableDirections() { var direction = IoCManager.Resolve().GetComponent(Owner).LocalRotation; diff --git a/Content.Server/Disposal/Tube/Components/DisposalEntryComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalEntryComponent.cs index 9eaaafd90e5..75090f0f988 100644 --- a/Content.Server/Disposal/Tube/Components/DisposalEntryComponent.cs +++ b/Content.Server/Disposal/Tube/Components/DisposalEntryComponent.cs @@ -19,8 +19,6 @@ namespace Content.Server.Disposal.Tube.Components private const string HolderPrototypeId = "DisposalHolder"; - public override string Name => "DisposalEntry"; - public bool TryInsert(DisposalUnitComponent from) { var holder = _entMan.SpawnEntity(HolderPrototypeId, _entMan.GetComponent(Owner).MapPosition); diff --git a/Content.Server/Disposal/Tube/Components/DisposalJunctionComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalJunctionComponent.cs index 1f420ef9e14..8663d7721e8 100644 --- a/Content.Server/Disposal/Tube/Components/DisposalJunctionComponent.cs +++ b/Content.Server/Disposal/Tube/Components/DisposalJunctionComponent.cs @@ -24,8 +24,6 @@ namespace Content.Server.Disposal.Tube.Components [DataField("degrees")] private List _degrees = new(); - public override string Name => "DisposalJunction"; - protected override Direction[] ConnectableDirections() { var direction = _entMan.GetComponent(Owner).LocalRotation; diff --git a/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs index 875b971093d..88fd0b81668 100644 --- a/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs +++ b/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs @@ -31,8 +31,6 @@ namespace Content.Server.Disposal.Tube.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "DisposalRouter"; - [ViewVariables] private readonly HashSet _tags = new(); diff --git a/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs index 6acc6caf377..8dbc160e4cc 100644 --- a/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs +++ b/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs @@ -28,8 +28,6 @@ namespace Content.Server.Disposal.Tube.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "DisposalTagger"; - [ViewVariables(VVAccess.ReadWrite)] private string _tag = ""; diff --git a/Content.Server/Disposal/Tube/Components/DisposalTransitComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalTransitComponent.cs index e6bc59d0703..9e8cdc6a1be 100644 --- a/Content.Server/Disposal/Tube/Components/DisposalTransitComponent.cs +++ b/Content.Server/Disposal/Tube/Components/DisposalTransitComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Disposal.Tube.Components [ComponentReference(typeof(IDisposalTubeComponent))] public class DisposalTransitComponent : DisposalTubeComponent { - public override string Name => "DisposalTransit"; - protected override Direction[] ConnectableDirections() { var rotation = IoCManager.Resolve().GetComponent(Owner).LocalRotation; diff --git a/Content.Server/Disposal/Unit/Components/DisposalHolderComponent.cs b/Content.Server/Disposal/Unit/Components/DisposalHolderComponent.cs index 0977a293f33..cdfcbbd6c23 100644 --- a/Content.Server/Disposal/Unit/Components/DisposalHolderComponent.cs +++ b/Content.Server/Disposal/Unit/Components/DisposalHolderComponent.cs @@ -20,8 +20,6 @@ namespace Content.Server.Disposal.Unit.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "DisposalHolder"; - public Container Container = null!; /// diff --git a/Content.Server/Doors/Components/AirlockComponent.cs b/Content.Server/Doors/Components/AirlockComponent.cs index df525095a43..4efbe31fe80 100644 --- a/Content.Server/Doors/Components/AirlockComponent.cs +++ b/Content.Server/Doors/Components/AirlockComponent.cs @@ -28,8 +28,6 @@ namespace Content.Server.Doors.Components { [Dependency] private readonly IEntityManager _entityManager = default!; - public override string Name => "Airlock"; - /// /// Sound to play when the bolts on the airlock go up. /// @@ -309,7 +307,7 @@ namespace Content.Server.Doors.Components break; case Wires.Timing: // This is permanent, until the wire gets cut & mended. - AutoCloseDelayModifier = 0.5f; + AutoCloseDelayModifier = 0.5f; EntitySystem.Get().UpdateAutoClose(Owner, this); break; case Wires.Safety: diff --git a/Content.Server/Doors/Components/FirelockComponent.cs b/Content.Server/Doors/Components/FirelockComponent.cs index 906326c402b..d739831c8c1 100644 --- a/Content.Server/Doors/Components/FirelockComponent.cs +++ b/Content.Server/Doors/Components/FirelockComponent.cs @@ -17,8 +17,6 @@ namespace Content.Server.Doors.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "Firelock"; - /// /// Pry time modifier to be used when the firelock is currently closed due to fire or pressure. /// diff --git a/Content.Server/Doors/Components/ToggleDoorOnTriggerComponent.cs b/Content.Server/Doors/Components/ToggleDoorOnTriggerComponent.cs index 9287160229f..8d48ca243f1 100644 --- a/Content.Server/Doors/Components/ToggleDoorOnTriggerComponent.cs +++ b/Content.Server/Doors/Components/ToggleDoorOnTriggerComponent.cs @@ -5,6 +5,5 @@ namespace Content.Server.Doors.Components [RegisterComponent] public class ToggleDoorOnTriggerComponent : Component { - public override string Name => "ToggleDoorOnTrigger"; } } diff --git a/Content.Server/Electrocution/Components/ElectrifiedComponent.cs b/Content.Server/Electrocution/Components/ElectrifiedComponent.cs index 9e0da6d030d..63d8f4cb23c 100644 --- a/Content.Server/Electrocution/Components/ElectrifiedComponent.cs +++ b/Content.Server/Electrocution/Components/ElectrifiedComponent.cs @@ -9,8 +9,6 @@ namespace Content.Server.Electrocution [RegisterComponent] public class ElectrifiedComponent : Component { - public override string Name => "Electrified"; - [DataField("enabled")] public bool Enabled { get; set; } = true; diff --git a/Content.Server/Electrocution/Components/ElectrocutionComponent.cs b/Content.Server/Electrocution/Components/ElectrocutionComponent.cs index 55d4e1e4a50..f414231dc34 100644 --- a/Content.Server/Electrocution/Components/ElectrocutionComponent.cs +++ b/Content.Server/Electrocution/Components/ElectrocutionComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Electrocution [Friend(typeof(ElectrocutionSystem))] public sealed class ElectrocutionComponent : Component { - public override string Name => "Electrocution"; - [DataField("timeLeft")] public float TimeLeft { get; set; } [DataField("electrocuting")] public EntityUid Electrocuting { get; set; } [DataField("accumDamage")] public float AccumulatedDamage { get; set; } diff --git a/Content.Server/Electrocution/RandomInsulationComponent.cs b/Content.Server/Electrocution/RandomInsulationComponent.cs index 255d6d3a309..80132c84110 100644 --- a/Content.Server/Electrocution/RandomInsulationComponent.cs +++ b/Content.Server/Electrocution/RandomInsulationComponent.cs @@ -6,8 +6,6 @@ namespace Content.Server.Electrocution [RegisterComponent] public class RandomInsulationComponent : Component { - public override string Name => "RandomInsulation"; - [DataField("list")] public readonly float[] List = { 0f }; } diff --git a/Content.Server/Engineering/Components/DisassembleOnActivateComponent.cs b/Content.Server/Engineering/Components/DisassembleOnActivateComponent.cs index 723def1b4a5..28e89a8642d 100644 --- a/Content.Server/Engineering/Components/DisassembleOnActivateComponent.cs +++ b/Content.Server/Engineering/Components/DisassembleOnActivateComponent.cs @@ -10,8 +10,6 @@ namespace Content.Server.Engineering.Components [RegisterComponent] public class DisassembleOnActivateComponent : Component { - public override string Name => "DisassembleOnActivate"; - [ViewVariables] [DataField("prototype", customTypeSerializer: typeof(PrototypeIdSerializer))] public string? Prototype { get; } diff --git a/Content.Server/Engineering/Components/SpawnAfterInteractComponent.cs b/Content.Server/Engineering/Components/SpawnAfterInteractComponent.cs index 3a57414f4ba..dcaf3ba44cb 100644 --- a/Content.Server/Engineering/Components/SpawnAfterInteractComponent.cs +++ b/Content.Server/Engineering/Components/SpawnAfterInteractComponent.cs @@ -9,8 +9,6 @@ namespace Content.Server.Engineering.Components [RegisterComponent] public class SpawnAfterInteractComponent : Component { - public override string Name => "SpawnAfterInteract"; - [ViewVariables] [DataField("prototype", customTypeSerializer: typeof(PrototypeIdSerializer))] public string? Prototype { get; } diff --git a/Content.Server/Explosion/Components/ClusterFlashComponent.cs b/Content.Server/Explosion/Components/ClusterFlashComponent.cs index 7cabbb2df87..d01f076b7ad 100644 --- a/Content.Server/Explosion/Components/ClusterFlashComponent.cs +++ b/Content.Server/Explosion/Components/ClusterFlashComponent.cs @@ -22,8 +22,6 @@ namespace Content.Server.Explosion.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "ClusterFlash"; - private Container _grenadesContainer = default!; /// diff --git a/Content.Server/Explosion/Components/DeleteOnTriggerComponent.cs b/Content.Server/Explosion/Components/DeleteOnTriggerComponent.cs index 2ff07a94f72..7ac3a1bc39f 100644 --- a/Content.Server/Explosion/Components/DeleteOnTriggerComponent.cs +++ b/Content.Server/Explosion/Components/DeleteOnTriggerComponent.cs @@ -9,6 +9,5 @@ namespace Content.Server.Explosion.Components [RegisterComponent] public class DeleteOnTriggerComponent : Component { - public override string Name => "DeleteOnTrigger"; } } diff --git a/Content.Server/Explosion/Components/ExplodeOnTriggerComponent.cs b/Content.Server/Explosion/Components/ExplodeOnTriggerComponent.cs index 9390886a796..9523df93e36 100644 --- a/Content.Server/Explosion/Components/ExplodeOnTriggerComponent.cs +++ b/Content.Server/Explosion/Components/ExplodeOnTriggerComponent.cs @@ -8,6 +8,5 @@ namespace Content.Server.Explosion.Components [RegisterComponent] public class ExplodeOnTriggerComponent : Component { - public override string Name => "ExplodeOnTrigger"; } } diff --git a/Content.Server/Explosion/Components/ExplosionLaunchedComponent.cs b/Content.Server/Explosion/Components/ExplosionLaunchedComponent.cs index 32f3e95ea4c..2c991f816a2 100644 --- a/Content.Server/Explosion/Components/ExplosionLaunchedComponent.cs +++ b/Content.Server/Explosion/Components/ExplosionLaunchedComponent.cs @@ -10,9 +10,6 @@ namespace Content.Server.Explosion.Components public class ExplosionLaunchedComponent : Component, IExAct { [Dependency] private readonly IEntityManager _entMan = default!; - - public override string Name => "ExplosionLaunched"; - void IExAct.OnExplosion(ExplosionEventArgs eventArgs) { if (_entMan.Deleted(Owner)) diff --git a/Content.Server/Explosion/Components/ExplosiveComponent.cs b/Content.Server/Explosion/Components/ExplosiveComponent.cs index c4aba1f3a96..f2243e51d52 100644 --- a/Content.Server/Explosion/Components/ExplosiveComponent.cs +++ b/Content.Server/Explosion/Components/ExplosiveComponent.cs @@ -20,8 +20,6 @@ namespace Content.Server.Explosion.Components [RegisterComponent] public class ExplosiveComponent : Component { - public override string Name => "Explosive"; - [DataField("devastationRange")] public int DevastationRange; [DataField("heavyImpactRange")] diff --git a/Content.Server/Explosion/Components/SoundOnTriggerComponent.cs b/Content.Server/Explosion/Components/SoundOnTriggerComponent.cs index 0db16635882..6d898239e15 100644 --- a/Content.Server/Explosion/Components/SoundOnTriggerComponent.cs +++ b/Content.Server/Explosion/Components/SoundOnTriggerComponent.cs @@ -12,8 +12,6 @@ namespace Content.Server.Explosion.Components [RegisterComponent] public sealed class SoundOnTriggerComponent : Component { - public override string Name => "SoundOnTrigger"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("sound")] public SoundSpecifier? Sound { get; set; } diff --git a/Content.Server/Explosion/Components/TriggerOnCollideComponent.cs b/Content.Server/Explosion/Components/TriggerOnCollideComponent.cs index 0c15a9a2071..87463675ee8 100644 --- a/Content.Server/Explosion/Components/TriggerOnCollideComponent.cs +++ b/Content.Server/Explosion/Components/TriggerOnCollideComponent.cs @@ -5,6 +5,5 @@ namespace Content.Server.Explosion.Components [RegisterComponent] public class TriggerOnCollideComponent : Component { - public override string Name => "TriggerOnCollide"; } } diff --git a/Content.Server/Extinguisher/FireExtinguisherComponent.cs b/Content.Server/Extinguisher/FireExtinguisherComponent.cs index 59929671617..4422e1ed523 100644 --- a/Content.Server/Extinguisher/FireExtinguisherComponent.cs +++ b/Content.Server/Extinguisher/FireExtinguisherComponent.cs @@ -9,8 +9,6 @@ namespace Content.Server.Extinguisher; [Friend(typeof(FireExtinguisherSystem))] public class FireExtinguisherComponent : Component { - public override string Name => "FireExtinguisher"; - [DataField("refillSound")] public SoundSpecifier RefillSound = new SoundPathSpecifier("/Audio/Effects/refill.ogg"); [DataField("hasSafety")] public bool HasSafety = true; diff --git a/Content.Server/Flash/Components/FlashComponent.cs b/Content.Server/Flash/Components/FlashComponent.cs index f5171d79167..a4e73b3ed9f 100644 --- a/Content.Server/Flash/Components/FlashComponent.cs +++ b/Content.Server/Flash/Components/FlashComponent.cs @@ -9,8 +9,6 @@ namespace Content.Server.Flash.Components [RegisterComponent, Friend(typeof(FlashSystem))] public class FlashComponent : Component { - public override string Name => "Flash"; - [DataField("duration")] [ViewVariables(VVAccess.ReadWrite)] public int FlashDuration { get; set; } = 5000; diff --git a/Content.Server/Flash/Components/FlashImmunityComponent.cs b/Content.Server/Flash/Components/FlashImmunityComponent.cs index 0e00b695d83..9ab80f3a50d 100644 --- a/Content.Server/Flash/Components/FlashImmunityComponent.cs +++ b/Content.Server/Flash/Components/FlashImmunityComponent.cs @@ -8,8 +8,6 @@ namespace Content.Server.Flash.Components [RegisterComponent, Friend(typeof(FlashSystem))] public class FlashImmunityComponent : Component { - public override string Name => "FlashImmunity"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("enabled")] public bool Enabled { get; set; } = true; diff --git a/Content.Server/Flash/Components/FlashOnTriggerComponent.cs b/Content.Server/Flash/Components/FlashOnTriggerComponent.cs index fca5898c34f..856a678f3ec 100644 --- a/Content.Server/Flash/Components/FlashOnTriggerComponent.cs +++ b/Content.Server/Flash/Components/FlashOnTriggerComponent.cs @@ -9,8 +9,6 @@ namespace Content.Server.Flash.Components [RegisterComponent] internal sealed class FlashOnTriggerComponent : Component { - public override string Name => "FlashOnTrigger"; - [DataField("range")] internal float Range = 1.0f; [DataField("duration")] internal float Duration = 8.0f; diff --git a/Content.Server/Fluids/Components/BucketComponent.cs b/Content.Server/Fluids/Components/BucketComponent.cs index 9af94fd2a73..3337349c6c7 100644 --- a/Content.Server/Fluids/Components/BucketComponent.cs +++ b/Content.Server/Fluids/Components/BucketComponent.cs @@ -26,7 +26,6 @@ namespace Content.Server.Fluids.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "Bucket"; public const string SolutionName = "bucket"; private List _currentlyUsing = new(); diff --git a/Content.Server/Fluids/Components/EvaporationComponent.cs b/Content.Server/Fluids/Components/EvaporationComponent.cs index d3eec2c6a51..34de2af104d 100644 --- a/Content.Server/Fluids/Components/EvaporationComponent.cs +++ b/Content.Server/Fluids/Components/EvaporationComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Fluids.Components [Friend(typeof(EvaporationSystem))] public sealed class EvaporationComponent : Component { - public override string Name => "Evaporation"; - /// /// The time that it will take this puddle to lose one fixed unit of solution, in seconds. /// diff --git a/Content.Server/Fluids/Components/MopComponent.cs b/Content.Server/Fluids/Components/MopComponent.cs index b9a376a26f6..ca57e3955e2 100644 --- a/Content.Server/Fluids/Components/MopComponent.cs +++ b/Content.Server/Fluids/Components/MopComponent.cs @@ -26,7 +26,6 @@ namespace Content.Server.Fluids.Components { [Dependency] private readonly IEntityManager _entities = default!; - public override string Name => "Mop"; public const string SolutionName = "mop"; /// diff --git a/Content.Server/Fluids/Components/PuddleComponent.cs b/Content.Server/Fluids/Components/PuddleComponent.cs index da545e805e2..03f5789f1ce 100644 --- a/Content.Server/Fluids/Components/PuddleComponent.cs +++ b/Content.Server/Fluids/Components/PuddleComponent.cs @@ -20,9 +20,6 @@ namespace Content.Server.Fluids.Components private static readonly FixedPoint2 DefaultSlipThreshold = FixedPoint2.New(3); public static readonly FixedPoint2 DefaultOverflowVolume = FixedPoint2.New(20); - public override string Name => "Puddle"; - - // Current design: Something calls the SpillHelper.Spill, that will either // A) Add to an existing puddle at the location (normalised to tile-center) or // B) add a new one diff --git a/Content.Server/Fluids/Components/SpillableComponent.cs b/Content.Server/Fluids/Components/SpillableComponent.cs index 61fe1d4f5ef..311c8e58160 100644 --- a/Content.Server/Fluids/Components/SpillableComponent.cs +++ b/Content.Server/Fluids/Components/SpillableComponent.cs @@ -8,8 +8,6 @@ namespace Content.Server.Fluids.Components; [RegisterComponent] public class SpillableComponent : Component { - public override string Name => "Spillable"; - [DataField("solution")] public string SolutionName = "puddle"; diff --git a/Content.Server/Ghost/Components/GhostOnMoveComponent.cs b/Content.Server/Ghost/Components/GhostOnMoveComponent.cs index c68ed195e48..4852ee5b665 100644 --- a/Content.Server/Ghost/Components/GhostOnMoveComponent.cs +++ b/Content.Server/Ghost/Components/GhostOnMoveComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Ghost.Components [RegisterComponent] public class GhostOnMoveComponent : Component { - public override string Name => "GhostOnMove"; - [DataField("canReturn")] public bool CanReturn { get; set; } = true; [DataField("mustBeDead")] diff --git a/Content.Server/Ghost/Components/GhostRadioComponent.cs b/Content.Server/Ghost/Components/GhostRadioComponent.cs index e612f8069ac..8fa7d8fb572 100644 --- a/Content.Server/Ghost/Components/GhostRadioComponent.cs +++ b/Content.Server/Ghost/Components/GhostRadioComponent.cs @@ -17,8 +17,6 @@ namespace Content.Server.Ghost.Components [Dependency] private readonly IServerNetManager _netManager = default!; [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "GhostRadio"; - [DataField("channels")] private List _channels = new(){1459}; diff --git a/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs b/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs index 17628450b9e..eaeda0f8a77 100644 --- a/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs +++ b/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs @@ -20,8 +20,6 @@ namespace Content.Server.Ghost.Roles.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "GhostRoleMobSpawner"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("deleteOnSpawn")] private bool _deleteOnSpawn = true; diff --git a/Content.Server/Ghost/Roles/Components/GhostTakeoverAvailableComponent.cs b/Content.Server/Ghost/Roles/Components/GhostTakeoverAvailableComponent.cs index cdb54d44ed6..87ee07c3686 100644 --- a/Content.Server/Ghost/Roles/Components/GhostTakeoverAvailableComponent.cs +++ b/Content.Server/Ghost/Roles/Components/GhostTakeoverAvailableComponent.cs @@ -12,8 +12,6 @@ namespace Content.Server.Ghost.Roles.Components [RegisterComponent, ComponentReference(typeof(GhostRoleComponent))] public class GhostTakeoverAvailableComponent : GhostRoleComponent { - public override string Name => "GhostTakeoverAvailable"; - public override bool Take(IPlayerSession session) { if (Taken) diff --git a/Content.Server/Gravity/GravityGeneratorComponent.cs b/Content.Server/Gravity/GravityGeneratorComponent.cs index b014f7492b4..6401998cc68 100644 --- a/Content.Server/Gravity/GravityGeneratorComponent.cs +++ b/Content.Server/Gravity/GravityGeneratorComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Gravity [Friend(typeof(GravityGeneratorSystem))] public sealed class GravityGeneratorComponent : SharedGravityGeneratorComponent { - public override string Name => "GravityGenerator"; - // 1% charge per second. [ViewVariables(VVAccess.ReadWrite)] [DataField("chargeRate")] public float ChargeRate { get; set; } = 0.01f; // The gravity generator has two power values. diff --git a/Content.Server/Headset/HeadsetComponent.cs b/Content.Server/Headset/HeadsetComponent.cs index 5c85c1acfac..fffcb915b0c 100644 --- a/Content.Server/Headset/HeadsetComponent.cs +++ b/Content.Server/Headset/HeadsetComponent.cs @@ -25,8 +25,6 @@ namespace Content.Server.Headset [Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IServerNetManager _netManager = default!; - public override string Name => "Headset"; - private RadioSystem _radioSystem = default!; [DataField("channels")] diff --git a/Content.Server/Interaction/Components/ClumsyComponent.cs b/Content.Server/Interaction/Components/ClumsyComponent.cs index 6fbff2c75f9..33f9e82e72c 100644 --- a/Content.Server/Interaction/Components/ClumsyComponent.cs +++ b/Content.Server/Interaction/Components/ClumsyComponent.cs @@ -12,8 +12,6 @@ namespace Content.Server.Interaction.Components { [Dependency] private readonly IRobustRandom _random = default!; - public override string Name => "Clumsy"; - public bool RollClumsy(float chance) { return Running && _random.Prob(chance); diff --git a/Content.Server/Interaction/Components/EmitSoundOnUseComponent.cs b/Content.Server/Interaction/Components/EmitSoundOnUseComponent.cs index a90eef8d76d..e94c8291503 100644 --- a/Content.Server/Interaction/Components/EmitSoundOnUseComponent.cs +++ b/Content.Server/Interaction/Components/EmitSoundOnUseComponent.cs @@ -9,7 +9,5 @@ namespace Content.Server.Interaction.Components [RegisterComponent] public class EmitSoundOnUseComponent : BaseEmitSoundComponent { - /// - public override string Name => "EmitSoundOnUse"; } } diff --git a/Content.Server/Kitchen/Components/ExtractableComponent.cs b/Content.Server/Kitchen/Components/ExtractableComponent.cs index 2d03ccce12a..9c46bbc1733 100644 --- a/Content.Server/Kitchen/Components/ExtractableComponent.cs +++ b/Content.Server/Kitchen/Components/ExtractableComponent.cs @@ -14,13 +14,11 @@ namespace Content.Server.Kitchen.Components [Friend(typeof(ReagentGrinderSystem))] public class ExtractableComponent : Component { - public override string Name => "Extractable"; - [ViewVariables] - [DataField("juiceSolution")] + [DataField("juiceSolution")] public Solution? JuiceSolution; - [ViewVariables] + [ViewVariables] [DataField("grindableSolutionName")] public string? GrindableSolution; } diff --git a/Content.Server/Kudzu/GrowingKudzuComponent.cs b/Content.Server/Kudzu/GrowingKudzuComponent.cs index 8353844bca2..4d919826cdc 100644 --- a/Content.Server/Kudzu/GrowingKudzuComponent.cs +++ b/Content.Server/Kudzu/GrowingKudzuComponent.cs @@ -7,8 +7,6 @@ namespace Content.Server.Kudzu; [RegisterComponent] public class GrowingKudzuComponent : Component { - public override string Name => "GrowingKudzu"; - [DataField("growthLevel")] public int GrowthLevel = 1; diff --git a/Content.Server/Kudzu/SpreaderComponent.cs b/Content.Server/Kudzu/SpreaderComponent.cs index d86eb75436a..6af4079ed63 100644 --- a/Content.Server/Kudzu/SpreaderComponent.cs +++ b/Content.Server/Kudzu/SpreaderComponent.cs @@ -13,8 +13,6 @@ namespace Content.Server.Kudzu; [RegisterComponent, Friend(typeof(SpreaderSystem))] public class SpreaderComponent : Component { - public override string Name => "Spreader"; - /// /// Chance for it to grow on any given tick, after the normal growth rate-limit (if it doesn't grow, SpreaderSystem will pick another one.). /// diff --git a/Content.Server/Labels/Label/Components/HandLabelerComponent.cs b/Content.Server/Labels/Label/Components/HandLabelerComponent.cs index 8849257fead..d534192f933 100644 --- a/Content.Server/Labels/Label/Components/HandLabelerComponent.cs +++ b/Content.Server/Labels/Label/Components/HandLabelerComponent.cs @@ -8,8 +8,6 @@ namespace Content.Server.Labels.Components [RegisterComponent] public class HandLabelerComponent : Component { - public override string Name => "HandLabeler"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("assignedLabel")] public string AssignedLabel { get; set; } = string.Empty; diff --git a/Content.Server/Labels/Label/Components/LabelComponent.cs b/Content.Server/Labels/Label/Components/LabelComponent.cs index 5ae78370d0d..7c6edd43a22 100644 --- a/Content.Server/Labels/Label/Components/LabelComponent.cs +++ b/Content.Server/Labels/Label/Components/LabelComponent.cs @@ -7,8 +7,6 @@ namespace Content.Server.Labels.Components [RegisterComponent] public class LabelComponent : Component { - public override string Name => "Label"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("currentLabel")] public string? CurrentLabel { get; set; } diff --git a/Content.Server/Labels/Label/Components/PaperLabelComponent.cs b/Content.Server/Labels/Label/Components/PaperLabelComponent.cs index 68231d1bd91..d4f980b6f5e 100644 --- a/Content.Server/Labels/Label/Components/PaperLabelComponent.cs +++ b/Content.Server/Labels/Label/Components/PaperLabelComponent.cs @@ -10,8 +10,6 @@ namespace Content.Server.Labels.Components [RegisterComponent] public class PaperLabelComponent : Component { - public override string Name => "PaperLabel"; - [DataField("labelSlot")] public ItemSlot LabelSlot = new(); } diff --git a/Content.Server/Lathe/Components/ProtolatheDatabaseComponent.cs b/Content.Server/Lathe/Components/ProtolatheDatabaseComponent.cs index efd8818994b..e20bdad2921 100644 --- a/Content.Server/Lathe/Components/ProtolatheDatabaseComponent.cs +++ b/Content.Server/Lathe/Components/ProtolatheDatabaseComponent.cs @@ -15,8 +15,6 @@ namespace Content.Server.Lathe.Components { [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - public override string Name => "ProtolatheDatabase"; - public override ComponentState GetComponentState() { return new ProtolatheDatabaseState(GetRecipeIdList()); diff --git a/Content.Server/Light/Components/LightBulbComponent.cs b/Content.Server/Light/Components/LightBulbComponent.cs index 29d9c5f1492..c0625134f6f 100644 --- a/Content.Server/Light/Components/LightBulbComponent.cs +++ b/Content.Server/Light/Components/LightBulbComponent.cs @@ -15,8 +15,6 @@ namespace Content.Server.Light.Components [RegisterComponent, Friend(typeof(LightBulbSystem))] public class LightBulbComponent : Component, IBreakAct { - public override string Name => "LightBulb"; - [DataField("color")] public Color Color = Color.White; diff --git a/Content.Server/Light/Components/LightReplacerComponent.cs b/Content.Server/Light/Components/LightReplacerComponent.cs index 79e57a95f19..37dc7bde625 100644 --- a/Content.Server/Light/Components/LightReplacerComponent.cs +++ b/Content.Server/Light/Components/LightReplacerComponent.cs @@ -18,8 +18,6 @@ namespace Content.Server.Light.Components [RegisterComponent] public class LightReplacerComponent : Component { - public override string Name => "LightReplacer"; - [DataField("sound")] public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Weapons/click.ogg"); diff --git a/Content.Server/Light/Components/LitOnPoweredComponent.cs b/Content.Server/Light/Components/LitOnPoweredComponent.cs index fb0ac0d9b12..5d1b3d4193b 100644 --- a/Content.Server/Light/Components/LitOnPoweredComponent.cs +++ b/Content.Server/Light/Components/LitOnPoweredComponent.cs @@ -13,6 +13,5 @@ namespace Content.Server.Light.Components [RegisterComponent, Friend(typeof(PoweredLightSystem))] public class LitOnPoweredComponent : Component { - public override string Name => "LitOnPowered"; } } diff --git a/Content.Server/Light/Components/MatchboxComponent.cs b/Content.Server/Light/Components/MatchboxComponent.cs index f756ad5c289..07b603b2916 100644 --- a/Content.Server/Light/Components/MatchboxComponent.cs +++ b/Content.Server/Light/Components/MatchboxComponent.cs @@ -10,6 +10,5 @@ namespace Content.Server.Light.Components [RegisterComponent] public class MatchboxComponent : Component { - public override string Name => "Matchbox"; } } diff --git a/Content.Server/Light/Components/MatchstickComponent.cs b/Content.Server/Light/Components/MatchstickComponent.cs index 591537e6f48..507d505afb5 100644 --- a/Content.Server/Light/Components/MatchstickComponent.cs +++ b/Content.Server/Light/Components/MatchstickComponent.cs @@ -13,8 +13,6 @@ namespace Content.Server.Light.Components [Friend(typeof(MatchstickSystem))] public class MatchstickComponent : Component { - public override string Name => "Matchstick"; - /// /// Current state to matchstick. Can be Unlit, Lit or Burnt. /// diff --git a/Content.Server/Light/Components/PoweredLightComponent.cs b/Content.Server/Light/Components/PoweredLightComponent.cs index 99f689e7820..35c00102204 100644 --- a/Content.Server/Light/Components/PoweredLightComponent.cs +++ b/Content.Server/Light/Components/PoweredLightComponent.cs @@ -19,8 +19,6 @@ namespace Content.Server.Light.Components [RegisterComponent, Friend(typeof(PoweredLightSystem))] public class PoweredLightComponent : Component { - public override string Name => "PoweredLight"; - [DataField("burnHandSound")] public SoundSpecifier BurnHandSound = new SoundPathSpecifier("/Audio/Effects/lightburn.ogg"); diff --git a/Content.Server/Light/Components/UnpoweredFlashlightComponent.cs b/Content.Server/Light/Components/UnpoweredFlashlightComponent.cs index c7a65fcefbd..d627dcaddc2 100644 --- a/Content.Server/Light/Components/UnpoweredFlashlightComponent.cs +++ b/Content.Server/Light/Components/UnpoweredFlashlightComponent.cs @@ -7,13 +7,11 @@ namespace Content.Server.Light.Components { /// /// This is simplified version of . - /// It doesn't consume any power and can be toggle only by verb. + /// It doesn't consume any power and can be toggle only by verb. /// [RegisterComponent] public class UnpoweredFlashlightComponent : Component { - public override string Name => "UnpoweredFlashlight"; - [DataField("toggleFlashlightSound")] public SoundSpecifier ToggleSound = new SoundPathSpecifier("/Audio/Items/flashlight_pda.ogg"); diff --git a/Content.Server/Lock/LockComponent.cs b/Content.Server/Lock/LockComponent.cs index 1cb93fda01c..09c0ede21a9 100644 --- a/Content.Server/Lock/LockComponent.cs +++ b/Content.Server/Lock/LockComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Storage.Components [RegisterComponent] public class LockComponent : Component { - public override string Name => "Lock"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("locked")] public bool Locked { get; set; } = true; [ViewVariables(VVAccess.ReadWrite)] [DataField("lockOnClick")] public bool LockOnClick { get; set; } = false; [ViewVariables(VVAccess.ReadWrite)] [DataField("unlockingSound")] public SoundSpecifier UnlockSound { get; set; } = new SoundPathSpecifier("/Audio/Machines/door_lock_off.ogg"); diff --git a/Content.Server/MachineLinking/Components/SignalButtonComponent.cs b/Content.Server/MachineLinking/Components/SignalButtonComponent.cs index 2bacd34fcab..99d363d6bf0 100644 --- a/Content.Server/MachineLinking/Components/SignalButtonComponent.cs +++ b/Content.Server/MachineLinking/Components/SignalButtonComponent.cs @@ -5,6 +5,5 @@ namespace Content.Server.MachineLinking.Components [RegisterComponent] public class SignalButtonComponent : Component { - public override string Name => "SignalButton"; } } diff --git a/Content.Server/MachineLinking/Components/SignalLinkerComponent.cs b/Content.Server/MachineLinking/Components/SignalLinkerComponent.cs index bf9d430c446..fb6ad25fce4 100644 --- a/Content.Server/MachineLinking/Components/SignalLinkerComponent.cs +++ b/Content.Server/MachineLinking/Components/SignalLinkerComponent.cs @@ -6,8 +6,6 @@ namespace Content.Server.MachineLinking.Components [RegisterComponent] public class SignalLinkerComponent : Component { - public override string Name => "SignalLinker"; - [ViewVariables] public (SignalTransmitterComponent transmitter, string port)? Port; } diff --git a/Content.Server/MachineLinking/Components/SignalReceiverComponent.cs b/Content.Server/MachineLinking/Components/SignalReceiverComponent.cs index 2c82bc7300c..362b918b206 100644 --- a/Content.Server/MachineLinking/Components/SignalReceiverComponent.cs +++ b/Content.Server/MachineLinking/Components/SignalReceiverComponent.cs @@ -10,8 +10,6 @@ namespace Content.Server.MachineLinking.Components [RegisterComponent] public class SignalReceiverComponent : Component { - public override string Name => "SignalReceiver"; - [DataField("inputs")] private List _inputs = new(); diff --git a/Content.Server/MachineLinking/Components/SignalSwitchComponent.cs b/Content.Server/MachineLinking/Components/SignalSwitchComponent.cs index eb8a4f37a82..c0fe44f8dbc 100644 --- a/Content.Server/MachineLinking/Components/SignalSwitchComponent.cs +++ b/Content.Server/MachineLinking/Components/SignalSwitchComponent.cs @@ -5,8 +5,6 @@ namespace Content.Server.MachineLinking.Components [RegisterComponent] public class SignalSwitchComponent : Component { - public override string Name => "SignalSwitch"; - public bool State; } } diff --git a/Content.Server/MachineLinking/Components/SignalTransmitterComponent.cs b/Content.Server/MachineLinking/Components/SignalTransmitterComponent.cs index 9e4982f8321..ba081970134 100644 --- a/Content.Server/MachineLinking/Components/SignalTransmitterComponent.cs +++ b/Content.Server/MachineLinking/Components/SignalTransmitterComponent.cs @@ -10,8 +10,6 @@ namespace Content.Server.MachineLinking.Components [RegisterComponent] public class SignalTransmitterComponent : Component { - public override string Name => "SignalTransmitter"; - [DataField("outputs")] private List _outputs = new(); diff --git a/Content.Server/MachineLinking/Components/TriggerOnSignalReceivedComponent.cs b/Content.Server/MachineLinking/Components/TriggerOnSignalReceivedComponent.cs index bfda03efcfa..54a6b410a78 100644 --- a/Content.Server/MachineLinking/Components/TriggerOnSignalReceivedComponent.cs +++ b/Content.Server/MachineLinking/Components/TriggerOnSignalReceivedComponent.cs @@ -5,6 +5,5 @@ namespace Content.Server.MachineLinking.Components [RegisterComponent] public class TriggerOnSignalReceivedComponent : Component { - public override string Name => "TriggerOnSignalReceived"; } } diff --git a/Content.Server/MachineLinking/Components/TwoWayLeverComponent.cs b/Content.Server/MachineLinking/Components/TwoWayLeverComponent.cs index a0782a45678..6ff0aa7a601 100644 --- a/Content.Server/MachineLinking/Components/TwoWayLeverComponent.cs +++ b/Content.Server/MachineLinking/Components/TwoWayLeverComponent.cs @@ -6,8 +6,6 @@ namespace Content.Server.MachineLinking.Components [RegisterComponent] public class TwoWayLeverComponent : Component { - public override string Name => "TwoWayLever"; - public TwoWayLeverSignal State; public bool NextSignalLeft; diff --git a/Content.Server/Materials/MaterialComponent.cs b/Content.Server/Materials/MaterialComponent.cs index 71845a3ae85..15fc89fc025 100644 --- a/Content.Server/Materials/MaterialComponent.cs +++ b/Content.Server/Materials/MaterialComponent.cs @@ -17,8 +17,6 @@ namespace Content.Server.Materials [RegisterComponent] public class MaterialComponent : Component { - public override string Name => "Material"; - [ViewVariables] [DataField("materials", customTypeSerializer:typeof(PrototypeIdListSerializer))] // ReSharper disable once CollectionNeverUpdated.Local diff --git a/Content.Server/Medical/Components/HealingComponent.cs b/Content.Server/Medical/Components/HealingComponent.cs index 06cecbb791a..8ab242b3e6e 100644 --- a/Content.Server/Medical/Components/HealingComponent.cs +++ b/Content.Server/Medical/Components/HealingComponent.cs @@ -21,8 +21,6 @@ namespace Content.Server.Medical.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "Healing"; - [DataField("damage", required: true)] [ViewVariables(VVAccess.ReadWrite)] public DamageSpecifier Damage = default!; diff --git a/Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleComponent.cs b/Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleComponent.cs index 0b98d4e3622..946c54a67e3 100644 --- a/Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleComponent.cs +++ b/Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleComponent.cs @@ -10,8 +10,6 @@ namespace Content.Server.Medical.CrewMonitoring [Friend(typeof(CrewMonitoringConsoleSystem))] public class CrewMonitoringConsoleComponent : Component { - public override string Name => "CrewMonitoringConsole"; - /// /// List of all currently connected sensors to this console. /// diff --git a/Content.Server/Mind/Components/VisitingMindComponent.cs b/Content.Server/Mind/Components/VisitingMindComponent.cs index 53a5eca43bc..7cc29848f41 100644 --- a/Content.Server/Mind/Components/VisitingMindComponent.cs +++ b/Content.Server/Mind/Components/VisitingMindComponent.cs @@ -6,8 +6,6 @@ namespace Content.Server.Mind.Components [RegisterComponent] public sealed class VisitingMindComponent : Component { - public override string Name => "VisitingMind"; - [ViewVariables] public Mind Mind { get; set; } = default!; protected override void OnRemove() diff --git a/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs b/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs index fb21adce49d..ae479464588 100644 --- a/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs +++ b/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs @@ -13,8 +13,6 @@ namespace Content.Server.Morgue.Components [ComponentReference(typeof(IStorageComponent))] public class BodyBagEntityStorageComponent : EntityStorageComponent { - public override string Name => "BodyBagEntityStorage"; - protected override bool AddToContents(EntityUid entity) { if (IoCManager.Resolve().HasComponent(entity) && !EntitySystem.Get().IsDown(entity)) return false; diff --git a/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs b/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs index cb78bf0ccbb..008377a8cd8 100644 --- a/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs +++ b/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs @@ -33,9 +33,6 @@ namespace Content.Server.Morgue.Components #pragma warning restore 618 { [Dependency] private readonly IEntityManager _entities = default!; - - public override string Name => "CrematoriumEntityStorage"; - [DataField("cremateStartSound")] private SoundSpecifier _cremateStartSound = new SoundPathSpecifier("/Audio/Items/lighter1.ogg"); [DataField("crematingSound")] private SoundSpecifier _crematingSound = new SoundPathSpecifier("/Audio/Effects/burning.ogg"); [DataField("cremateFinishSound")] private SoundSpecifier _cremateFinishSound = new SoundPathSpecifier("/Audio/Machines/ding.ogg"); diff --git a/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs b/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs index a56efbcd0dd..10cf6855a49 100644 --- a/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs +++ b/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs @@ -37,8 +37,6 @@ namespace Content.Server.Morgue.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "MorgueEntityStorage"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("trayPrototype", customTypeSerializer:typeof(PrototypeIdSerializer))] private string? _trayPrototypeId; diff --git a/Content.Server/Morgue/Components/MorgueTrayComponent.cs b/Content.Server/Morgue/Components/MorgueTrayComponent.cs index 9e808adf9e0..eb787bd7d4d 100644 --- a/Content.Server/Morgue/Components/MorgueTrayComponent.cs +++ b/Content.Server/Morgue/Components/MorgueTrayComponent.cs @@ -9,8 +9,6 @@ namespace Content.Server.Morgue.Components [ComponentReference(typeof(IActivate))] public class MorgueTrayComponent : Component, IActivate { - public override string Name => "MorgueTray"; - [ViewVariables] public EntityUid Morgue { get; set; } diff --git a/Content.Server/Movement/Components/FootstepModifierComponent.cs b/Content.Server/Movement/Components/FootstepModifierComponent.cs index fee5f749096..4ad7cbd9505 100644 --- a/Content.Server/Movement/Components/FootstepModifierComponent.cs +++ b/Content.Server/Movement/Components/FootstepModifierComponent.cs @@ -14,9 +14,6 @@ namespace Content.Server.Movement.Components [RegisterComponent] public class FootstepModifierComponent : Component { - /// - public override string Name => "FootstepModifier"; - [DataField("footstepSoundCollection", required: true)] public SoundSpecifier SoundCollection = default!; diff --git a/Content.Server/Movement/Components/StressTestMovementComponent.cs b/Content.Server/Movement/Components/StressTestMovementComponent.cs index 13d3a89081c..c275e492ddd 100644 --- a/Content.Server/Movement/Components/StressTestMovementComponent.cs +++ b/Content.Server/Movement/Components/StressTestMovementComponent.cs @@ -7,8 +7,6 @@ namespace Content.Server.Movement.Components [RegisterComponent] public class StressTestMovementComponent : Component { - public override string Name => "StressTestMovement"; - public float Progress { get; set; } public Vector2 Origin { get; set; } diff --git a/Content.Server/NodeContainer/NodeContainerComponent.cs b/Content.Server/NodeContainer/NodeContainerComponent.cs index b7ac0122b31..49af08ab6c8 100644 --- a/Content.Server/NodeContainer/NodeContainerComponent.cs +++ b/Content.Server/NodeContainer/NodeContainerComponent.cs @@ -19,8 +19,6 @@ namespace Content.Server.NodeContainer public class NodeContainerComponent : Component, IExamine #pragma warning restore 618 { - public override string Name => "NodeContainer"; - //HACK: THIS BEING readOnly IS A FILTHY HACK AND I HATE IT --moony [DataField("nodes", readOnly: true)] [ViewVariables] public Dictionary Nodes { get; } = new(); diff --git a/Content.Server/Nuke/NukeCodePaperComponent.cs b/Content.Server/Nuke/NukeCodePaperComponent.cs index 1c4cbb97679..9b9047d0e65 100644 --- a/Content.Server/Nuke/NukeCodePaperComponent.cs +++ b/Content.Server/Nuke/NukeCodePaperComponent.cs @@ -9,6 +9,5 @@ namespace Content.Server.Nuke [RegisterComponent] public class NukeCodePaperComponent : Component { - public override string Name => "NukeCodePaper"; } } diff --git a/Content.Server/Nuke/NukeComponent.cs b/Content.Server/Nuke/NukeComponent.cs index a6f7c107f04..a9a69a977a1 100644 --- a/Content.Server/Nuke/NukeComponent.cs +++ b/Content.Server/Nuke/NukeComponent.cs @@ -18,8 +18,6 @@ namespace Content.Server.Nuke [Friend(typeof(NukeSystem))] public class NukeComponent : Component { - public override string Name => "Nuke"; - /// /// Default bomb timer value in seconds. /// diff --git a/Content.Server/Nutrition/Components/CigarComponent.cs b/Content.Server/Nutrition/Components/CigarComponent.cs index 661affec7e1..9978b4b097a 100644 --- a/Content.Server/Nutrition/Components/CigarComponent.cs +++ b/Content.Server/Nutrition/Components/CigarComponent.cs @@ -10,6 +10,5 @@ namespace Content.Server.Nutrition.Components [RegisterComponent, Friend(typeof(SmokingSystem))] public class CigarComponent : Component { - public override string Name => "Cigar"; } } diff --git a/Content.Server/Nutrition/Components/DrinkComponent.cs b/Content.Server/Nutrition/Components/DrinkComponent.cs index b6d893ae026..4c95567f8b6 100644 --- a/Content.Server/Nutrition/Components/DrinkComponent.cs +++ b/Content.Server/Nutrition/Components/DrinkComponent.cs @@ -18,8 +18,6 @@ namespace Content.Server.Nutrition.Components public string SolutionName { get; set; } = DefaultSolutionName; public const string DefaultSolutionName = "drink"; - public override string Name => "Drink"; - [ViewVariables] [DataField("useSound")] public SoundSpecifier UseSound = new SoundPathSpecifier("/Audio/Items/drink.ogg"); diff --git a/Content.Server/Nutrition/Components/FoodComponent.cs b/Content.Server/Nutrition/Components/FoodComponent.cs index 103bd09a418..ea70ebc3616 100644 --- a/Content.Server/Nutrition/Components/FoodComponent.cs +++ b/Content.Server/Nutrition/Components/FoodComponent.cs @@ -16,8 +16,6 @@ namespace Content.Server.Nutrition.Components [RegisterComponent, Friend(typeof(FoodSystem))] public class FoodComponent : Component { - public override string Name => "Food"; - [DataField("solution")] public string SolutionName { get; set; } = "food"; diff --git a/Content.Server/Nutrition/Components/ForcefeedOnCollideComponent.cs b/Content.Server/Nutrition/Components/ForcefeedOnCollideComponent.cs index 91d90fcf462..abaf177b166 100644 --- a/Content.Server/Nutrition/Components/ForcefeedOnCollideComponent.cs +++ b/Content.Server/Nutrition/Components/ForcefeedOnCollideComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Nutrition.Components [RegisterComponent, Friend(typeof(ForcefeedOnCollideSystem))] public class ForcefeedOnCollideComponent : Component { - public override string Name => "ForcefeedOnCollide"; - /// /// Since this component is primarily used by the pneumatic cannon, which adds this comp on throw start /// and wants to remove it on throw end, this is set to false. However, you're free to change it if you want diff --git a/Content.Server/Nutrition/Components/IngestionBlockerComponent.cs b/Content.Server/Nutrition/Components/IngestionBlockerComponent.cs index 6e556d0a02e..c74dbe99d06 100644 --- a/Content.Server/Nutrition/Components/IngestionBlockerComponent.cs +++ b/Content.Server/Nutrition/Components/IngestionBlockerComponent.cs @@ -15,8 +15,6 @@ namespace Content.Server.Nutrition.EntitySystems; [RegisterComponent, Friend(typeof(FoodSystem), typeof(DrinkSystem))] public class IngestionBlockerComponent : Component { - public override string Name => "IngestionBlocker"; - /// /// Is this component currently blocking consumption. /// diff --git a/Content.Server/Nutrition/Components/SliceableFoodComponent.cs b/Content.Server/Nutrition/Components/SliceableFoodComponent.cs index dc7479a7800..0ac7c9e386d 100644 --- a/Content.Server/Nutrition/Components/SliceableFoodComponent.cs +++ b/Content.Server/Nutrition/Components/SliceableFoodComponent.cs @@ -10,8 +10,6 @@ namespace Content.Server.Nutrition.Components [RegisterComponent, Friend(typeof(SliceableFoodSystem))] internal class SliceableFoodComponent : Component { - public override string Name => "SliceableFood"; - [DataField("slice")] [ViewVariables(VVAccess.ReadWrite)] public string Slice = string.Empty; diff --git a/Content.Server/Nutrition/Components/SmokableComponent.cs b/Content.Server/Nutrition/Components/SmokableComponent.cs index bd54e7f7cc2..f830695f16c 100644 --- a/Content.Server/Nutrition/Components/SmokableComponent.cs +++ b/Content.Server/Nutrition/Components/SmokableComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Nutrition.Components [RegisterComponent, Friend(typeof(SmokingSystem))] public class SmokableComponent : Component { - public override string Name => "Smokable"; - [DataField("solution")] public string Solution { get; } = "smokable"; diff --git a/Content.Server/Nutrition/Components/UtensilComponent.cs b/Content.Server/Nutrition/Components/UtensilComponent.cs index 11c1fdcb9d4..dbf9410a1ff 100644 --- a/Content.Server/Nutrition/Components/UtensilComponent.cs +++ b/Content.Server/Nutrition/Components/UtensilComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Nutrition.Components [RegisterComponent, Friend(typeof(UtensilSystem))] public class UtensilComponent : Component { - public override string Name => "Utensil"; - [DataField("types")] private UtensilType _types = UtensilType.None; diff --git a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs index d4d757127b0..ac987f92e20 100644 --- a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs +++ b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs @@ -39,8 +39,6 @@ namespace Content.Server.ParticleAccelerator.Components [Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IMapManager _mapManager = default!; - public override string Name => "ParticleAcceleratorControlBox"; - [ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(ParticleAcceleratorControlBoxUiKey.Key); diff --git a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEmitterComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEmitterComponent.cs index b4053089dfd..37b594115a6 100644 --- a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEmitterComponent.cs +++ b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEmitterComponent.cs @@ -10,7 +10,6 @@ namespace Content.Server.ParticleAccelerator.Components [ComponentReference(typeof(ParticleAcceleratorPartComponent))] public class ParticleAcceleratorEmitterComponent : ParticleAcceleratorPartComponent { - public override string Name => "ParticleAcceleratorEmitter"; [DataField("emitterType")] public ParticleAcceleratorEmitterType Type = ParticleAcceleratorEmitterType.Center; diff --git a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEndCapComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEndCapComponent.cs index df0df96e6e5..788acc4234a 100644 --- a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEndCapComponent.cs +++ b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEndCapComponent.cs @@ -6,6 +6,5 @@ namespace Content.Server.ParticleAccelerator.Components [ComponentReference(typeof(ParticleAcceleratorPartComponent))] public class ParticleAcceleratorEndCapComponent : ParticleAcceleratorPartComponent { - public override string Name => "ParticleAcceleratorEndCap"; } } diff --git a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorFuelChamberComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorFuelChamberComponent.cs index 1395d0cd008..e862e8a3b84 100644 --- a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorFuelChamberComponent.cs +++ b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorFuelChamberComponent.cs @@ -6,6 +6,5 @@ namespace Content.Server.ParticleAccelerator.Components [ComponentReference(typeof(ParticleAcceleratorPartComponent))] public class ParticleAcceleratorFuelChamberComponent : ParticleAcceleratorPartComponent { - public override string Name => "ParticleAcceleratorFuelChamber"; } } diff --git a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs index 5517069a650..1ede1c6dae0 100644 --- a/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs +++ b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs @@ -8,7 +8,6 @@ namespace Content.Server.ParticleAccelerator.Components [ComponentReference(typeof(ParticleAcceleratorPartComponent))] public class ParticleAcceleratorPowerBoxComponent : ParticleAcceleratorPartComponent { - public override string Name => "ParticleAcceleratorPowerBox"; [ViewVariables] public PowerConsumerComponent? PowerConsumerComponent; protected override void Initialize() diff --git a/Content.Server/ParticleAccelerator/Components/ParticleProjectileComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleProjectileComponent.cs index 6fabcf499f7..741a83d89e4 100644 --- a/Content.Server/ParticleAccelerator/Components/ParticleProjectileComponent.cs +++ b/Content.Server/ParticleAccelerator/Components/ParticleProjectileComponent.cs @@ -15,7 +15,6 @@ namespace Content.Server.ParticleAccelerator.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "ParticleProjectile"; public ParticleAcceleratorPowerState State; public void Fire(ParticleAcceleratorPowerState state, Angle angle, EntityUid firer) diff --git a/Content.Server/Plants/Components/PottedPlantHideComponent.cs b/Content.Server/Plants/Components/PottedPlantHideComponent.cs index 1254cf94f1c..01a27f9fe5e 100644 --- a/Content.Server/Plants/Components/PottedPlantHideComponent.cs +++ b/Content.Server/Plants/Components/PottedPlantHideComponent.cs @@ -15,8 +15,6 @@ namespace Content.Server.Plants.Components [Friend(typeof(PottedPlantHideSystem))] public class PottedPlantHideComponent : Component { - public override string Name => "PottedPlantHide"; - [DataField("rustleSound")] public SoundSpecifier RustleSound = new SoundPathSpecifier("/Audio/Effects/plant_rustle.ogg"); } diff --git a/Content.Server/PneumaticCannon/PneumaticCannonComponent.cs b/Content.Server/PneumaticCannon/PneumaticCannonComponent.cs index 3272486ad90..bd32d69ca86 100644 --- a/Content.Server/PneumaticCannon/PneumaticCannonComponent.cs +++ b/Content.Server/PneumaticCannon/PneumaticCannonComponent.cs @@ -16,8 +16,6 @@ namespace Content.Server.PneumaticCannon [RegisterComponent, Friend(typeof(PneumaticCannonSystem))] public class PneumaticCannonComponent : Component { - public override string Name { get; } = "PneumaticCannon"; - [ViewVariables] public ContainerSlot GasTankSlot = default!; diff --git a/Content.Server/Power/Components/ActivatableUIRequiresPowerComponent.cs b/Content.Server/Power/Components/ActivatableUIRequiresPowerComponent.cs index ed361de7181..fd79dac8eac 100644 --- a/Content.Server/Power/Components/ActivatableUIRequiresPowerComponent.cs +++ b/Content.Server/Power/Components/ActivatableUIRequiresPowerComponent.cs @@ -6,7 +6,6 @@ namespace Content.Server.Power.Components [RegisterComponent] public class ActivatableUIRequiresPowerComponent : Component { - public override string Name => "ActivatableUIRequiresPower"; } } diff --git a/Content.Server/Power/Components/ApcPowerProviderComponent.cs b/Content.Server/Power/Components/ApcPowerProviderComponent.cs index 4d8ffc90928..bace38634bf 100644 --- a/Content.Server/Power/Components/ApcPowerProviderComponent.cs +++ b/Content.Server/Power/Components/ApcPowerProviderComponent.cs @@ -6,10 +6,9 @@ using Robust.Shared.ViewVariables; namespace Content.Server.Power.Components { [RegisterComponent] + [ComponentProtoName("PowerProvider")] public class ApcPowerProviderComponent : BaseApcNetComponent { - public override string Name => "PowerProvider"; - [ViewVariables] public List LinkedReceivers { get; } = new(); public void AddReceiver(ApcPowerReceiverComponent receiver) diff --git a/Content.Server/Power/Components/ApcPowerReceiverComponent.cs b/Content.Server/Power/Components/ApcPowerReceiverComponent.cs index 4a0ae9a80ac..766983d32eb 100644 --- a/Content.Server/Power/Components/ApcPowerReceiverComponent.cs +++ b/Content.Server/Power/Components/ApcPowerReceiverComponent.cs @@ -26,8 +26,6 @@ namespace Content.Server.Power.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "ApcPowerReceiver"; - [ViewVariables] public bool Powered => (MathHelper.CloseToPercent(NetworkLoad.ReceivingPower, Load) || !NeedsPower) && !PowerDisabled; diff --git a/Content.Server/Power/Components/BatteryChargerComponent.cs b/Content.Server/Power/Components/BatteryChargerComponent.cs index f6b472cdb4c..c0ffc0265b4 100644 --- a/Content.Server/Power/Components/BatteryChargerComponent.cs +++ b/Content.Server/Power/Components/BatteryChargerComponent.cs @@ -9,8 +9,6 @@ namespace Content.Server.Power.Components [RegisterComponent] public class BatteryChargerComponent : BasePowerNetComponent { - public override string Name => "BatteryCharger"; - protected override void AddSelfToNet(IPowerNet net) { net.AddCharger(this); diff --git a/Content.Server/Power/Components/BatteryComponent.cs b/Content.Server/Power/Components/BatteryComponent.cs index bd099c3e8ab..dd319c85b79 100644 --- a/Content.Server/Power/Components/BatteryComponent.cs +++ b/Content.Server/Power/Components/BatteryComponent.cs @@ -15,8 +15,6 @@ namespace Content.Server.Power.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "Battery"; - /// /// Maximum charge of the battery in joules (ie. watt seconds) /// diff --git a/Content.Server/Power/Components/BatteryDischargerComponent.cs b/Content.Server/Power/Components/BatteryDischargerComponent.cs index 37cb8dbe589..3ba6bba41a0 100644 --- a/Content.Server/Power/Components/BatteryDischargerComponent.cs +++ b/Content.Server/Power/Components/BatteryDischargerComponent.cs @@ -6,8 +6,6 @@ namespace Content.Server.Power.Components [RegisterComponent] public class BatteryDischargerComponent : BasePowerNetComponent { - public override string Name => "BatteryDischarger"; - protected override void AddSelfToNet(IPowerNet net) { net.AddDischarger(this); diff --git a/Content.Server/Power/Components/BatterySelfRechargerComponent.cs b/Content.Server/Power/Components/BatterySelfRechargerComponent.cs index 35e8fa99684..0c004fc5cb7 100644 --- a/Content.Server/Power/Components/BatterySelfRechargerComponent.cs +++ b/Content.Server/Power/Components/BatterySelfRechargerComponent.cs @@ -12,8 +12,6 @@ namespace Content.Server.Power.Components [RegisterComponent] public class BatterySelfRechargerComponent : Component { - public override string Name => "BatterySelfRecharger"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("autoRecharge")] public bool AutoRecharge { get; set; } [ViewVariables(VVAccess.ReadWrite)] [DataField("autoRechargeRate")] public float AutoRechargeRate { get; set; } diff --git a/Content.Server/Power/Components/CableVisComponent.cs b/Content.Server/Power/Components/CableVisComponent.cs index add61d7de50..f1652387fc6 100644 --- a/Content.Server/Power/Components/CableVisComponent.cs +++ b/Content.Server/Power/Components/CableVisComponent.cs @@ -7,8 +7,6 @@ namespace Content.Server.Power.Components [RegisterComponent] public sealed class CableVisComponent : Component { - public override string Name => "CableVis"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("node")] public string? Node; diff --git a/Content.Server/Power/Components/ChargerComponent.cs b/Content.Server/Power/Components/ChargerComponent.cs index f4fec8f6e4c..a00ba1b50ff 100644 --- a/Content.Server/Power/Components/ChargerComponent.cs +++ b/Content.Server/Power/Components/ChargerComponent.cs @@ -13,8 +13,6 @@ namespace Content.Server.Power.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "Charger"; - [ViewVariables] public BatteryComponent? HeldBattery; diff --git a/Content.Server/Power/Components/ExaminableBatteryComponent.cs b/Content.Server/Power/Components/ExaminableBatteryComponent.cs index 5df79ff0b83..608b4f119a7 100644 --- a/Content.Server/Power/Components/ExaminableBatteryComponent.cs +++ b/Content.Server/Power/Components/ExaminableBatteryComponent.cs @@ -12,8 +12,6 @@ namespace Content.Server.Power.Components public class ExaminableBatteryComponent : Component, IExamine #pragma warning restore 618 { - public override string Name => "ExaminableBattery"; - [Dependency] private readonly IEntityManager _entityManager = default!; void IExamine.Examine(FormattedMessage message, bool inDetailsRange) diff --git a/Content.Server/Power/Components/ExtensionCableProviderComponent.cs b/Content.Server/Power/Components/ExtensionCableProviderComponent.cs index fb3a6d5f379..3595954b591 100644 --- a/Content.Server/Power/Components/ExtensionCableProviderComponent.cs +++ b/Content.Server/Power/Components/ExtensionCableProviderComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Power.Components [Friend(typeof(ExtensionCableSystem))] public class ExtensionCableProviderComponent : Component { - public override string Name => "ExtensionCableProvider"; - /// /// The max distance this can connect to s from. /// diff --git a/Content.Server/Power/Components/ExtensionCableReceiverComponent.cs b/Content.Server/Power/Components/ExtensionCableReceiverComponent.cs index cac443ccb47..d0ca505a21b 100644 --- a/Content.Server/Power/Components/ExtensionCableReceiverComponent.cs +++ b/Content.Server/Power/Components/ExtensionCableReceiverComponent.cs @@ -10,8 +10,6 @@ namespace Content.Server.Power.Components [Friend(typeof(ExtensionCableSystem))] public class ExtensionCableReceiverComponent : Component { - public override string Name => "ExtensionCableReceiver"; - [ViewVariables] public ExtensionCableProviderComponent? Provider { get; set; } diff --git a/Content.Server/Power/Components/PowerConsumerComponent.cs b/Content.Server/Power/Components/PowerConsumerComponent.cs index 0eb3f728ffe..a8b2d041b96 100644 --- a/Content.Server/Power/Components/PowerConsumerComponent.cs +++ b/Content.Server/Power/Components/PowerConsumerComponent.cs @@ -12,8 +12,6 @@ namespace Content.Server.Power.Components [RegisterComponent] public class PowerConsumerComponent : BaseNetConnectorComponent { - public override string Name => "PowerConsumer"; - /// /// How much power this needs to be fully powered. /// diff --git a/Content.Server/Power/Components/PowerNetworkBatteryComponent.cs b/Content.Server/Power/Components/PowerNetworkBatteryComponent.cs index 5da505e03da..7c47898004e 100644 --- a/Content.Server/Power/Components/PowerNetworkBatteryComponent.cs +++ b/Content.Server/Power/Components/PowerNetworkBatteryComponent.cs @@ -15,8 +15,6 @@ namespace Content.Server.Power.Components [RegisterComponent] public sealed class PowerNetworkBatteryComponent : Component { - public override string Name => "PowerNetworkBattery"; - [DataField("maxChargeRate")] [ViewVariables(VVAccess.ReadWrite)] public float MaxChargeRate diff --git a/Content.Server/Power/Components/PowerSupplierComponent.cs b/Content.Server/Power/Components/PowerSupplierComponent.cs index 675bc852469..21a82a6158d 100644 --- a/Content.Server/Power/Components/PowerSupplierComponent.cs +++ b/Content.Server/Power/Components/PowerSupplierComponent.cs @@ -9,8 +9,6 @@ namespace Content.Server.Power.Components [RegisterComponent] public class PowerSupplierComponent : BasePowerNetComponent { - public override string Name => "PowerSupplier"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("supplyRate")] public float MaxSupply { get => NetworkSupply.MaxSupply; set => NetworkSupply.MaxSupply = value; } diff --git a/Content.Server/Power/SMES/SmesComponent.cs b/Content.Server/Power/SMES/SmesComponent.cs index 9b606f67596..f7c9e40c8a6 100644 --- a/Content.Server/Power/SMES/SmesComponent.cs +++ b/Content.Server/Power/SMES/SmesComponent.cs @@ -21,8 +21,6 @@ namespace Content.Server.Power.SMES [Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; - public override string Name => "Smes"; - private int _lastChargeLevel; private TimeSpan _lastChargeLevelChange; diff --git a/Content.Server/Projectiles/Components/HitscanComponent.cs b/Content.Server/Projectiles/Components/HitscanComponent.cs index b6aae157efb..a931f640b90 100644 --- a/Content.Server/Projectiles/Components/HitscanComponent.cs +++ b/Content.Server/Projectiles/Components/HitscanComponent.cs @@ -24,7 +24,6 @@ namespace Content.Server.Projectiles.Components [Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; - public override string Name => "Hitscan"; public CollisionGroup CollisionMask => (CollisionGroup) _collisionMask; [DataField("layers")] //todo WithFormat.Flags() diff --git a/Content.Server/RCD/Components/RCDAmmoComponent.cs b/Content.Server/RCD/Components/RCDAmmoComponent.cs index 2c6aff89858..9c9c0a4b591 100644 --- a/Content.Server/RCD/Components/RCDAmmoComponent.cs +++ b/Content.Server/RCD/Components/RCDAmmoComponent.cs @@ -7,8 +7,6 @@ namespace Content.Server.RCD.Components [RegisterComponent] public class RCDAmmoComponent : Component { - public override string Name => "RCDAmmo"; - //How much ammo we refill [ViewVariables(VVAccess.ReadWrite)] [DataField("refillAmmo")] public int RefillAmmo = 5; } diff --git a/Content.Server/RCD/Components/RCDComponent.cs b/Content.Server/RCD/Components/RCDComponent.cs index 61d48931810..dd80c517fe6 100644 --- a/Content.Server/RCD/Components/RCDComponent.cs +++ b/Content.Server/RCD/Components/RCDComponent.cs @@ -16,8 +16,6 @@ namespace Content.Server.RCD.Components [RegisterComponent] public class RCDComponent : Component { - public override string Name => "RCD"; - [ViewVariables(VVAccess.ReadOnly)] [DataField("maxAmmo")] public int MaxAmmo = 5; diff --git a/Content.Server/Radio/Components/HandheldRadioComponent.cs b/Content.Server/Radio/Components/HandheldRadioComponent.cs index 200069f0f15..c2f417c004c 100644 --- a/Content.Server/Radio/Components/HandheldRadioComponent.cs +++ b/Content.Server/Radio/Components/HandheldRadioComponent.cs @@ -15,6 +15,7 @@ using Robust.Shared.ViewVariables; namespace Content.Server.Radio.Components { [RegisterComponent] + [ComponentProtoName("Radio")] [ComponentReference(typeof(IRadio))] [ComponentReference(typeof(IListen))] [ComponentReference(typeof(IActivate))] @@ -23,8 +24,6 @@ namespace Content.Server.Radio.Components #pragma warning restore 618 { [Dependency] private readonly IChatManager _chatManager = default!; - public override string Name => "Radio"; - private RadioSystem _radioSystem = default!; private bool _radioOn; diff --git a/Content.Server/Recycling/Components/RecyclableComponent.cs b/Content.Server/Recycling/Components/RecyclableComponent.cs index df546fe8762..a4adfe77bfb 100644 --- a/Content.Server/Recycling/Components/RecyclableComponent.cs +++ b/Content.Server/Recycling/Components/RecyclableComponent.cs @@ -10,8 +10,6 @@ namespace Content.Server.Recycling.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "Recyclable"; - /// /// The prototype that will be spawned on recycle. /// diff --git a/Content.Server/Recycling/Components/RecyclerComponent.cs b/Content.Server/Recycling/Components/RecyclerComponent.cs index bc01f03034d..63c44bc2153 100644 --- a/Content.Server/Recycling/Components/RecyclerComponent.cs +++ b/Content.Server/Recycling/Components/RecyclerComponent.cs @@ -23,8 +23,6 @@ namespace Content.Server.Recycling.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "Recycler"; - /// /// Whether or not sentient beings will be recycled /// diff --git a/Content.Server/Repairable/RepairableComponent.cs b/Content.Server/Repairable/RepairableComponent.cs index a1e6e86189e..3ebc461189e 100644 --- a/Content.Server/Repairable/RepairableComponent.cs +++ b/Content.Server/Repairable/RepairableComponent.cs @@ -9,8 +9,6 @@ namespace Content.Server.Repairable [RegisterComponent] public class RepairableComponent : Component { - public override string Name => "Repairable"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("fuelCost")] public int FuelCost = 5; diff --git a/Content.Server/Research/Components/ResearchPointSourceComponent.cs b/Content.Server/Research/Components/ResearchPointSourceComponent.cs index bb32eadb665..725f8b1fe85 100644 --- a/Content.Server/Research/Components/ResearchPointSourceComponent.cs +++ b/Content.Server/Research/Components/ResearchPointSourceComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Research.Components [ComponentReference(typeof(IActivate))] public class ResearchPointSourceComponent : ResearchClientComponent { - public override string Name => "ResearchPointSource"; - [DataField("pointspersecond")] private int _pointsPerSecond; [DataField("active")] diff --git a/Content.Server/Research/Components/ResearchServerComponent.cs b/Content.Server/Research/Components/ResearchServerComponent.cs index 5f37de70c5c..8d1a84ef190 100644 --- a/Content.Server/Research/Components/ResearchServerComponent.cs +++ b/Content.Server/Research/Components/ResearchServerComponent.cs @@ -13,8 +13,6 @@ namespace Content.Server.Research.Components { public static int ServerCount = 0; - public override string Name => "ResearchServer"; - [ViewVariables(VVAccess.ReadWrite)] public string ServerName => _serverName; [DataField("servername")] diff --git a/Content.Server/Resist/ResistLockerComponent.cs b/Content.Server/Resist/ResistLockerComponent.cs index 4d6e46df3c4..0d2d0949482 100644 --- a/Content.Server/Resist/ResistLockerComponent.cs +++ b/Content.Server/Resist/ResistLockerComponent.cs @@ -10,8 +10,6 @@ namespace Content.Server.Resist; [Friend(typeof(ResistLockerSystem))] public class ResistLockerComponent : Component { - public override string Name => "ResistLocker"; - /// /// How long will this locker take to kick open, defaults to 2 minutes /// diff --git a/Content.Server/Rotatable/FlippableComponent.cs b/Content.Server/Rotatable/FlippableComponent.cs index 5f561df8257..89e822948aa 100644 --- a/Content.Server/Rotatable/FlippableComponent.cs +++ b/Content.Server/Rotatable/FlippableComponent.cs @@ -8,8 +8,6 @@ namespace Content.Server.Rotatable [RegisterComponent] public class FlippableComponent : Component { - public override string Name => "Flippable"; - /// /// Entity to replace this entity with when the current one is 'flipped'. /// diff --git a/Content.Server/Security/Components/DeployableBarrierComponent.cs b/Content.Server/Security/Components/DeployableBarrierComponent.cs index f71d51a0938..c54458213ee 100644 --- a/Content.Server/Security/Components/DeployableBarrierComponent.cs +++ b/Content.Server/Security/Components/DeployableBarrierComponent.cs @@ -5,6 +5,5 @@ namespace Content.Server.Security [RegisterComponent] public class DeployableBarrierComponent : Component { - public override string Name => "DeployableBarrier"; } } diff --git a/Content.Server/Shuttles/Components/ThrusterComponent.cs b/Content.Server/Shuttles/Components/ThrusterComponent.cs index c052e7ed925..0020b7a18cb 100644 --- a/Content.Server/Shuttles/Components/ThrusterComponent.cs +++ b/Content.Server/Shuttles/Components/ThrusterComponent.cs @@ -14,8 +14,6 @@ namespace Content.Server.Shuttles.Components [Friend(typeof(ThrusterSystem))] public sealed class ThrusterComponent : Component { - public override string Name => "Thruster"; - /// /// Whether the thruster has been force to be enabled / disabled (e.g. VV, interaction, etc.) /// diff --git a/Content.Server/Singularity/Components/EmitterComponent.cs b/Content.Server/Singularity/Components/EmitterComponent.cs index d77a5231d94..09d68fa92f2 100644 --- a/Content.Server/Singularity/Components/EmitterComponent.cs +++ b/Content.Server/Singularity/Components/EmitterComponent.cs @@ -13,8 +13,6 @@ namespace Content.Server.Singularity.Components [RegisterComponent] public class EmitterComponent : Component { - public override string Name => "Emitter"; - public CancellationTokenSource? TimerCancel; // whether the power switch is in "on" diff --git a/Content.Server/Singularity/Components/RadiationCollectorComponent.cs b/Content.Server/Singularity/Components/RadiationCollectorComponent.cs index f0bc6c2c022..623ecf226ce 100644 --- a/Content.Server/Singularity/Components/RadiationCollectorComponent.cs +++ b/Content.Server/Singularity/Components/RadiationCollectorComponent.cs @@ -18,7 +18,6 @@ namespace Content.Server.Singularity.Components [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "RadiationCollector"; private bool _enabled; private TimeSpan _coolDownEnd; diff --git a/Content.Server/Singularity/Components/SingularityGenerator.cs b/Content.Server/Singularity/Components/SingularityGenerator.cs index fbf93e7ba7b..b7d7853ccc8 100644 --- a/Content.Server/Singularity/Components/SingularityGenerator.cs +++ b/Content.Server/Singularity/Components/SingularityGenerator.cs @@ -9,8 +9,6 @@ namespace Content.Server.Singularity.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "SingularityGenerator"; - [ViewVariables] private int _power; public int Power diff --git a/Content.Server/Singularity/Components/SinguloFoodComponent.cs b/Content.Server/Singularity/Components/SinguloFoodComponent.cs index 0f84a9c486c..0723b6bb896 100644 --- a/Content.Server/Singularity/Components/SinguloFoodComponent.cs +++ b/Content.Server/Singularity/Components/SinguloFoodComponent.cs @@ -10,7 +10,6 @@ namespace Content.Server.Singularity.Components [RegisterComponent] public class SinguloFoodComponent : Component { - public override string Name => "SinguloFood"; [ViewVariables(VVAccess.ReadWrite)] [DataField("energy")] public int Energy { get; set; } = 1; diff --git a/Content.Server/Solar/Components/SolarControlConsoleComponent.cs b/Content.Server/Solar/Components/SolarControlConsoleComponent.cs index b37f7565dbf..f2946421080 100644 --- a/Content.Server/Solar/Components/SolarControlConsoleComponent.cs +++ b/Content.Server/Solar/Components/SolarControlConsoleComponent.cs @@ -13,6 +13,5 @@ namespace Content.Server.Solar.Components [RegisterComponent] public class SolarControlConsoleComponent : Component { - public override string Name => "SolarControlConsole"; } } diff --git a/Content.Server/Solar/Components/SolarPanelComponent.cs b/Content.Server/Solar/Components/SolarPanelComponent.cs index b1576a46d92..75a77a34724 100644 --- a/Content.Server/Solar/Components/SolarPanelComponent.cs +++ b/Content.Server/Solar/Components/SolarPanelComponent.cs @@ -19,8 +19,6 @@ namespace Content.Server.Solar.Components [Friend(typeof(PowerSolarSystem))] public class SolarPanelComponent : Component { - public override string Name => "SolarPanel"; - /// /// Maximum supply output by this panel (coverage = 1) /// diff --git a/Content.Server/Sound/Components/EmitSoundOnActivateComponent.cs b/Content.Server/Sound/Components/EmitSoundOnActivateComponent.cs index 2cbc83516a4..439f65cc34b 100644 --- a/Content.Server/Sound/Components/EmitSoundOnActivateComponent.cs +++ b/Content.Server/Sound/Components/EmitSoundOnActivateComponent.cs @@ -8,7 +8,5 @@ namespace Content.Server.Sound.Components [RegisterComponent] public class EmitSoundOnActivateComponent : BaseEmitSoundComponent { - /// - public override string Name => "EmitSoundOnActivate"; } } diff --git a/Content.Server/Sound/Components/EmitSoundOnLandComponent.cs b/Content.Server/Sound/Components/EmitSoundOnLandComponent.cs index 96782fe9856..b97a837d164 100644 --- a/Content.Server/Sound/Components/EmitSoundOnLandComponent.cs +++ b/Content.Server/Sound/Components/EmitSoundOnLandComponent.cs @@ -8,7 +8,5 @@ namespace Content.Server.Sound.Components [RegisterComponent] public class EmitSoundOnLandComponent : BaseEmitSoundComponent { - /// - public override string Name => "EmitSoundOnLand"; } } diff --git a/Content.Server/Spawners/Components/TimedSpawnerComponent.cs b/Content.Server/Spawners/Components/TimedSpawnerComponent.cs index 64296fb7dce..3d78150b5ec 100644 --- a/Content.Server/Spawners/Components/TimedSpawnerComponent.cs +++ b/Content.Server/Spawners/Components/TimedSpawnerComponent.cs @@ -17,8 +17,6 @@ namespace Content.Server.Spawners.Components { [Dependency] private readonly IRobustRandom _robustRandom = default!; - public override string Name => "TimedSpawner"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("prototypes", customTypeSerializer:typeof(PrototypeIdListSerializer))] public List Prototypes { get; set; } = new(); diff --git a/Content.Server/Speech/Components/AddAccentClothingComponent.cs b/Content.Server/Speech/Components/AddAccentClothingComponent.cs index 280ee162733..b027179a5ef 100644 --- a/Content.Server/Speech/Components/AddAccentClothingComponent.cs +++ b/Content.Server/Speech/Components/AddAccentClothingComponent.cs @@ -10,8 +10,6 @@ namespace Content.Server.Speech.Components; [RegisterComponent] public class AddAccentClothingComponent : Component { - public override string Name => "AddAccentClothing"; - /// /// Component name for accent that will be applied. /// diff --git a/Content.Server/Speech/Components/BackwardsAccentComponent.cs b/Content.Server/Speech/Components/BackwardsAccentComponent.cs index 19d79be50c8..cf8ea0b1d1a 100644 --- a/Content.Server/Speech/Components/BackwardsAccentComponent.cs +++ b/Content.Server/Speech/Components/BackwardsAccentComponent.cs @@ -5,6 +5,5 @@ namespace Content.Server.Speech.Components [RegisterComponent] public class BackwardsAccentComponent : Component { - public override string Name => "BackwardsAccent"; } } diff --git a/Content.Server/Speech/Components/OwOAccentComponent.cs b/Content.Server/Speech/Components/OwOAccentComponent.cs index 39e9111b14b..bd50c5ba15f 100644 --- a/Content.Server/Speech/Components/OwOAccentComponent.cs +++ b/Content.Server/Speech/Components/OwOAccentComponent.cs @@ -5,6 +5,5 @@ namespace Content.Server.Speech.Components [RegisterComponent] public class OwOAccentComponent : Component { - public override string Name => "OwOAccent"; } } diff --git a/Content.Server/Speech/Components/SpanishAccentComponent.cs b/Content.Server/Speech/Components/SpanishAccentComponent.cs index 413ed120e02..e4a5e0b7a20 100644 --- a/Content.Server/Speech/Components/SpanishAccentComponent.cs +++ b/Content.Server/Speech/Components/SpanishAccentComponent.cs @@ -5,6 +5,5 @@ namespace Content.Server.Speech.Components [RegisterComponent] public class SpanishAccentComponent : Component { - public override string Name => "SpanishAccent"; } } diff --git a/Content.Server/Speech/Components/StutteringAccentComponent.cs b/Content.Server/Speech/Components/StutteringAccentComponent.cs index e54ce164da2..1e6cf6be180 100644 --- a/Content.Server/Speech/Components/StutteringAccentComponent.cs +++ b/Content.Server/Speech/Components/StutteringAccentComponent.cs @@ -5,6 +5,5 @@ namespace Content.Server.Speech.Components [RegisterComponent] public class StutteringAccentComponent : Component { - public override string Name => "StutteringAccent"; } } diff --git a/Content.Server/Station/Components/StationComponent.cs b/Content.Server/Station/Components/StationComponent.cs index 94e2c36338e..6078475cc9d 100644 --- a/Content.Server/Station/Components/StationComponent.cs +++ b/Content.Server/Station/Components/StationComponent.cs @@ -7,7 +7,5 @@ namespace Content.Server.Station; [RegisterComponent, Friend(typeof(StationSystem))] public class StationComponent : Component { - public override string Name => "Station"; - public StationId Station = StationId.Invalid; } diff --git a/Content.Server/Storage/Components/CursedEntityStorageComponent.cs b/Content.Server/Storage/Components/CursedEntityStorageComponent.cs index ca60b33fd66..d50b2888684 100644 --- a/Content.Server/Storage/Components/CursedEntityStorageComponent.cs +++ b/Content.Server/Storage/Components/CursedEntityStorageComponent.cs @@ -20,8 +20,6 @@ namespace Content.Server.Storage.Components [Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IRobustRandom _robustRandom = default!; - public override string Name => "CursedEntityStorage"; - [DataField("cursedSound")] private SoundSpecifier _cursedSound = new SoundPathSpecifier("/Audio/Effects/teleport_departure.ogg"); [DataField("cursedLockerSound")] private SoundSpecifier _cursedLockerSound = new SoundPathSpecifier("/Audio/Effects/teleport_arrival.ogg"); diff --git a/Content.Server/Storage/Components/EntityStorageComponent.cs b/Content.Server/Storage/Components/EntityStorageComponent.cs index cf94a6cb6dc..5defdc40640 100644 --- a/Content.Server/Storage/Components/EntityStorageComponent.cs +++ b/Content.Server/Storage/Components/EntityStorageComponent.cs @@ -38,8 +38,6 @@ namespace Content.Server.Storage.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "EntityStorage"; - private const float MaxSize = 1.0f; // maximum width or height of an entity allowed inside the storage. public static readonly TimeSpan InternalOpenAttemptDelay = TimeSpan.FromSeconds(0.5); diff --git a/Content.Server/Storage/Components/SecretStashComponent.cs b/Content.Server/Storage/Components/SecretStashComponent.cs index 3e4564a1c79..3211fb59a06 100644 --- a/Content.Server/Storage/Components/SecretStashComponent.cs +++ b/Content.Server/Storage/Components/SecretStashComponent.cs @@ -19,8 +19,6 @@ namespace Content.Server.Storage.Components [Friend(typeof(SecretStashSystem))] public class SecretStashComponent : Component { - public override string Name => "SecretStash"; - /// /// Max item size that can be fitted into secret stash. /// diff --git a/Content.Server/Storage/Components/SpawnItemsOnUseComponent.cs b/Content.Server/Storage/Components/SpawnItemsOnUseComponent.cs index fcf203137d8..49cd42a20ff 100644 --- a/Content.Server/Storage/Components/SpawnItemsOnUseComponent.cs +++ b/Content.Server/Storage/Components/SpawnItemsOnUseComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Storage.Components [RegisterComponent] public class SpawnItemsOnUseComponent : Component { - public override string Name => "SpawnItemsOnUse"; - /// /// The list of entities to spawn, with amounts and orGroups. /// diff --git a/Content.Server/Stunnable/Components/StunOnCollideComponent.cs b/Content.Server/Stunnable/Components/StunOnCollideComponent.cs index 3af94b0ff6b..a916c1b5e25 100644 --- a/Content.Server/Stunnable/Components/StunOnCollideComponent.cs +++ b/Content.Server/Stunnable/Components/StunOnCollideComponent.cs @@ -11,7 +11,6 @@ namespace Content.Server.Stunnable.Components public sealed class StunOnCollideComponent : Component { // TODO: Can probably predict this. - public override string Name => "StunOnCollide"; // See stunsystem for what these do [DataField("stunAmount")] diff --git a/Content.Server/Stunnable/Components/StunbatonComponent.cs b/Content.Server/Stunnable/Components/StunbatonComponent.cs index b0c874b7316..fee75a82384 100644 --- a/Content.Server/Stunnable/Components/StunbatonComponent.cs +++ b/Content.Server/Stunnable/Components/StunbatonComponent.cs @@ -8,8 +8,6 @@ namespace Content.Server.Stunnable.Components [RegisterComponent] public class StunbatonComponent : Component { - public override string Name => "Stunbaton"; - public bool Activated = false; [ViewVariables(VVAccess.ReadWrite)] diff --git a/Content.Server/Tabletop/Components/TabletopGameComponent.cs b/Content.Server/Tabletop/Components/TabletopGameComponent.cs index 4a3750b5f88..ddf70d7f648 100644 --- a/Content.Server/Tabletop/Components/TabletopGameComponent.cs +++ b/Content.Server/Tabletop/Components/TabletopGameComponent.cs @@ -12,8 +12,6 @@ namespace Content.Server.Tabletop.Components [RegisterComponent, Friend(typeof(TabletopSystem))] public class TabletopGameComponent : Component { - public override string Name => "TabletopGame"; - [DataField("boardName")] public string BoardName { get; } = "tabletop-default-board-name"; diff --git a/Content.Server/Tabletop/Components/TabletopGamerComponent.cs b/Content.Server/Tabletop/Components/TabletopGamerComponent.cs index 6eb95f3afc4..f0207cac965 100644 --- a/Content.Server/Tabletop/Components/TabletopGamerComponent.cs +++ b/Content.Server/Tabletop/Components/TabletopGamerComponent.cs @@ -10,8 +10,6 @@ namespace Content.Server.Tabletop.Components [RegisterComponent, Friend(typeof(TabletopSystem))] public class TabletopGamerComponent : Component { - public override string Name => "TabletopGamer"; - [DataField("tabletop")] public EntityUid Tabletop { get; set; } = EntityUid.Invalid; } diff --git a/Content.Server/Temperature/Components/HeatResistanceComponent.cs b/Content.Server/Temperature/Components/HeatResistanceComponent.cs index 071e35901f4..c01faaf6b8e 100644 --- a/Content.Server/Temperature/Components/HeatResistanceComponent.cs +++ b/Content.Server/Temperature/Components/HeatResistanceComponent.cs @@ -8,8 +8,6 @@ namespace Content.Server.Temperature.Components [RegisterComponent] public class HeatResistanceComponent : Component { - public override string Name => "HeatResistance"; - public int GetHeatResistance() { // TODO: When making into system: Any animal that touches bulb that has no diff --git a/Content.Server/Temperature/Components/TemperatureComponent.cs b/Content.Server/Temperature/Components/TemperatureComponent.cs index 5f6b19f2f48..231aec3d445 100644 --- a/Content.Server/Temperature/Components/TemperatureComponent.cs +++ b/Content.Server/Temperature/Components/TemperatureComponent.cs @@ -17,9 +17,6 @@ namespace Content.Server.Temperature.Components [RegisterComponent] public class TemperatureComponent : Component { - /// - public override string Name => "Temperature"; - [ViewVariables(VVAccess.ReadWrite)] public float CurrentTemperature { get; set; } = Atmospherics.T20C; diff --git a/Content.Server/Throwing/EmitSoundOnThrowComponent.cs b/Content.Server/Throwing/EmitSoundOnThrowComponent.cs index d0b75d8d2bf..1f29fb7376c 100644 --- a/Content.Server/Throwing/EmitSoundOnThrowComponent.cs +++ b/Content.Server/Throwing/EmitSoundOnThrowComponent.cs @@ -9,7 +9,5 @@ namespace Content.Server.Throwing [RegisterComponent] public class EmitSoundOnThrowComponent : BaseEmitSoundComponent { - /// - public override string Name => "EmitSoundOnThrow"; } } diff --git a/Content.Server/Tiles/FloorTileItemComponent.cs b/Content.Server/Tiles/FloorTileItemComponent.cs index 96e129963d8..b240c1be193 100644 --- a/Content.Server/Tiles/FloorTileItemComponent.cs +++ b/Content.Server/Tiles/FloorTileItemComponent.cs @@ -18,12 +18,12 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy namespace Content.Server.Tiles { [RegisterComponent] + [ComponentProtoName("FloorTile")] public class FloorTileItemComponent : Component, IAfterInteract { [Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; - public override string Name => "FloorTile"; [DataField("outputs", customTypeSerializer: typeof(PrototypeIdListSerializer))] private List? _outputTiles; diff --git a/Content.Server/Tools/Components/ToolComponent.cs b/Content.Server/Tools/Components/ToolComponent.cs index 924beeb7dc0..7d1717a3c2e 100644 --- a/Content.Server/Tools/Components/ToolComponent.cs +++ b/Content.Server/Tools/Components/ToolComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Tools.Components [RegisterComponent, Friend(typeof(ToolSystem))] public class ToolComponent : Component { - public override string Name => "Tool"; - [DataField("qualities")] public PrototypeFlags Qualities { get; set; } = new(); diff --git a/Content.Server/Traitor/Uplink/Telecrystal/TelecrystalComponent.cs b/Content.Server/Traitor/Uplink/Telecrystal/TelecrystalComponent.cs index ec0e3befe6b..de2c8324c6f 100644 --- a/Content.Server/Traitor/Uplink/Telecrystal/TelecrystalComponent.cs +++ b/Content.Server/Traitor/Uplink/Telecrystal/TelecrystalComponent.cs @@ -5,6 +5,5 @@ namespace Content.Server.Traitor.Uplink.Telecrystal [RegisterComponent] public class TelecrystalComponent : Component { - public override string Name => "Telecrystal"; } } diff --git a/Content.Server/Traitor/Uplink/UplinkComponent.cs b/Content.Server/Traitor/Uplink/UplinkComponent.cs index c189e415ea3..7abffbd6494 100644 --- a/Content.Server/Traitor/Uplink/UplinkComponent.cs +++ b/Content.Server/Traitor/Uplink/UplinkComponent.cs @@ -10,8 +10,6 @@ namespace Content.Server.Traitor.Uplink.Components [RegisterComponent] public class UplinkComponent : Component { - public override string Name => "Uplink"; - [ViewVariables] [DataField("buySuccessSound")] public SoundSpecifier BuySuccessSound = new SoundPathSpecifier("/Audio/Effects/kaching.ogg"); diff --git a/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs b/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs index 51541f51816..eb8ec05090d 100644 --- a/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs +++ b/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs @@ -17,9 +17,6 @@ namespace Content.Server.TraitorDeathMatch.Components { [Dependency] private readonly IEntityManager _entMan = default!; - /// - public override string Name => "TraitorDeathMatchRedemption"; - async Task IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs) { if (!_entMan.TryGetComponent(eventArgs.User, out var userMindComponent)) diff --git a/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchReliableOwnerTagComponent.cs b/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchReliableOwnerTagComponent.cs index 1ef663d0b9a..aa45b55c318 100644 --- a/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchReliableOwnerTagComponent.cs +++ b/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchReliableOwnerTagComponent.cs @@ -7,9 +7,6 @@ namespace Content.Server.TraitorDeathMatch.Components [RegisterComponent] public class TraitorDeathMatchReliableOwnerTagComponent : Component { - /// - public override string Name => "TraitorDeathMatchReliableOwnerTag"; - [ViewVariables] public NetUserId? UserId { get; set; } } diff --git a/Content.Server/UserInterface/ActivatableUIComponent.cs b/Content.Server/UserInterface/ActivatableUIComponent.cs index be030dfffea..cd650563a5c 100644 --- a/Content.Server/UserInterface/ActivatableUIComponent.cs +++ b/Content.Server/UserInterface/ActivatableUIComponent.cs @@ -20,8 +20,6 @@ namespace Content.Server.UserInterface public class ActivatableUIComponent : Component, ISerializationHooks { - public override string Name => "ActivatableUI"; - [ViewVariables] public Enum? Key { get; set; } diff --git a/Content.Server/Weapon/Melee/Components/MeleeWeaponComponent.cs b/Content.Server/Weapon/Melee/Components/MeleeWeaponComponent.cs index 8f134bf029a..bc28ad92cb1 100644 --- a/Content.Server/Weapon/Melee/Components/MeleeWeaponComponent.cs +++ b/Content.Server/Weapon/Melee/Components/MeleeWeaponComponent.cs @@ -10,8 +10,6 @@ namespace Content.Server.Weapon.Melee.Components [RegisterComponent] public class MeleeWeaponComponent : Component { - public override string Name => "MeleeWeapon"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("hitSound")] public SoundSpecifier HitSound { get; set; } = new SoundCollectionSpecifier("GenericHit"); diff --git a/Content.Server/Weapon/Melee/Components/UnarmedCombatComponent.cs b/Content.Server/Weapon/Melee/Components/UnarmedCombatComponent.cs index f4f17665152..8ccf820c8ab 100644 --- a/Content.Server/Weapon/Melee/Components/UnarmedCombatComponent.cs +++ b/Content.Server/Weapon/Melee/Components/UnarmedCombatComponent.cs @@ -7,6 +7,5 @@ namespace Content.Server.Weapon.Melee.Components [ComponentReference(typeof(MeleeWeaponComponent))] public class UnarmedCombatComponent : MeleeWeaponComponent { - public override string Name => "UnarmedCombat"; } } diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/ChemicalAmmoComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/ChemicalAmmoComponent.cs index bbb8eae1d00..86003dac2bc 100644 --- a/Content.Server/Weapon/Ranged/Ammunition/Components/ChemicalAmmoComponent.cs +++ b/Content.Server/Weapon/Ranged/Ammunition/Components/ChemicalAmmoComponent.cs @@ -6,7 +6,6 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components [RegisterComponent] public sealed class ChemicalAmmoComponent : Component { - public override string Name => "ChemicalAmmo"; public const string DefaultSolutionName = "ammo"; [DataField("solution")] diff --git a/Content.Server/Wieldable/Components/IncreaseDamageOnWieldComponent.cs b/Content.Server/Wieldable/Components/IncreaseDamageOnWieldComponent.cs index a88eb2d8f30..77442f6cc8c 100644 --- a/Content.Server/Wieldable/Components/IncreaseDamageOnWieldComponent.cs +++ b/Content.Server/Wieldable/Components/IncreaseDamageOnWieldComponent.cs @@ -9,8 +9,6 @@ namespace Content.Server.Wieldable.Components [RegisterComponent, Friend(typeof(WieldableSystem))] public class IncreaseDamageOnWieldComponent : Component { - public override string Name { get; } = "IncreaseDamageOnWield"; - [DataField("modifiers", required: true)] public DamageModifierSet Modifiers = default!; } diff --git a/Content.Server/Wieldable/Components/WieldableComponent.cs b/Content.Server/Wieldable/Components/WieldableComponent.cs index 177d0a2f33c..a3210e6999a 100644 --- a/Content.Server/Wieldable/Components/WieldableComponent.cs +++ b/Content.Server/Wieldable/Components/WieldableComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Wieldable.Components [RegisterComponent, Friend(typeof(WieldableSystem))] public class WieldableComponent : Component { - public override string Name => "Wieldable"; - [DataField("wieldSound")] public SoundSpecifier? WieldSound = new SoundPathSpecifier("/Audio/Effects/thudswoosh.ogg"); diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactComponent.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactComponent.cs index 8b5386a15c2..5cd134cc6a4 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactComponent.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactComponent.cs @@ -8,8 +8,6 @@ namespace Content.Server.Xenoarchaeology.XenoArtifacts; [RegisterComponent] public class ArtifactComponent : Component { - public override string Name => "Artifact"; - /// /// Should artifact pick a random trigger on startup? /// diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/SpawnArtifactComponent.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/SpawnArtifactComponent.cs index 154759887ad..35d9293e36c 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/SpawnArtifactComponent.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/SpawnArtifactComponent.cs @@ -15,8 +15,6 @@ namespace Content.Server.Xenoarchaeology.XenoArtifacts.Effects.Components; [RegisterComponent] public class SpawnArtifactComponent : Component { - public override string Name => "SpawnArtifact"; - [DataField("random")] public bool RandomPrototype = true; diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/TelepathicArtifactComponent.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/TelepathicArtifactComponent.cs index 00ecdd9790e..3ad2c30d04a 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/TelepathicArtifactComponent.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/TelepathicArtifactComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Xenoarchaeology.XenoArtifacts.Effects.Components; [RegisterComponent] public class TelepathicArtifactComponent : Component { - public override string Name => "TelepathicArtifact"; - /// /// Loc string ids of telepathic messages. /// Will be randomly picked and shown to player. diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/RandomArtifactSpriteComponent.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/RandomArtifactSpriteComponent.cs index abacdeb76a5..f328a1da535 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/RandomArtifactSpriteComponent.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/RandomArtifactSpriteComponent.cs @@ -7,8 +7,6 @@ namespace Content.Server.Xenoarchaeology.XenoArtifacts; [RegisterComponent] public class RandomArtifactSpriteComponent : Component { - public override string Name => "RandomArtifactSprite"; - [DataField("minSprite")] public int MinSprite = 1; diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactGasTriggerComponent.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactGasTriggerComponent.cs index 3f1357d8c2b..ec859e00665 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactGasTriggerComponent.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactGasTriggerComponent.cs @@ -11,8 +11,6 @@ namespace Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Components; [RegisterComponent] public class ArtifactGasTriggerComponent : Component { - public override string Name => "ArtifactGasTrigger"; - /// /// List of possible activation gases to pick on startup. /// diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactInteractionTriggerComponent.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactInteractionTriggerComponent.cs index b75e86def3e..fe682a37831 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactInteractionTriggerComponent.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactInteractionTriggerComponent.cs @@ -8,5 +8,4 @@ namespace Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Components; [RegisterComponent] public class ArtifactInteractionTriggerComponent : Component { - public override string Name => "ArtifactInteractionTrigger"; } diff --git a/Content.Shared/AME/SharedAMEControllerComponent.cs b/Content.Shared/AME/SharedAMEControllerComponent.cs index 84674dec1c1..379a97ad2e9 100644 --- a/Content.Shared/AME/SharedAMEControllerComponent.cs +++ b/Content.Shared/AME/SharedAMEControllerComponent.cs @@ -6,8 +6,6 @@ namespace Content.Shared.AME { public class SharedAMEControllerComponent : Component { - public override string Name => "AMEController"; - [Serializable, NetSerializable] public class AMEControllerBoundUserInterfaceState : BoundUserInterfaceState { diff --git a/Content.Shared/AME/SharedAMEShieldComponent.cs b/Content.Shared/AME/SharedAMEShieldComponent.cs index 1b45ccc5cc7..bb7b04a6263 100644 --- a/Content.Shared/AME/SharedAMEShieldComponent.cs +++ b/Content.Shared/AME/SharedAMEShieldComponent.cs @@ -6,8 +6,6 @@ namespace Content.Shared.AME { public class SharedAMEShieldComponent : Component { - public override string Name => "AMEShield"; - [Serializable, NetSerializable] public enum AMEShieldVisuals { diff --git a/Content.Shared/Access/Components/AccessComponent.cs b/Content.Shared/Access/Components/AccessComponent.cs index bb3da3408bd..e53ad7c54a0 100644 --- a/Content.Shared/Access/Components/AccessComponent.cs +++ b/Content.Shared/Access/Components/AccessComponent.cs @@ -15,8 +15,6 @@ namespace Content.Shared.Access.Components [Friend(typeof(AccessSystem))] public class AccessComponent : Component { - public override string Name => "Access"; - [DataField("tags", customTypeSerializer: typeof(PrototypeIdHashSetSerializer))] [ViewVariables] public HashSet Tags = new(); diff --git a/Content.Shared/Access/Components/AccessReaderComponent.cs b/Content.Shared/Access/Components/AccessReaderComponent.cs index 5d0a82772c6..0a45affdabb 100644 --- a/Content.Shared/Access/Components/AccessReaderComponent.cs +++ b/Content.Shared/Access/Components/AccessReaderComponent.cs @@ -12,8 +12,6 @@ namespace Content.Shared.Access.Components [RegisterComponent] public class AccessReaderComponent : Component { - public override string Name => "AccessReader"; - /// /// Whether this reader is enabled or not. If disabled, all access /// checks will pass. diff --git a/Content.Shared/Access/Components/IdCardComponent.cs b/Content.Shared/Access/Components/IdCardComponent.cs index be555c3eda2..8f04e90b3a8 100644 --- a/Content.Shared/Access/Components/IdCardComponent.cs +++ b/Content.Shared/Access/Components/IdCardComponent.cs @@ -12,8 +12,6 @@ namespace Content.Shared.Access.Components [Friend(typeof(SharedIdCardSystem), typeof(SharedPDASystem))] public class IdCardComponent : Component { - public override string Name => "IdCard"; - [DataField("originalOwnerName")] public string OriginalOwnerName = default!; diff --git a/Content.Shared/Access/Components/SharedIdCardConsoleComponent.cs b/Content.Shared/Access/Components/SharedIdCardConsoleComponent.cs index 0c7903ce28b..b106ac8763d 100644 --- a/Content.Shared/Access/Components/SharedIdCardConsoleComponent.cs +++ b/Content.Shared/Access/Components/SharedIdCardConsoleComponent.cs @@ -9,8 +9,6 @@ namespace Content.Shared.Access.Components { public class SharedIdCardConsoleComponent : Component { - public override string Name => "IdCardConsole"; - public const int MaxFullNameLength = 256; public const int MaxJobTitleLength = 256; diff --git a/Content.Shared/Actions/Components/ItemActionsComponent.cs b/Content.Shared/Actions/Components/ItemActionsComponent.cs index 45c54b207ad..4b80f298aad 100644 --- a/Content.Shared/Actions/Components/ItemActionsComponent.cs +++ b/Content.Shared/Actions/Components/ItemActionsComponent.cs @@ -26,8 +26,6 @@ namespace Content.Shared.Actions.Components [RegisterComponent] public class ItemActionsComponent : Component { - public override string Name => "ItemActions"; - /// /// Configuration for the item actions initially provided by this item. Actions defined here /// will be automatically granted unless their state is modified using the methods diff --git a/Content.Shared/Actions/Components/SharedActionsComponent.cs b/Content.Shared/Actions/Components/SharedActionsComponent.cs index 40d0a5df8e8..88239b0cf36 100644 --- a/Content.Shared/Actions/Components/SharedActionsComponent.cs +++ b/Content.Shared/Actions/Components/SharedActionsComponent.cs @@ -40,8 +40,6 @@ namespace Content.Shared.Actions.Components [Dependency] protected readonly IEntityManager EntityManager = default!; - public override string Name => "Actions"; - /// /// Actions granted to this entity as soon as they spawn, regardless /// of the status of the entity. diff --git a/Content.Shared/Arcade/SharedSpaceVillainArcadeComponent.cs b/Content.Shared/Arcade/SharedSpaceVillainArcadeComponent.cs index 2a262487173..96a1f751ecc 100644 --- a/Content.Shared/Arcade/SharedSpaceVillainArcadeComponent.cs +++ b/Content.Shared/Arcade/SharedSpaceVillainArcadeComponent.cs @@ -6,8 +6,6 @@ namespace Content.Shared.Arcade { public abstract class SharedSpaceVillainArcadeComponent : Component { - public override string Name => "SpaceVillainArcade"; - [Serializable, NetSerializable] public enum Indicators { diff --git a/Content.Shared/Atmos/Components/SharedGasAnalyzerComponent.cs b/Content.Shared/Atmos/Components/SharedGasAnalyzerComponent.cs index 73f0a9d1254..a5a730c35f2 100644 --- a/Content.Shared/Atmos/Components/SharedGasAnalyzerComponent.cs +++ b/Content.Shared/Atmos/Components/SharedGasAnalyzerComponent.cs @@ -9,8 +9,6 @@ namespace Content.Shared.Atmos.Components [NetworkedComponent()] public class SharedGasAnalyzerComponent : Component { - public override string Name => "GasAnalyzer"; - [Serializable, NetSerializable] public enum GasAnalyzerUiKey { diff --git a/Content.Shared/Audio/AmbientSoundComponent.cs b/Content.Shared/Audio/AmbientSoundComponent.cs index 6f795634d8a..b5b6b557191 100644 --- a/Content.Shared/Audio/AmbientSoundComponent.cs +++ b/Content.Shared/Audio/AmbientSoundComponent.cs @@ -12,8 +12,6 @@ namespace Content.Shared.Audio [NetworkedComponent] public sealed class AmbientSoundComponent : Component { - public override string Name => "AmbientSound"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("enabled")] public bool Enabled { get; set; } = true; diff --git a/Content.Shared/Body/Components/MechanismComponent.cs b/Content.Shared/Body/Components/MechanismComponent.cs index 4930b238eed..5c73c2c322a 100644 --- a/Content.Shared/Body/Components/MechanismComponent.cs +++ b/Content.Shared/Body/Components/MechanismComponent.cs @@ -11,9 +11,6 @@ namespace Content.Shared.Body.Components public class MechanismComponent : Component, ISerializationHooks { [Dependency] private readonly IEntityManager _entMan = default!; - - public override string Name => "Mechanism"; - private SharedBodyPartComponent? _part; public SharedBodyComponent? Body => Part?.Body; diff --git a/Content.Shared/Body/Components/SharedBodyComponent.cs b/Content.Shared/Body/Components/SharedBodyComponent.cs index f92486fdea4..90ba03b2b10 100644 --- a/Content.Shared/Body/Components/SharedBodyComponent.cs +++ b/Content.Shared/Body/Components/SharedBodyComponent.cs @@ -26,8 +26,6 @@ namespace Content.Shared.Body.Components { [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - public override string Name => "Body"; - [ViewVariables] [DataField("template", required: true)] private string? TemplateId { get; } diff --git a/Content.Shared/Body/Components/SharedBodyPartComponent.cs b/Content.Shared/Body/Components/SharedBodyPartComponent.cs index c00a50a9706..e69ae1bf8be 100644 --- a/Content.Shared/Body/Components/SharedBodyPartComponent.cs +++ b/Content.Shared/Body/Components/SharedBodyPartComponent.cs @@ -18,9 +18,6 @@ namespace Content.Shared.Body.Components public abstract class SharedBodyPartComponent : Component { [Dependency] private readonly IEntityManager _entMan = default!; - - public override string Name => "BodyPart"; - private SharedBodyComponent? _body; // TODO BODY Remove diff --git a/Content.Shared/Body/Components/SharedBodyScannerComponent.cs b/Content.Shared/Body/Components/SharedBodyScannerComponent.cs index b440f690333..4b69264f0ea 100644 --- a/Content.Shared/Body/Components/SharedBodyScannerComponent.cs +++ b/Content.Shared/Body/Components/SharedBodyScannerComponent.cs @@ -6,7 +6,6 @@ namespace Content.Shared.Body.Components { public abstract class SharedBodyScannerComponent : Component { - public override string Name => "BodyScanner"; } [Serializable, NetSerializable] diff --git a/Content.Shared/Buckle/Components/SharedBuckleComponent.cs b/Content.Shared/Buckle/Components/SharedBuckleComponent.cs index 724ae4581f7..68d30ab00ea 100644 --- a/Content.Shared/Buckle/Components/SharedBuckleComponent.cs +++ b/Content.Shared/Buckle/Components/SharedBuckleComponent.cs @@ -13,8 +13,6 @@ namespace Content.Shared.Buckle.Components [NetworkedComponent()] public abstract class SharedBuckleComponent : Component, IDraggable { - public sealed override string Name => "Buckle"; - /// /// The range from which this entity can buckle to a . /// diff --git a/Content.Shared/Buckle/Components/SharedStrapComponent.cs b/Content.Shared/Buckle/Components/SharedStrapComponent.cs index 38aeb1f3410..c776f0d9abb 100644 --- a/Content.Shared/Buckle/Components/SharedStrapComponent.cs +++ b/Content.Shared/Buckle/Components/SharedStrapComponent.cs @@ -29,8 +29,6 @@ namespace Content.Shared.Buckle.Components [NetworkedComponent()] public abstract class SharedStrapComponent : Component, IDragDropOn { - public sealed override string Name => "Strap"; - bool IDragDropOn.CanDragDropOn(DragDropEvent eventArgs) { if (!IoCManager.Resolve().TryGetComponent(eventArgs.Dragged, out SharedBuckleComponent? buckleComponent)) return false; diff --git a/Content.Shared/Cargo/Components/SharedCargoConsoleComponent.cs b/Content.Shared/Cargo/Components/SharedCargoConsoleComponent.cs index 2abee2f1c4f..b38edb42d32 100644 --- a/Content.Shared/Cargo/Components/SharedCargoConsoleComponent.cs +++ b/Content.Shared/Cargo/Components/SharedCargoConsoleComponent.cs @@ -10,8 +10,6 @@ namespace Content.Shared.Cargo.Components { [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; - public sealed override string Name => "CargoConsole"; - /// /// Sends away or requests shuttle /// diff --git a/Content.Shared/Cargo/Components/SharedCargoOrderDatabaseComponent.cs b/Content.Shared/Cargo/Components/SharedCargoOrderDatabaseComponent.cs index d7d8f1661d6..64930339902 100644 --- a/Content.Shared/Cargo/Components/SharedCargoOrderDatabaseComponent.cs +++ b/Content.Shared/Cargo/Components/SharedCargoOrderDatabaseComponent.cs @@ -9,7 +9,6 @@ namespace Content.Shared.Cargo.Components [NetworkedComponent()] public class SharedCargoOrderDatabaseComponent : Component { - public sealed override string Name => "CargoOrderDatabase"; } [NetSerializable, Serializable] diff --git a/Content.Shared/Cargo/Components/SharedGalacticMarketComponent.cs b/Content.Shared/Cargo/Components/SharedGalacticMarketComponent.cs index fba2fe46d95..8ec4be505e4 100644 --- a/Content.Shared/Cargo/Components/SharedGalacticMarketComponent.cs +++ b/Content.Shared/Cargo/Components/SharedGalacticMarketComponent.cs @@ -15,8 +15,6 @@ namespace Content.Shared.Cargo.Components [NetworkedComponent()] public class SharedGalacticMarketComponent : Component, IEnumerable, ISerializationHooks { - public sealed override string Name => "GalacticMarket"; - [DataField("products", customTypeSerializer: typeof(PrototypeIdListSerializer))] protected List _productIds = new(); diff --git a/Content.Shared/CharacterAppearance/Components/HumanoidAppearanceComponent.cs b/Content.Shared/CharacterAppearance/Components/HumanoidAppearanceComponent.cs index a37a697c0b8..d0b637d3157 100644 --- a/Content.Shared/CharacterAppearance/Components/HumanoidAppearanceComponent.cs +++ b/Content.Shared/CharacterAppearance/Components/HumanoidAppearanceComponent.cs @@ -16,8 +16,6 @@ namespace Content.Shared.CharacterAppearance.Components [NetworkedComponent] public class HumanoidAppearanceComponent : Component { - public override string Name => "HumanoidAppearance"; - [ViewVariables] public HumanoidCharacterAppearance Appearance { get; set; } = HumanoidCharacterAppearance.Default(); diff --git a/Content.Shared/CharacterAppearance/Components/SharedMagicMirrorComponent.cs b/Content.Shared/CharacterAppearance/Components/SharedMagicMirrorComponent.cs index babd9efbd78..26482371a48 100644 --- a/Content.Shared/CharacterAppearance/Components/SharedMagicMirrorComponent.cs +++ b/Content.Shared/CharacterAppearance/Components/SharedMagicMirrorComponent.cs @@ -7,8 +7,6 @@ namespace Content.Shared.CharacterAppearance.Components { public class SharedMagicMirrorComponent : Component { - public override string Name => "MagicMirror"; - [Serializable, NetSerializable] public enum MagicMirrorUiKey { diff --git a/Content.Shared/Chemistry/Components/FitsInDispenserComponent.cs b/Content.Shared/Chemistry/Components/FitsInDispenserComponent.cs index 8d7db5ca932..8bbb17fa2ce 100644 --- a/Content.Shared/Chemistry/Components/FitsInDispenserComponent.cs +++ b/Content.Shared/Chemistry/Components/FitsInDispenserComponent.cs @@ -14,8 +14,6 @@ namespace Content.Shared.Chemistry.Components [NetworkedComponent] // only needed for white-lists. Client doesn't actually need Solution data; public class FitsInDispenserComponent : Component { - public override string Name => "FitsInDispenser"; - /// /// Solution name that will interact with ReagentDispenserComponent. /// diff --git a/Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs b/Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs index bce2e2028d0..5b3b91c967b 100644 --- a/Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs +++ b/Content.Shared/Chemistry/Components/MovespeedModifierMetabolismComponent.cs @@ -16,9 +16,6 @@ namespace Content.Shared.Chemistry.Components [NetworkedComponent] public sealed class MovespeedModifierMetabolismComponent : Component { - [ViewVariables] - public override string Name => "MovespeedModifierMetabolism"; - [ViewVariables] public float WalkSpeedModifier { get; set; } diff --git a/Content.Shared/Chemistry/Components/SharedChemMasterComponent.cs b/Content.Shared/Chemistry/Components/SharedChemMasterComponent.cs index e005d5a6de2..641e8930003 100644 --- a/Content.Shared/Chemistry/Components/SharedChemMasterComponent.cs +++ b/Content.Shared/Chemistry/Components/SharedChemMasterComponent.cs @@ -17,8 +17,6 @@ namespace Content.Shared.Chemistry.Components { [DataField("beakerSlot")] public ItemSlot BeakerSlot = new(); - - public override string Name => "ChemMaster"; public const string SolutionName = "buffer"; [Serializable, NetSerializable] diff --git a/Content.Shared/Chemistry/Components/SharedHyposprayComponent.cs b/Content.Shared/Chemistry/Components/SharedHyposprayComponent.cs index 223295c784f..88637bb9adf 100644 --- a/Content.Shared/Chemistry/Components/SharedHyposprayComponent.cs +++ b/Content.Shared/Chemistry/Components/SharedHyposprayComponent.cs @@ -11,8 +11,6 @@ namespace Content.Shared.Chemistry.Components [NetworkedComponent()] public abstract class SharedHyposprayComponent : Component { - public sealed override string Name => "Hypospray"; - [DataField("solutionName")] public string SolutionName = "hypospray"; diff --git a/Content.Shared/Chemistry/Components/SharedInjectorComponent.cs b/Content.Shared/Chemistry/Components/SharedInjectorComponent.cs index 05d955949a9..60d009aebee 100644 --- a/Content.Shared/Chemistry/Components/SharedInjectorComponent.cs +++ b/Content.Shared/Chemistry/Components/SharedInjectorComponent.cs @@ -13,8 +13,6 @@ namespace Content.Shared.Chemistry.Components [NetworkedComponent()] public class SharedInjectorComponent : Component { - public override string Name => "Injector"; - /// /// Component data used for net updates. Used by client for item status ui /// diff --git a/Content.Shared/Chemistry/Dispenser/SharedReagentDispenserComponent.cs b/Content.Shared/Chemistry/Dispenser/SharedReagentDispenserComponent.cs index 7f967ea95f9..59fa6eee33e 100644 --- a/Content.Shared/Chemistry/Dispenser/SharedReagentDispenserComponent.cs +++ b/Content.Shared/Chemistry/Dispenser/SharedReagentDispenserComponent.cs @@ -17,8 +17,6 @@ namespace Content.Shared.Chemistry.Dispenser /// public class SharedReagentDispenserComponent : Component { - public override string Name => "ReagentDispenser"; - [DataField("beakerSlot")] public ItemSlot BeakerSlot = new(); diff --git a/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs b/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs index 0aa95ca216d..11db2a0c3a6 100644 --- a/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs +++ b/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs @@ -10,8 +10,6 @@ namespace Content.Shared.Chemistry.Reaction; [RegisterComponent] public class ReactiveComponent : Component { - public override string Name => "Reactive"; - /// /// A dictionary of reactive groups -> methods that work on them. /// diff --git a/Content.Shared/Climbing/SharedClimbableComponent.cs b/Content.Shared/Climbing/SharedClimbableComponent.cs index b32dbce0ce4..da6266a1130 100644 --- a/Content.Shared/Climbing/SharedClimbableComponent.cs +++ b/Content.Shared/Climbing/SharedClimbableComponent.cs @@ -11,8 +11,6 @@ namespace Content.Shared.Climbing public abstract class SharedClimbableComponent : Component, IClimbable, IDragDropOn { - public sealed override string Name => "Climbable"; - /// /// The range from which this entity can be climbed. /// diff --git a/Content.Shared/Climbing/SharedClimbingComponent.cs b/Content.Shared/Climbing/SharedClimbingComponent.cs index f0931c59520..cbf09437f70 100644 --- a/Content.Shared/Climbing/SharedClimbingComponent.cs +++ b/Content.Shared/Climbing/SharedClimbingComponent.cs @@ -15,8 +15,6 @@ namespace Content.Shared.Climbing { [Dependency] private readonly IEntityManager _entMan = default!; - public sealed override string Name => "Climbing"; - protected bool IsOnClimbableThisFrame { get diff --git a/Content.Shared/Cloning/SharedCloningPodComponent.cs b/Content.Shared/Cloning/SharedCloningPodComponent.cs index b5923224246..d9804b2c02d 100644 --- a/Content.Shared/Cloning/SharedCloningPodComponent.cs +++ b/Content.Shared/Cloning/SharedCloningPodComponent.cs @@ -7,8 +7,6 @@ namespace Content.Shared.Cloning { public class SharedCloningPodComponent : Component { - public override string Name => "CloningPod"; - [Serializable, NetSerializable] public class CloningPodBoundUserInterfaceState : BoundUserInterfaceState { diff --git a/Content.Shared/Clothing/SharedMagbootsComponent.cs b/Content.Shared/Clothing/SharedMagbootsComponent.cs index 3c0eee18859..aeee4ec0e62 100644 --- a/Content.Shared/Clothing/SharedMagbootsComponent.cs +++ b/Content.Shared/Clothing/SharedMagbootsComponent.cs @@ -13,8 +13,6 @@ namespace Content.Shared.Clothing [NetworkedComponent()] public abstract class SharedMagbootsComponent : Component { - public sealed override string Name => "Magboots"; - public abstract bool On { get; set; } protected void OnChanged() diff --git a/Content.Shared/CombatMode/SharedCombatModeComponent.cs b/Content.Shared/CombatMode/SharedCombatModeComponent.cs index cbff6568b18..3a5e961ae1b 100644 --- a/Content.Shared/CombatMode/SharedCombatModeComponent.cs +++ b/Content.Shared/CombatMode/SharedCombatModeComponent.cs @@ -11,8 +11,6 @@ namespace Content.Shared.CombatMode [NetworkedComponent()] public abstract class SharedCombatModeComponent : Component { - public override string Name => "CombatMode"; - private bool _isInCombatMode; private TargetingZone _activeZone; diff --git a/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs b/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs index 1cf3ced253f..6e1f572c89b 100644 --- a/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs +++ b/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs @@ -6,7 +6,6 @@ namespace Content.Shared.Communications { public class SharedCommunicationsConsoleComponent : Component { - public override string Name => "CommunicationsConsole"; } [Serializable, NetSerializable] diff --git a/Content.Shared/Computer/SharedComputerComponent.cs b/Content.Shared/Computer/SharedComputerComponent.cs index 7a9ebf1229d..4de6e5f5fee 100644 --- a/Content.Shared/Computer/SharedComputerComponent.cs +++ b/Content.Shared/Computer/SharedComputerComponent.cs @@ -6,7 +6,6 @@ namespace Content.Shared.Computer { public class SharedComputerComponent : Component { - public override string Name => "Computer"; } [Serializable, NetSerializable] diff --git a/Content.Shared/Configurable/SharedConfigurationComponent.cs b/Content.Shared/Configurable/SharedConfigurationComponent.cs index 025f29336f8..3562d4dddb4 100644 --- a/Content.Shared/Configurable/SharedConfigurationComponent.cs +++ b/Content.Shared/Configurable/SharedConfigurationComponent.cs @@ -7,8 +7,6 @@ namespace Content.Shared.Configurable { public class SharedConfigurationComponent : Component { - public override string Name => "Configuration"; - [Serializable, NetSerializable] public class ConfigurationBoundUserInterfaceState : BoundUserInterfaceState { diff --git a/Content.Shared/Construction/SharedCanBuildWindowOnTopComponent.cs b/Content.Shared/Construction/SharedCanBuildWindowOnTopComponent.cs index 9aed112d1d3..d221c5fdfb5 100644 --- a/Content.Shared/Construction/SharedCanBuildWindowOnTopComponent.cs +++ b/Content.Shared/Construction/SharedCanBuildWindowOnTopComponent.cs @@ -5,6 +5,5 @@ namespace Content.Shared.Construction [RegisterComponent] public class SharedCanBuildWindowOnTopComponent : Component { - public override string Name => "CanBuildWindowOnTop"; } } diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs index c385f4698e8..b15c00feba8 100644 --- a/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs +++ b/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs @@ -22,8 +22,6 @@ namespace Content.Shared.Containers.ItemSlots [Friend(typeof(ItemSlotsSystem))] public class ItemSlotsComponent : Component { - public override string Name => "ItemSlots"; - /// /// The dictionary that stores all of the item slots whose interactions will be managed by the . @@ -84,7 +82,7 @@ namespace Content.Shared.Containers.ItemSlots /// Options used for playing the insert/eject sounds. /// [DataField("soundOptions")] - public AudioParams SoundOptions = AudioParams.Default; + public AudioParams SoundOptions = AudioParams.Default; /// /// The name of this item slot. This will be shown to the user in the verb menu. diff --git a/Content.Shared/Cooldown/ItemCooldownComponent.cs b/Content.Shared/Cooldown/ItemCooldownComponent.cs index e36ddcde5f4..49ece5431a5 100644 --- a/Content.Shared/Cooldown/ItemCooldownComponent.cs +++ b/Content.Shared/Cooldown/ItemCooldownComponent.cs @@ -14,8 +14,6 @@ namespace Content.Shared.Cooldown [NetworkedComponent()] public sealed class ItemCooldownComponent : Component { - public override string Name => "ItemCooldown"; - private TimeSpan? _cooldownEnd; private TimeSpan? _cooldownStart; diff --git a/Content.Shared/Crayon/SharedCrayonComponent.cs b/Content.Shared/Crayon/SharedCrayonComponent.cs index 4fd6cf44d14..7869a775e0d 100644 --- a/Content.Shared/Crayon/SharedCrayonComponent.cs +++ b/Content.Shared/Crayon/SharedCrayonComponent.cs @@ -13,8 +13,6 @@ namespace Content.Shared.Crayon [NetworkedComponent()] public class SharedCrayonComponent : Component { - public override string Name => "Crayon"; - public string SelectedState { get; set; } = string.Empty; [DataField("color")] diff --git a/Content.Shared/Cuffs/Components/SharedCuffableComponent.cs b/Content.Shared/Cuffs/Components/SharedCuffableComponent.cs index 8ffe4d7b8e9..20ce0e4fff0 100644 --- a/Content.Shared/Cuffs/Components/SharedCuffableComponent.cs +++ b/Content.Shared/Cuffs/Components/SharedCuffableComponent.cs @@ -10,8 +10,6 @@ namespace Content.Shared.Cuffs.Components [NetworkedComponent()] public class SharedCuffableComponent : Component { - public override string Name => "Cuffable"; - [ViewVariables] public bool CanStillInteract { get; set; } = true; diff --git a/Content.Shared/Cuffs/Components/SharedHandcuffComponent.cs b/Content.Shared/Cuffs/Components/SharedHandcuffComponent.cs index 59a8a00d16c..6cab11dfcdd 100644 --- a/Content.Shared/Cuffs/Components/SharedHandcuffComponent.cs +++ b/Content.Shared/Cuffs/Components/SharedHandcuffComponent.cs @@ -8,8 +8,6 @@ namespace Content.Shared.Cuffs.Components [NetworkedComponent()] public abstract class SharedHandcuffComponent : Component { - public override string Name => "Handcuff"; - [Serializable, NetSerializable] protected sealed class HandcuffedComponentState : ComponentState { diff --git a/Content.Shared/Damage/Components/DamageableComponent.cs b/Content.Shared/Damage/Components/DamageableComponent.cs index f446192924b..8fd5a6896c5 100644 --- a/Content.Shared/Damage/Components/DamageableComponent.cs +++ b/Content.Shared/Damage/Components/DamageableComponent.cs @@ -27,8 +27,6 @@ namespace Content.Shared.Damage [Friend(typeof(DamageableSystem))] public class DamageableComponent : Component, IRadiationAct, IExAct { - public override string Name => "Damageable"; - /// /// This specifies what damage types are supported by this component. /// If null, all damage types will be supported. diff --git a/Content.Shared/Damage/Components/SlowOnDamageComponent.cs b/Content.Shared/Damage/Components/SlowOnDamageComponent.cs index 5381549ef43..1ebe6e56d70 100644 --- a/Content.Shared/Damage/Components/SlowOnDamageComponent.cs +++ b/Content.Shared/Damage/Components/SlowOnDamageComponent.cs @@ -11,8 +11,6 @@ namespace Content.Shared.Damage.Components [RegisterComponent, NetworkedComponent] public class SlowOnDamageComponent : Component { - public override string Name => "SlowOnDamage"; - /// /// Damage -> movespeed dictionary. This is -damage-, not -health-. /// diff --git a/Content.Shared/Decals/DecalGridComponent.cs b/Content.Shared/Decals/DecalGridComponent.cs index 205a5baed81..8e53c41e7c0 100644 --- a/Content.Shared/Decals/DecalGridComponent.cs +++ b/Content.Shared/Decals/DecalGridComponent.cs @@ -10,8 +10,6 @@ namespace Content.Shared.Decals [Friend(typeof(SharedDecalSystem))] public class DecalGridComponent : Component { - public override string Name => "DecalGrid"; - [DataField("chunkCollection", serverOnly: true)] public DecalGridChunkCollection ChunkCollection = new(new ()); diff --git a/Content.Shared/Disposal/Components/SharedDisposalRouterComponent.cs b/Content.Shared/Disposal/Components/SharedDisposalRouterComponent.cs index da89fb90402..9c180cac010 100644 --- a/Content.Shared/Disposal/Components/SharedDisposalRouterComponent.cs +++ b/Content.Shared/Disposal/Components/SharedDisposalRouterComponent.cs @@ -7,8 +7,6 @@ namespace Content.Shared.Disposal.Components { public class SharedDisposalRouterComponent : Component { - public override string Name => "DisposalRouter"; - public static readonly Regex TagRegex = new("^[a-zA-Z0-9, ]*$", RegexOptions.Compiled); [Serializable, NetSerializable] diff --git a/Content.Shared/Disposal/Components/SharedDisposalTaggerComponent.cs b/Content.Shared/Disposal/Components/SharedDisposalTaggerComponent.cs index ba5c3db6082..e2b89cebf4d 100644 --- a/Content.Shared/Disposal/Components/SharedDisposalTaggerComponent.cs +++ b/Content.Shared/Disposal/Components/SharedDisposalTaggerComponent.cs @@ -7,8 +7,6 @@ namespace Content.Shared.Disposal.Components { public class SharedDisposalTaggerComponent : Component { - public override string Name => "DisposalTagger"; - public static readonly Regex TagRegex = new("^[a-zA-Z0-9 ]*$", RegexOptions.Compiled); [Serializable, NetSerializable] diff --git a/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs b/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs index 3a172280394..9c7207f50c3 100644 --- a/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs +++ b/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs @@ -11,8 +11,6 @@ namespace Content.Shared.Disposal.Components [NetworkedComponent] public abstract class SharedDisposalUnitComponent : Component { - public override string Name => "DisposalUnit"; - // TODO: Could maybe turn the contact off instead far more cheaply as farseer (though not box2d) had support for it? // Need to suss it out. /// diff --git a/Content.Shared/DoAfter/SharedDoAfterComponent.cs b/Content.Shared/DoAfter/SharedDoAfterComponent.cs index be1acc28582..24ef46e82cf 100644 --- a/Content.Shared/DoAfter/SharedDoAfterComponent.cs +++ b/Content.Shared/DoAfter/SharedDoAfterComponent.cs @@ -10,7 +10,6 @@ namespace Content.Shared.DoAfter [NetworkedComponent()] public abstract class SharedDoAfterComponent : Component { - public override string Name => "DoAfter"; } [Serializable, NetSerializable] diff --git a/Content.Shared/Doors/Components/DoorComponent.cs b/Content.Shared/Doors/Components/DoorComponent.cs index 50915024444..65e470f0176 100644 --- a/Content.Shared/Doors/Components/DoorComponent.cs +++ b/Content.Shared/Doors/Components/DoorComponent.cs @@ -19,8 +19,6 @@ namespace Content.Shared.Doors.Components; [RegisterComponent] public sealed class DoorComponent : Component { - public override string Name => "Door"; - /// /// The current state of the door -- whether it is open, closed, opening, or closing. /// diff --git a/Content.Shared/Doors/Components/SharedAirlockComponent.cs b/Content.Shared/Doors/Components/SharedAirlockComponent.cs index 051e39b442f..22e456f6438 100644 --- a/Content.Shared/Doors/Components/SharedAirlockComponent.cs +++ b/Content.Shared/Doors/Components/SharedAirlockComponent.cs @@ -10,8 +10,6 @@ namespace Content.Shared.Doors.Components; [NetworkedComponent] public abstract class SharedAirlockComponent : Component { - public override string Name => "Airlock"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("safety")] public bool Safety = true; diff --git a/Content.Shared/Electrocution/ElectrocutedComponent.cs b/Content.Shared/Electrocution/ElectrocutedComponent.cs index 0a3afaaf04a..8b1ab07de24 100644 --- a/Content.Shared/Electrocution/ElectrocutedComponent.cs +++ b/Content.Shared/Electrocution/ElectrocutedComponent.cs @@ -5,6 +5,5 @@ namespace Content.Shared.Electrocution [RegisterComponent] public sealed class ElectrocutedComponent : Component { - public override string Name => "Electrocuted"; } } diff --git a/Content.Shared/Electrocution/InsulatedComponent.cs b/Content.Shared/Electrocution/InsulatedComponent.cs index ed235ac28f8..24ba005bb2f 100644 --- a/Content.Shared/Electrocution/InsulatedComponent.cs +++ b/Content.Shared/Electrocution/InsulatedComponent.cs @@ -11,8 +11,6 @@ namespace Content.Shared.Electrocution [RegisterComponent, NetworkedComponent] public class InsulatedComponent : Component { - public override string Name => "Insulated"; - /// /// Siemens coefficient. Zero means completely insulated. /// diff --git a/Content.Shared/Emoting/SharedEmotingComponent.cs b/Content.Shared/Emoting/SharedEmotingComponent.cs index 579550ebee3..b49f16ff45d 100644 --- a/Content.Shared/Emoting/SharedEmotingComponent.cs +++ b/Content.Shared/Emoting/SharedEmotingComponent.cs @@ -12,7 +12,6 @@ namespace Content.Shared.Emoting public class SharedEmotingComponent : Component { [DataField("enabled")] private bool _enabled = true; - public override string Name => "Emoting"; [ViewVariables(VVAccess.ReadWrite)] public bool Enabled diff --git a/Content.Shared/Examine/ExaminerComponent.cs b/Content.Shared/Examine/ExaminerComponent.cs index 386d31f28c7..55f0f4a3e28 100644 --- a/Content.Shared/Examine/ExaminerComponent.cs +++ b/Content.Shared/Examine/ExaminerComponent.cs @@ -10,8 +10,6 @@ namespace Content.Shared.Examine [RegisterComponent] public sealed class ExaminerComponent : Component { - public override string Name => "Examiner"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("DoRangeCheck")] private bool _doRangeCheck = true; diff --git a/Content.Shared/Flash/SharedFlashableComponent.cs b/Content.Shared/Flash/SharedFlashableComponent.cs index dc873d614e1..f9333300315 100644 --- a/Content.Shared/Flash/SharedFlashableComponent.cs +++ b/Content.Shared/Flash/SharedFlashableComponent.cs @@ -9,8 +9,6 @@ namespace Content.Shared.Flash [NetworkedComponent, Friend(typeof(SharedFlashSystem))] public abstract class SharedFlashableComponent : Component { - public override string Name => "Flashable"; - public float Duration { get; set; } public TimeSpan LastFlash { get; set; } } diff --git a/Content.Shared/Foldable/FoldableComponent.cs b/Content.Shared/Foldable/FoldableComponent.cs index 70ff4009136..bb6bffdd213 100644 --- a/Content.Shared/Foldable/FoldableComponent.cs +++ b/Content.Shared/Foldable/FoldableComponent.cs @@ -19,8 +19,6 @@ namespace Content.Shared.Foldable; [Friend(typeof(SharedFoldableSystem))] public class FoldableComponent : Component { - public override string Name => "Foldable"; - [DataField("folded")] public bool IsFolded = false; } diff --git a/Content.Shared/Friction/TileFrictionModifier.cs b/Content.Shared/Friction/TileFrictionModifier.cs index fa17802645d..f74c0748728 100644 --- a/Content.Shared/Friction/TileFrictionModifier.cs +++ b/Content.Shared/Friction/TileFrictionModifier.cs @@ -9,10 +9,9 @@ using Robust.Shared.ViewVariables; namespace Content.Shared.Friction { [RegisterComponent] + [ComponentProtoName("TileFrictionModifier")] public class SharedTileFrictionModifier : Component { - public override string Name => "TileFrictionModifier"; - /// /// Multiply the tilefriction cvar by this to get the body's actual tilefriction. /// diff --git a/Content.Shared/Ghost/SharedGhostComponent.cs b/Content.Shared/Ghost/SharedGhostComponent.cs index 8e2e6c77cd1..e081f5dbc5f 100644 --- a/Content.Shared/Ghost/SharedGhostComponent.cs +++ b/Content.Shared/Ghost/SharedGhostComponent.cs @@ -11,8 +11,6 @@ namespace Content.Shared.Ghost [NetworkedComponent()] public class SharedGhostComponent : Component { - public override string Name => "Ghost"; - [ViewVariables(VVAccess.ReadWrite)] public bool CanGhostInteract { diff --git a/Content.Shared/Gravity/GravityComponent.cs b/Content.Shared/Gravity/GravityComponent.cs index 3b75c14be0c..61d24223ee3 100644 --- a/Content.Shared/Gravity/GravityComponent.cs +++ b/Content.Shared/Gravity/GravityComponent.cs @@ -14,8 +14,6 @@ namespace Content.Shared.Gravity [NetworkedComponent] public sealed class GravityComponent : Component { - public override string Name => "Gravity"; - [DataField("gravityShakeSound")] public SoundSpecifier GravityShakeSound { get; set; } = new SoundPathSpecifier("/Audio/Effects/alert.ogg"); diff --git a/Content.Shared/Gravity/SharedGravityGeneratorComponent.cs b/Content.Shared/Gravity/SharedGravityGeneratorComponent.cs index 3a2d0e1fe57..b65269ea13c 100644 --- a/Content.Shared/Gravity/SharedGravityGeneratorComponent.cs +++ b/Content.Shared/Gravity/SharedGravityGeneratorComponent.cs @@ -8,8 +8,6 @@ namespace Content.Shared.Gravity [NetworkedComponent()] public class SharedGravityGeneratorComponent : Component { - public override string Name => "GravityGenerator"; - /// /// Sent to the server to set whether the generator should be on or off /// diff --git a/Content.Shared/Hands/Components/HandVirtualItemComponent.cs b/Content.Shared/Hands/Components/HandVirtualItemComponent.cs index 8c7ea64ce4b..25741377391 100644 --- a/Content.Shared/Hands/Components/HandVirtualItemComponent.cs +++ b/Content.Shared/Hands/Components/HandVirtualItemComponent.cs @@ -12,7 +12,6 @@ namespace Content.Shared.Hands.Components public sealed class HandVirtualItemComponent : Component { private EntityUid _blockingEntity; - public override string Name => "HandVirtualItem"; /// /// The entity blocking this hand. diff --git a/Content.Shared/Hands/Components/SharedHandsComponent.cs b/Content.Shared/Hands/Components/SharedHandsComponent.cs index 202ba44d89a..448ad6d4bb1 100644 --- a/Content.Shared/Hands/Components/SharedHandsComponent.cs +++ b/Content.Shared/Hands/Components/SharedHandsComponent.cs @@ -26,8 +26,6 @@ namespace Content.Shared.Hands.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public sealed override string Name => "Hands"; - /// /// The name of the currently active hand. /// @@ -533,7 +531,7 @@ namespace Content.Shared.Hands.Components handSys.PickupAnimation(entity, initialPosition, finalPosition, animateUser ? null : Owner); handSys.PutEntityIntoHand(Owner, hand, entity, this); - + return true; } diff --git a/Content.Shared/Instruments/SharedInstrumentComponent.cs b/Content.Shared/Instruments/SharedInstrumentComponent.cs index dc99aa8eed0..1400e72ed78 100644 --- a/Content.Shared/Instruments/SharedInstrumentComponent.cs +++ b/Content.Shared/Instruments/SharedInstrumentComponent.cs @@ -12,8 +12,6 @@ namespace Content.Shared.Instruments; [NetworkedComponent, Friend(typeof(SharedInstrumentSystem))] public class SharedInstrumentComponent : Component { - public override string Name => "Instrument"; - [ViewVariables] public bool Playing { get; set; } diff --git a/Content.Shared/Inventory/InventoryComponent.cs b/Content.Shared/Inventory/InventoryComponent.cs index 1619e05bd61..f3627ab2606 100644 --- a/Content.Shared/Inventory/InventoryComponent.cs +++ b/Content.Shared/Inventory/InventoryComponent.cs @@ -11,8 +11,6 @@ public class InventoryComponent : Component, IExAct { [Dependency] private readonly IEntityManager _entityManager = default!; - public sealed override string Name => "Inventory"; - [DataField("templateId", required: true, customTypeSerializer: typeof(PrototypeIdSerializer))] public string TemplateId { get; } = "human"; diff --git a/Content.Shared/Item/SharedItemComponent.cs b/Content.Shared/Item/SharedItemComponent.cs index d10437300ad..b3196a86c9c 100644 --- a/Content.Shared/Item/SharedItemComponent.cs +++ b/Content.Shared/Item/SharedItemComponent.cs @@ -24,8 +24,6 @@ namespace Content.Shared.Item { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "Item"; - /// /// How much big this item is. /// diff --git a/Content.Shared/Jittering/JitteringComponent.cs b/Content.Shared/Jittering/JitteringComponent.cs index 8c5e0aa2501..81d885065fe 100644 --- a/Content.Shared/Jittering/JitteringComponent.cs +++ b/Content.Shared/Jittering/JitteringComponent.cs @@ -12,8 +12,6 @@ namespace Content.Shared.Jittering [RegisterComponent, NetworkedComponent] public class JitteringComponent : Component { - public override string Name => "Jittering"; - [ViewVariables(VVAccess.ReadWrite)] public float Amplitude { get; set; } diff --git a/Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs b/Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs index e8efaff81f2..949b5d66831 100644 --- a/Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs +++ b/Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs @@ -12,8 +12,6 @@ namespace Content.Shared.Kitchen.Components { public abstract class SharedKitchenSpikeComponent : Component, IDragDropOn { - public override string Name => "KitchenSpike"; - [ViewVariables] [DataField("delay")] public float SpikeDelay = 12.0f; diff --git a/Content.Shared/Kitchen/Components/SharedMicrowaveComponent.cs b/Content.Shared/Kitchen/Components/SharedMicrowaveComponent.cs index 2fb875f0bf4..483be06f104 100644 --- a/Content.Shared/Kitchen/Components/SharedMicrowaveComponent.cs +++ b/Content.Shared/Kitchen/Components/SharedMicrowaveComponent.cs @@ -10,9 +10,6 @@ namespace Content.Shared.Kitchen.Components [NetworkedComponent()] public class SharedMicrowaveComponent : Component { - - public override string Name => "Microwave"; - [Serializable, NetSerializable] public class MicrowaveStartCookMessage : BoundUserInterfaceMessage { diff --git a/Content.Shared/Kitchen/Components/SharedReagentGrinderComponent.cs b/Content.Shared/Kitchen/Components/SharedReagentGrinderComponent.cs index 85bc5c474ba..7ab076bfc23 100644 --- a/Content.Shared/Kitchen/Components/SharedReagentGrinderComponent.cs +++ b/Content.Shared/Kitchen/Components/SharedReagentGrinderComponent.cs @@ -7,8 +7,6 @@ namespace Content.Shared.Kitchen.Components { public abstract class SharedReagentGrinderComponent : Component { - public override string Name => "ReagentGrinder"; - [Serializable, NetSerializable] public class ReagentGrinderGrindStartMessage : BoundUserInterfaceMessage { diff --git a/Content.Shared/Lathe/SharedLatheComponent.cs b/Content.Shared/Lathe/SharedLatheComponent.cs index 4c743990228..fbd05fe70fd 100644 --- a/Content.Shared/Lathe/SharedLatheComponent.cs +++ b/Content.Shared/Lathe/SharedLatheComponent.cs @@ -14,9 +14,6 @@ namespace Content.Shared.Lathe { [Dependency] private readonly IEntityManager _entMan = default!; [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; - - public override string Name => "Lathe"; - public bool CanProduce(LatheRecipePrototype recipe, int quantity = 1) { if (!_entMan.TryGetComponent(Owner, out SharedMaterialStorageComponent? storage) diff --git a/Content.Shared/Lathe/SharedLatheDatabaseComponent.cs b/Content.Shared/Lathe/SharedLatheDatabaseComponent.cs index fa755e199a7..b431c5c81bc 100644 --- a/Content.Shared/Lathe/SharedLatheDatabaseComponent.cs +++ b/Content.Shared/Lathe/SharedLatheDatabaseComponent.cs @@ -15,8 +15,6 @@ namespace Content.Shared.Lathe [NetworkedComponent()] public class SharedLatheDatabaseComponent : Component, IEnumerable, ISerializationHooks { - public override string Name => "LatheDatabase"; - [DataField("recipes", customTypeSerializer: typeof(PrototypeIdListSerializer))] private List _recipeIds = new(); private readonly List _recipes = new(); diff --git a/Content.Shared/Lathe/SharedMaterialStorageComponent.cs b/Content.Shared/Lathe/SharedMaterialStorageComponent.cs index f3d6e758a3f..888f42a9822 100644 --- a/Content.Shared/Lathe/SharedMaterialStorageComponent.cs +++ b/Content.Shared/Lathe/SharedMaterialStorageComponent.cs @@ -12,8 +12,6 @@ namespace Content.Shared.Lathe [NetworkedComponent()] public class SharedMaterialStorageComponent : Component, IEnumerable> { - public override string Name => "MaterialStorage"; - [ViewVariables] protected virtual Dictionary Storage { get; set; } = new(); diff --git a/Content.Shared/Lathe/SharedProtolatheDatabaseComponent.cs b/Content.Shared/Lathe/SharedProtolatheDatabaseComponent.cs index 55e1b734351..51253c3503d 100644 --- a/Content.Shared/Lathe/SharedProtolatheDatabaseComponent.cs +++ b/Content.Shared/Lathe/SharedProtolatheDatabaseComponent.cs @@ -17,8 +17,6 @@ namespace Content.Shared.Lathe { [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - public override string Name => "ProtolatheDatabase"; - [DataField("protolatherecipes", customTypeSerializer:typeof(PrototypeIdListSerializer))] private List _recipeIds = new(); diff --git a/Content.Shared/Light/Component/SharedEmergencyLightComponent.cs b/Content.Shared/Light/Component/SharedEmergencyLightComponent.cs index 88ea4835a18..e534bd64d6e 100644 --- a/Content.Shared/Light/Component/SharedEmergencyLightComponent.cs +++ b/Content.Shared/Light/Component/SharedEmergencyLightComponent.cs @@ -8,8 +8,6 @@ namespace Content.Shared.Light.Component [NetworkedComponent] public abstract class SharedEmergencyLightComponent : Robust.Shared.GameObjects.Component { - public override string Name => "EmergencyLight"; - public bool Enabled { get; set; } = false; } diff --git a/Content.Shared/Light/Component/SharedExpendableLightComponent.cs b/Content.Shared/Light/Component/SharedExpendableLightComponent.cs index 149041f1799..59200eb3547 100644 --- a/Content.Shared/Light/Component/SharedExpendableLightComponent.cs +++ b/Content.Shared/Light/Component/SharedExpendableLightComponent.cs @@ -31,8 +31,6 @@ namespace Content.Shared.Light.Component { public static readonly AudioParams LoopedSoundParams = new(0, 1, "Master", 62.5f, 1, 1, true, 0.3f); - public sealed override string Name => "ExpendableLight"; - [ViewVariables(VVAccess.ReadOnly)] public ExpendableLightState CurrentState { get; set; } diff --git a/Content.Shared/Light/Component/SharedLightBehaviourComponent.cs b/Content.Shared/Light/Component/SharedLightBehaviourComponent.cs index 603cd767a6c..1752bd37308 100644 --- a/Content.Shared/Light/Component/SharedLightBehaviourComponent.cs +++ b/Content.Shared/Light/Component/SharedLightBehaviourComponent.cs @@ -5,6 +5,5 @@ /// public class SharedLightBehaviourComponent : Robust.Shared.GameObjects.Component { - public override string Name => "LightBehaviour"; } } diff --git a/Content.Shared/Markers/SharedSpawnPointComponent.cs b/Content.Shared/Markers/SharedSpawnPointComponent.cs index 98ab965eef8..8f9c76167ef 100644 --- a/Content.Shared/Markers/SharedSpawnPointComponent.cs +++ b/Content.Shared/Markers/SharedSpawnPointComponent.cs @@ -4,6 +4,5 @@ namespace Content.Shared.Markers { public class SharedSpawnPointComponent : Component { - public sealed override string Name => "SpawnPoint"; } } diff --git a/Content.Shared/MedicalScanner/SharedMedicalScannerComponent.cs b/Content.Shared/MedicalScanner/SharedMedicalScannerComponent.cs index ac80a583a49..4a0399f6b08 100644 --- a/Content.Shared/MedicalScanner/SharedMedicalScannerComponent.cs +++ b/Content.Shared/MedicalScanner/SharedMedicalScannerComponent.cs @@ -12,8 +12,6 @@ namespace Content.Shared.MedicalScanner { public abstract class SharedMedicalScannerComponent : Component, IDragDropOn { - public override string Name => "MedicalScanner"; - [Serializable, NetSerializable] public class MedicalScannerBoundUserInterfaceState : BoundUserInterfaceState { diff --git a/Content.Shared/MobState/Components/MobStateComponent.cs b/Content.Shared/MobState/Components/MobStateComponent.cs index 82756b497c1..bfd8be67f9d 100644 --- a/Content.Shared/MobState/Components/MobStateComponent.cs +++ b/Content.Shared/MobState/Components/MobStateComponent.cs @@ -28,8 +28,6 @@ namespace Content.Shared.MobState.Components { [Dependency] private readonly IEntityManager _entMan = default!; - public override string Name => "MobState"; - /// /// States that this mapped to /// the amount of damage at which they are triggered. diff --git a/Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs b/Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs index 4bd505ee6d2..573dc350097 100644 --- a/Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs +++ b/Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs @@ -11,7 +11,6 @@ namespace Content.Shared.Movement.Components [RegisterComponent] public sealed class MovementIgnoreGravityComponent : Component { - public override string Name => "MovementIgnoreGravity"; } public static class GravityExtensions diff --git a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs index 30d6cd0f74d..f26c7d19d4e 100644 --- a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs +++ b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs @@ -15,8 +15,6 @@ namespace Content.Shared.Movement.Components public const float DefaultBaseWalkSpeed = 3.0f; public const float DefaultBaseSprintSpeed = 5.0f; - public override string Name => "MovementSpeedModifier"; - [ViewVariables] public float WalkSpeedModifier = 1.0f; diff --git a/Content.Shared/Movement/Components/SharedDummyInputMoverComponent.cs b/Content.Shared/Movement/Components/SharedDummyInputMoverComponent.cs index 902d6024145..1615efcbda7 100644 --- a/Content.Shared/Movement/Components/SharedDummyInputMoverComponent.cs +++ b/Content.Shared/Movement/Components/SharedDummyInputMoverComponent.cs @@ -7,7 +7,6 @@ namespace Content.Shared.Movement.Components [ComponentReference(typeof(IMoverComponent))] public class SharedDummyInputMoverComponent : Component, IMoverComponent { - public override string Name => "DummyInputMover"; public bool IgnorePaused => false; public float CurrentWalkSpeed => 0f; public float CurrentSprintSpeed => 0f; diff --git a/Content.Shared/Movement/Components/SharedPlayerInputMoverComponent.cs b/Content.Shared/Movement/Components/SharedPlayerInputMoverComponent.cs index 608d388fdc0..5791e4389eb 100644 --- a/Content.Shared/Movement/Components/SharedPlayerInputMoverComponent.cs +++ b/Content.Shared/Movement/Components/SharedPlayerInputMoverComponent.cs @@ -39,9 +39,6 @@ namespace Content.Shared.Movement.Components [Dependency] private readonly IConfigurationManager _configurationManager = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly IEntityManager _entityManager = default!; - - public override string Name => "PlayerInputMover"; - private GameTick _lastInputTick; private ushort _lastInputSubTick; private Vector2 _curTickWalkMovement; diff --git a/Content.Shared/Movement/Components/SharedPlayerMobMoverComponent.cs b/Content.Shared/Movement/Components/SharedPlayerMobMoverComponent.cs index 6129fad4c06..076dd3c9c00 100644 --- a/Content.Shared/Movement/Components/SharedPlayerMobMoverComponent.cs +++ b/Content.Shared/Movement/Components/SharedPlayerMobMoverComponent.cs @@ -19,8 +19,6 @@ namespace Content.Shared.Movement.Components [NetworkedComponent()] public class SharedPlayerMobMoverComponent : Component, IMobMoverComponent { - public override string Name => "PlayerMobMover"; - private float _stepSoundDistance; [DataField("grabRange")] private float _grabRange = IMobMoverComponent.GrabRangeDefault; diff --git a/Content.Shared/Movement/Components/SlowContactsComponent.cs b/Content.Shared/Movement/Components/SlowContactsComponent.cs index 0133eae5150..6cdcc84d905 100644 --- a/Content.Shared/Movement/Components/SlowContactsComponent.cs +++ b/Content.Shared/Movement/Components/SlowContactsComponent.cs @@ -8,8 +8,6 @@ namespace Content.Shared.Movement.Components; [NetworkedComponent, RegisterComponent] public class SlowContactsComponent : Component { - public override string Name => "SlowContacts"; - [ViewVariables, DataField("walkSpeedModifier")] public float WalkSpeedModifier { get; private set; } = 1.0f; diff --git a/Content.Shared/Movement/Components/SlowsOnContactComponent.cs b/Content.Shared/Movement/Components/SlowsOnContactComponent.cs index a4114028132..1aa3589e7fe 100644 --- a/Content.Shared/Movement/Components/SlowsOnContactComponent.cs +++ b/Content.Shared/Movement/Components/SlowsOnContactComponent.cs @@ -9,5 +9,4 @@ namespace Content.Shared.Movement.Components; [NetworkedComponent, RegisterComponent] public class SlowsOnContactComponent : Component { - public override string Name => "SlowsOnContact"; } diff --git a/Content.Shared/Nutrition/Components/CreamPieComponent.cs b/Content.Shared/Nutrition/Components/CreamPieComponent.cs index b21acc640df..ed97a4c355f 100644 --- a/Content.Shared/Nutrition/Components/CreamPieComponent.cs +++ b/Content.Shared/Nutrition/Components/CreamPieComponent.cs @@ -11,8 +11,6 @@ namespace Content.Shared.Nutrition.Components [RegisterComponent] public class CreamPieComponent : Component { - public override string Name => "CreamPie"; - [ViewVariables] [DataField("paralyzeTime")] public float ParalyzeTime { get; } = 1f; diff --git a/Content.Shared/Nutrition/Components/CreamPiedComponent.cs b/Content.Shared/Nutrition/Components/CreamPiedComponent.cs index 4b20476c773..aec35c8afc9 100644 --- a/Content.Shared/Nutrition/Components/CreamPiedComponent.cs +++ b/Content.Shared/Nutrition/Components/CreamPiedComponent.cs @@ -11,8 +11,6 @@ namespace Content.Shared.Nutrition.Components [RegisterComponent] public class CreamPiedComponent : Component { - public override string Name => "CreamPied"; - [ViewVariables] public bool CreamPied { get; set; } = false; } diff --git a/Content.Shared/Nutrition/Components/SharedButcherableComponent.cs b/Content.Shared/Nutrition/Components/SharedButcherableComponent.cs index 75455b9d163..8c33ed6b76b 100644 --- a/Content.Shared/Nutrition/Components/SharedButcherableComponent.cs +++ b/Content.Shared/Nutrition/Components/SharedButcherableComponent.cs @@ -13,8 +13,6 @@ namespace Content.Shared.Nutrition.Components [RegisterComponent] public class SharedButcherableComponent : Component, IDraggable { - public override string Name => "Butcherable"; - //TODO: List for sub-products like animal-hides, organs and etc? [ViewVariables] [DataField("meat", customTypeSerializer:typeof(PrototypeIdSerializer))] diff --git a/Content.Shared/Nutrition/Components/SharedHungerComponent.cs b/Content.Shared/Nutrition/Components/SharedHungerComponent.cs index 3f6cd68bbea..5e4e92d372b 100644 --- a/Content.Shared/Nutrition/Components/SharedHungerComponent.cs +++ b/Content.Shared/Nutrition/Components/SharedHungerComponent.cs @@ -10,8 +10,6 @@ namespace Content.Shared.Nutrition.Components [NetworkedComponent()] public abstract class SharedHungerComponent : Component { - public sealed override string Name => "Hunger"; - [ViewVariables] public abstract HungerThreshold CurrentHungerThreshold { get; } diff --git a/Content.Shared/Nutrition/Components/SharedThirstComponent.cs b/Content.Shared/Nutrition/Components/SharedThirstComponent.cs index 2a8fe5ccc22..d596f5dab60 100644 --- a/Content.Shared/Nutrition/Components/SharedThirstComponent.cs +++ b/Content.Shared/Nutrition/Components/SharedThirstComponent.cs @@ -10,8 +10,6 @@ namespace Content.Shared.Nutrition.Components [NetworkedComponent()] public abstract class SharedThirstComponent : Component { - public sealed override string Name => "Thirst"; - [ViewVariables] public abstract ThirstThreshold CurrentThirstThreshold { get; } diff --git a/Content.Shared/PAI/PAIComponent.cs b/Content.Shared/PAI/PAIComponent.cs index ad255783da5..0e6c1d74b74 100644 --- a/Content.Shared/PAI/PAIComponent.cs +++ b/Content.Shared/PAI/PAIComponent.cs @@ -17,7 +17,6 @@ namespace Content.Shared.PAI [RegisterComponent, NetworkedComponent] public class PAIComponent : Component { - public override string Name => "PAI"; } } diff --git a/Content.Shared/PDA/PDAComponent.cs b/Content.Shared/PDA/PDAComponent.cs index 087f58500b1..ddc0ec058ec 100644 --- a/Content.Shared/PDA/PDAComponent.cs +++ b/Content.Shared/PDA/PDAComponent.cs @@ -11,8 +11,6 @@ namespace Content.Shared.PDA [RegisterComponent] public class PDAComponent : Component { - public override string Name => "PDA"; - [DataField("idSlot")] public ItemSlot IdSlot = new(); diff --git a/Content.Shared/Paper/SharedPaperComponent.cs b/Content.Shared/Paper/SharedPaperComponent.cs index e239ed3ecdb..b2a4c472d8c 100644 --- a/Content.Shared/Paper/SharedPaperComponent.cs +++ b/Content.Shared/Paper/SharedPaperComponent.cs @@ -6,8 +6,6 @@ namespace Content.Shared.Paper { public class SharedPaperComponent : Component { - public override string Name => "Paper"; - [Serializable, NetSerializable] public class PaperBoundUserInterfaceState : BoundUserInterfaceState { diff --git a/Content.Shared/Pinpointer/PinpointerComponent.cs b/Content.Shared/Pinpointer/PinpointerComponent.cs index ae107fac65a..129013c923b 100644 --- a/Content.Shared/Pinpointer/PinpointerComponent.cs +++ b/Content.Shared/Pinpointer/PinpointerComponent.cs @@ -14,8 +14,6 @@ namespace Content.Shared.Pinpointer [Friend(typeof(SharedPinpointerSystem))] public class PinpointerComponent : Component { - public override string Name => "Pinpointer"; - [DataField("whitelist")] public EntityWhitelist? Whitelist; diff --git a/Content.Shared/Placeable/PlaceableSurfaceComponent.cs b/Content.Shared/Placeable/PlaceableSurfaceComponent.cs index c1bb8c9628b..701d5884f3a 100644 --- a/Content.Shared/Placeable/PlaceableSurfaceComponent.cs +++ b/Content.Shared/Placeable/PlaceableSurfaceComponent.cs @@ -14,8 +14,6 @@ namespace Content.Shared.Placeable [Friend(typeof(PlaceableSurfaceSystem))] public class PlaceableSurfaceComponent : Component { - public override string Name => "PlaceableSurface"; - [ViewVariables] [DataField("isPlaceable")] public bool IsPlaceable { get; set; } = true; diff --git a/Content.Shared/Pointing/Components/SharedPointingArrowComponent.cs b/Content.Shared/Pointing/Components/SharedPointingArrowComponent.cs index ed6761d84e6..cd77d73ddb8 100644 --- a/Content.Shared/Pointing/Components/SharedPointingArrowComponent.cs +++ b/Content.Shared/Pointing/Components/SharedPointingArrowComponent.cs @@ -4,6 +4,5 @@ namespace Content.Shared.Pointing.Components { public class SharedPointingArrowComponent : Component { - public sealed override string Name => "PointingArrow"; } } diff --git a/Content.Shared/Pointing/Components/SharedRoguePointingArrowComponent.cs b/Content.Shared/Pointing/Components/SharedRoguePointingArrowComponent.cs index f58890b9197..906a5a4e571 100644 --- a/Content.Shared/Pointing/Components/SharedRoguePointingArrowComponent.cs +++ b/Content.Shared/Pointing/Components/SharedRoguePointingArrowComponent.cs @@ -6,7 +6,6 @@ namespace Content.Shared.Pointing.Components { public class SharedRoguePointingArrowComponent : Component { - public sealed override string Name => "RoguePointingArrow"; } [Serializable, NetSerializable] diff --git a/Content.Shared/PowerCell/Components/PowerCellSlotComponent.cs b/Content.Shared/PowerCell/Components/PowerCellSlotComponent.cs index f8585bcd931..1a7789fcb11 100644 --- a/Content.Shared/PowerCell/Components/PowerCellSlotComponent.cs +++ b/Content.Shared/PowerCell/Components/PowerCellSlotComponent.cs @@ -8,8 +8,6 @@ namespace Content.Shared.PowerCell.Components; [RegisterComponent] public sealed class PowerCellSlotComponent : Component { - public override string Name => "PowerCellSlot"; - /// /// What size of cell fits into this component. /// @@ -33,7 +31,7 @@ public sealed class PowerCellSlotComponent : Component /// /// This is simply used provide a default value for . If this string is empty or /// whitespace, the verb will instead use the full name of any cell (e.g., "eject > small super-capacity power - /// cell"). + /// cell"). /// [DataField("slotName")] public readonly string SlotName = "power-cell-slot-component-slot-name-default"; // gets Loc.GetString()-ed by ItemSlotsSystem @@ -43,7 +41,7 @@ public sealed class PowerCellSlotComponent : Component /// in the yaml definition, that always takes precedence. /// /// - /// If false, the cell will start with a standard cell with a matching cell-size. + /// If false, the cell will start with a standard cell with a matching cell-size. /// [DataField("startEmpty")] public bool StartEmpty = false; diff --git a/Content.Shared/Projectiles/SharedProjectileComponent.cs b/Content.Shared/Projectiles/SharedProjectileComponent.cs index c2d40c63468..2555d95aae4 100644 --- a/Content.Shared/Projectiles/SharedProjectileComponent.cs +++ b/Content.Shared/Projectiles/SharedProjectileComponent.cs @@ -9,8 +9,6 @@ namespace Content.Shared.Projectiles public abstract class SharedProjectileComponent : Component { private bool _ignoreShooter = true; - public override string Name => "Projectile"; - public EntityUid Shooter { get; protected set; } public bool IgnoreShooter diff --git a/Content.Shared/Pulling/Components/PullableComponent.cs b/Content.Shared/Pulling/Components/PullableComponent.cs index 3aca72a317f..f6029b91ca6 100644 --- a/Content.Shared/Pulling/Components/PullableComponent.cs +++ b/Content.Shared/Pulling/Components/PullableComponent.cs @@ -16,8 +16,6 @@ namespace Content.Shared.Pulling.Components [RegisterComponent] public class SharedPullableComponent : Component { - public override string Name => "Pullable"; - public float? MaxDistance => PullJoint?.MaxLength; /// diff --git a/Content.Shared/Pulling/Components/SharedPullerComponent.cs b/Content.Shared/Pulling/Components/SharedPullerComponent.cs index efb84aca805..0cfa9df14c5 100644 --- a/Content.Shared/Pulling/Components/SharedPullerComponent.cs +++ b/Content.Shared/Pulling/Components/SharedPullerComponent.cs @@ -9,8 +9,6 @@ namespace Content.Shared.Pulling.Components [Friend(typeof(SharedPullingStateManagementSystem))] public class SharedPullerComponent : Component { - public override string Name => "Puller"; - // Before changing how this is updated, please see SharedPullerSystem.RefreshMovementSpeed public float WalkSpeedModifier => Pulling == default ? 1.0f : 0.75f; diff --git a/Content.Shared/Radiation/SharedRadiationStorm.cs b/Content.Shared/Radiation/SharedRadiationStorm.cs index b83bb84edef..430395e167f 100644 --- a/Content.Shared/Radiation/SharedRadiationStorm.cs +++ b/Content.Shared/Radiation/SharedRadiationStorm.cs @@ -9,8 +9,6 @@ namespace Content.Shared.Radiation [NetworkedComponent()] public abstract class SharedRadiationPulseComponent : Component { - public override string Name => "RadiationPulse"; - [DataField("radsPerSecond")] public float RadsPerSecond { get; set; } = 1; diff --git a/Content.Shared/Research/Components/SharedResearchClientComponent.cs b/Content.Shared/Research/Components/SharedResearchClientComponent.cs index cf9f65ee10b..0489655f420 100644 --- a/Content.Shared/Research/Components/SharedResearchClientComponent.cs +++ b/Content.Shared/Research/Components/SharedResearchClientComponent.cs @@ -6,8 +6,6 @@ namespace Content.Shared.Research.Components { public class SharedResearchClientComponent : Component { - public override string Name => "ResearchClient"; - /// /// Request that the server updates the client. /// diff --git a/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs b/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs index bebb8cf1c93..e2a327e8406 100644 --- a/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs +++ b/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs @@ -8,7 +8,6 @@ namespace Content.Shared.Research.Components [NetworkedComponent()] public class SharedResearchConsoleComponent : Component { - public override string Name => "ResearchConsole"; [NetSerializable, Serializable] public enum ResearchConsoleUiKey diff --git a/Content.Shared/Research/Components/SharedTechnologyDatabaseComponent.cs b/Content.Shared/Research/Components/SharedTechnologyDatabaseComponent.cs index 1b511cc983b..1a67321a8e7 100644 --- a/Content.Shared/Research/Components/SharedTechnologyDatabaseComponent.cs +++ b/Content.Shared/Research/Components/SharedTechnologyDatabaseComponent.cs @@ -14,8 +14,6 @@ namespace Content.Shared.Research.Components [NetworkedComponent()] public class SharedTechnologyDatabaseComponent : Component, IEnumerable, ISerializationHooks { - public override string Name => "TechnologyDatabase"; - [DataField("technologies")] private List _technologyIds = new(); protected List _technologies = new(); diff --git a/Content.Shared/Rotatable/RotatableComponent.cs b/Content.Shared/Rotatable/RotatableComponent.cs index f2537472d00..524cfaf5122 100644 --- a/Content.Shared/Rotatable/RotatableComponent.cs +++ b/Content.Shared/Rotatable/RotatableComponent.cs @@ -8,8 +8,6 @@ namespace Content.Shared.Rotatable [RegisterComponent] public class RotatableComponent : Component { - public override string Name => "Rotatable"; - /// /// If true, this entity can be rotated even while anchored. /// diff --git a/Content.Shared/Shuttles/Components/PilotComponent.cs b/Content.Shared/Shuttles/Components/PilotComponent.cs index 9477bcc689b..4b8f835fbfb 100644 --- a/Content.Shared/Shuttles/Components/PilotComponent.cs +++ b/Content.Shared/Shuttles/Components/PilotComponent.cs @@ -16,7 +16,6 @@ namespace Content.Shared.Shuttles.Components [NetworkedComponent] public sealed class PilotComponent : Component { - public override string Name => "Pilot"; [ViewVariables] public SharedShuttleConsoleComponent? Console { get; set; } /// diff --git a/Content.Shared/Shuttles/Components/SharedDockingComponent.cs b/Content.Shared/Shuttles/Components/SharedDockingComponent.cs index de039ddb1b5..8cec8518eb1 100644 --- a/Content.Shared/Shuttles/Components/SharedDockingComponent.cs +++ b/Content.Shared/Shuttles/Components/SharedDockingComponent.cs @@ -7,7 +7,6 @@ namespace Content.Shared.Shuttles.Components { // Yes I left this in for now because there's no overhead and we'll need a client one later anyway // and I was too lazy to delete it. - public override string Name => "Docking"; [ViewVariables] public bool Enabled = false; diff --git a/Content.Shared/Shuttles/Components/SharedShuttleComponent.cs b/Content.Shared/Shuttles/Components/SharedShuttleComponent.cs index a527715ee50..ec91a1f3379 100644 --- a/Content.Shared/Shuttles/Components/SharedShuttleComponent.cs +++ b/Content.Shared/Shuttles/Components/SharedShuttleComponent.cs @@ -5,8 +5,6 @@ namespace Content.Shared.Shuttles.Components { public abstract class SharedShuttleComponent : Component { - public override string Name => "Shuttle"; - [ViewVariables] public virtual bool Enabled { get; set; } = true; diff --git a/Content.Shared/Shuttles/Components/SharedShuttleConsoleComponent.cs b/Content.Shared/Shuttles/Components/SharedShuttleConsoleComponent.cs index 8a5e51e43e9..e651eb18d47 100644 --- a/Content.Shared/Shuttles/Components/SharedShuttleConsoleComponent.cs +++ b/Content.Shared/Shuttles/Components/SharedShuttleConsoleComponent.cs @@ -9,6 +9,5 @@ namespace Content.Shared.Shuttles.Components [NetworkedComponent()] public abstract class SharedShuttleConsoleComponent : Component { - public override string Name => "ShuttleConsole"; } } diff --git a/Content.Shared/Singularity/Components/SharedContainmentFieldComponent.cs b/Content.Shared/Singularity/Components/SharedContainmentFieldComponent.cs index 42b73c5a7d9..b019070f18d 100644 --- a/Content.Shared/Singularity/Components/SharedContainmentFieldComponent.cs +++ b/Content.Shared/Singularity/Components/SharedContainmentFieldComponent.cs @@ -4,6 +4,5 @@ namespace Content.Shared.Singularity.Components { public abstract class SharedContainmentFieldComponent : Component { - public override string Name => "ContainmentField"; } } diff --git a/Content.Shared/Singularity/Components/SharedContainmentFieldGeneratorComponent.cs b/Content.Shared/Singularity/Components/SharedContainmentFieldGeneratorComponent.cs index 8363d1c1c70..812a7215ffb 100644 --- a/Content.Shared/Singularity/Components/SharedContainmentFieldGeneratorComponent.cs +++ b/Content.Shared/Singularity/Components/SharedContainmentFieldGeneratorComponent.cs @@ -4,6 +4,5 @@ namespace Content.Shared.Singularity.Components { public abstract class SharedContainmentFieldGeneratorComponent : Component { - public override string Name => "ContainmentFieldGenerator"; } } diff --git a/Content.Shared/Singularity/Components/SharedSingularityComponent.cs b/Content.Shared/Singularity/Components/SharedSingularityComponent.cs index 7347afab5e8..11fcd3d9478 100644 --- a/Content.Shared/Singularity/Components/SharedSingularityComponent.cs +++ b/Content.Shared/Singularity/Components/SharedSingularityComponent.cs @@ -10,8 +10,6 @@ namespace Content.Shared.Singularity.Components [NetworkedComponent] public abstract class SharedSingularityComponent : Component { - public override string Name => "Singularity"; - /// /// The radiation pulse component's radsPerSecond is set to the singularity's level multiplied by this number. /// diff --git a/Content.Shared/Singularity/Components/SingularityDistortionComponent.cs b/Content.Shared/Singularity/Components/SingularityDistortionComponent.cs index 10184533179..3915504c8ba 100644 --- a/Content.Shared/Singularity/Components/SingularityDistortionComponent.cs +++ b/Content.Shared/Singularity/Components/SingularityDistortionComponent.cs @@ -12,8 +12,6 @@ namespace Content.Shared.Singularity.Components [NetworkedComponent] public class SingularityDistortionComponent : Component { - public override string Name => "SingularityDistortion"; - [DataField("intensity")] private float _intensity = 0.25f; diff --git a/Content.Shared/Slippery/NoSlipComponent.cs b/Content.Shared/Slippery/NoSlipComponent.cs index 3ec6c91af1e..20a6f01d1d6 100644 --- a/Content.Shared/Slippery/NoSlipComponent.cs +++ b/Content.Shared/Slippery/NoSlipComponent.cs @@ -5,6 +5,5 @@ namespace Content.Shared.Slippery [RegisterComponent] public class NoSlipComponent : Component { - public override string Name => "NoSlip"; } } diff --git a/Content.Shared/Slippery/SlipperyComponent.cs b/Content.Shared/Slippery/SlipperyComponent.cs index 35f19ed88a4..56f4aea6f76 100644 --- a/Content.Shared/Slippery/SlipperyComponent.cs +++ b/Content.Shared/Slippery/SlipperyComponent.cs @@ -16,8 +16,6 @@ namespace Content.Shared.Slippery [NetworkedComponent()] public sealed class SlipperyComponent : Component { - public override string Name => "Slippery"; - private float _paralyzeTime = 5f; private float _intersectPercentage = 0.3f; private float _requiredSlipSpeed = 3.5f; diff --git a/Content.Shared/Speech/SharedSpeechComponent.cs b/Content.Shared/Speech/SharedSpeechComponent.cs index 8f3145d29a2..17eaf3315c4 100644 --- a/Content.Shared/Speech/SharedSpeechComponent.cs +++ b/Content.Shared/Speech/SharedSpeechComponent.cs @@ -9,8 +9,6 @@ namespace Content.Shared.Speech [RegisterComponent] public class SharedSpeechComponent : Component { - public override string Name => "Speech"; - [DataField("enabled")] private bool _enabled = true; diff --git a/Content.Shared/Stacks/SharedStackComponent.cs b/Content.Shared/Stacks/SharedStackComponent.cs index 791bbb8e5cd..1695ff76bec 100644 --- a/Content.Shared/Stacks/SharedStackComponent.cs +++ b/Content.Shared/Stacks/SharedStackComponent.cs @@ -13,9 +13,6 @@ namespace Content.Shared.Stacks [NetworkedComponent, Friend(typeof(SharedStackSystem))] public abstract class SharedStackComponent : Component, ISerializationHooks { - public sealed override string Name => "Stack"; - - [ViewVariables(VVAccess.ReadWrite)] [DataField("stackType", required:true, customTypeSerializer:typeof(PrototypeIdSerializer))] public string StackTypeId { get; private set; } = string.Empty; diff --git a/Content.Shared/Standing/StandingStateComponent.cs b/Content.Shared/Standing/StandingStateComponent.cs index b89e44e23ac..94740a59c70 100644 --- a/Content.Shared/Standing/StandingStateComponent.cs +++ b/Content.Shared/Standing/StandingStateComponent.cs @@ -14,8 +14,6 @@ namespace Content.Shared.Standing [RegisterComponent, NetworkedComponent] public sealed class StandingStateComponent : Component { - public override string Name => "StandingState"; - [ViewVariables(VVAccess.ReadWrite)] [DataField("downSoundCollection")] public SoundSpecifier DownSoundCollection { get; } = new SoundCollectionSpecifier("BodyFall"); diff --git a/Content.Shared/StatusEffect/StatusEffectsComponent.cs b/Content.Shared/StatusEffect/StatusEffectsComponent.cs index 297a7573a1f..a90ab27472c 100644 --- a/Content.Shared/StatusEffect/StatusEffectsComponent.cs +++ b/Content.Shared/StatusEffect/StatusEffectsComponent.cs @@ -14,8 +14,6 @@ namespace Content.Shared.StatusEffect [Friend(typeof(StatusEffectsSystem))] public class StatusEffectsComponent : Component { - public override string Name => "StatusEffects"; - [ViewVariables] public Dictionary ActiveEffects = new(); diff --git a/Content.Shared/Storage/Components/ItemCounterComponent.cs b/Content.Shared/Storage/Components/ItemCounterComponent.cs index bc355c5b84f..5296dcf266a 100644 --- a/Content.Shared/Storage/Components/ItemCounterComponent.cs +++ b/Content.Shared/Storage/Components/ItemCounterComponent.cs @@ -22,8 +22,6 @@ namespace Content.Shared.Storage.Components [Friend(typeof(SharedItemCounterSystem))] public class ItemCounterComponent : Component { - public override string Name => "ItemCounter"; - [DataField("count", required: true)] public EntityWhitelist Count { get; set; } = default!; diff --git a/Content.Shared/Storage/Components/ItemMapperComponent.cs b/Content.Shared/Storage/Components/ItemMapperComponent.cs index d682801dceb..eb9e1812c3b 100644 --- a/Content.Shared/Storage/Components/ItemMapperComponent.cs +++ b/Content.Shared/Storage/Components/ItemMapperComponent.cs @@ -11,8 +11,6 @@ namespace Content.Shared.Storage.Components [Friend(typeof(SharedItemMapperSystem))] public class ItemMapperComponent : Component, ISerializationHooks { - public override string Name => "ItemMapper"; - [DataField("mapLayers")] public readonly Dictionary MapLayers = new(); void ISerializationHooks.AfterDeserialization() diff --git a/Content.Shared/Storage/SharedStorageComponent.cs b/Content.Shared/Storage/SharedStorageComponent.cs index dd2a1ba6d6f..4275633e750 100644 --- a/Content.Shared/Storage/SharedStorageComponent.cs +++ b/Content.Shared/Storage/SharedStorageComponent.cs @@ -17,9 +17,6 @@ namespace Content.Shared.Storage public abstract class SharedStorageComponent : Component, IDraggable { [Dependency] private readonly IEntityManager _entMan = default!; - - public override string Name => "Storage"; - public abstract IReadOnlyList? StoredEntities { get; } /// diff --git a/Content.Shared/Strip/Components/SharedStrippableComponent.cs b/Content.Shared/Strip/Components/SharedStrippableComponent.cs index 0efc8863ed2..57146d81c5d 100644 --- a/Content.Shared/Strip/Components/SharedStrippableComponent.cs +++ b/Content.Shared/Strip/Components/SharedStrippableComponent.cs @@ -11,8 +11,6 @@ namespace Content.Shared.Strip.Components { public abstract class SharedStrippableComponent : Component, IDraggable { - public override string Name => "Strippable"; - public bool CanBeStripped(EntityUid by) { return by != Owner diff --git a/Content.Shared/Strip/Components/SharedStrippingComponent.cs b/Content.Shared/Strip/Components/SharedStrippingComponent.cs index 0210989a3ae..731257169f9 100644 --- a/Content.Shared/Strip/Components/SharedStrippingComponent.cs +++ b/Content.Shared/Strip/Components/SharedStrippingComponent.cs @@ -10,8 +10,6 @@ namespace Content.Shared.Strip.Components [RegisterComponent] public class SharedStrippingComponent : Component, IDragDropOn { - public override string Name => "Stripping"; - bool IDragDropOn.CanDragDropOn(DragDropEvent eventArgs) { if (!IoCManager.Resolve().TryGetComponent(eventArgs.Dragged, out SharedStrippableComponent? strippable)) return false; diff --git a/Content.Shared/Stunnable/KnockedDownComponent.cs b/Content.Shared/Stunnable/KnockedDownComponent.cs index d0d6c66322a..6972d542afa 100644 --- a/Content.Shared/Stunnable/KnockedDownComponent.cs +++ b/Content.Shared/Stunnable/KnockedDownComponent.cs @@ -14,8 +14,6 @@ namespace Content.Shared.Stunnable [Friend(typeof(SharedStunSystem))] public class KnockedDownComponent : Component { - public override string Name => "KnockedDown"; - [DataField("helpInterval")] public float HelpInterval { get; set; } = 1f; diff --git a/Content.Shared/Stunnable/SlowedDownComponent.cs b/Content.Shared/Stunnable/SlowedDownComponent.cs index 3b0d24e2640..ca32b8ffb37 100644 --- a/Content.Shared/Stunnable/SlowedDownComponent.cs +++ b/Content.Shared/Stunnable/SlowedDownComponent.cs @@ -12,8 +12,6 @@ namespace Content.Shared.Stunnable [Friend(typeof(SharedStunSystem))] public class SlowedDownComponent : Component { - public override string Name => "SlowedDown"; - public float SprintSpeedModifier { get; set; } = 0.5f; public float WalkSpeedModifier { get; set; } = 0.5f; } diff --git a/Content.Shared/Stunnable/StunnedComponent.cs b/Content.Shared/Stunnable/StunnedComponent.cs index a18341f5fa4..0b50050b72c 100644 --- a/Content.Shared/Stunnable/StunnedComponent.cs +++ b/Content.Shared/Stunnable/StunnedComponent.cs @@ -14,6 +14,5 @@ namespace Content.Shared.Stunnable [RegisterComponent, NetworkedComponent] public sealed class StunnedComponent : Component { - public sealed override string Name => "Stunned"; } } diff --git a/Content.Shared/SubFloor/SubFloorHideComponent.cs b/Content.Shared/SubFloor/SubFloorHideComponent.cs index 03d598bd53b..c0e763a7fb3 100644 --- a/Content.Shared/SubFloor/SubFloorHideComponent.cs +++ b/Content.Shared/SubFloor/SubFloorHideComponent.cs @@ -19,9 +19,6 @@ namespace Content.Shared.SubFloor [RegisterComponent] public sealed class SubFloorHideComponent : Component { - /// - public override string Name => "SubFloorHide"; - /// /// Whether the entity will be hid when not in subfloor. /// diff --git a/Content.Shared/SubFloor/TrayScannerComponent.cs b/Content.Shared/SubFloor/TrayScannerComponent.cs index 9a528729976..8b07eae16e9 100644 --- a/Content.Shared/SubFloor/TrayScannerComponent.cs +++ b/Content.Shared/SubFloor/TrayScannerComponent.cs @@ -13,8 +13,6 @@ namespace Content.Shared.SubFloor; [NetworkedComponent] public class TrayScannerComponent : Component { - public override string Name { get; } = "TrayScanner"; - [ViewVariables] public bool Toggled { get; set; } diff --git a/Content.Shared/Suspicion/SharedSuspicionRoleComponent.cs b/Content.Shared/Suspicion/SharedSuspicionRoleComponent.cs index 10f0acda991..79fcb0cf368 100644 --- a/Content.Shared/Suspicion/SharedSuspicionRoleComponent.cs +++ b/Content.Shared/Suspicion/SharedSuspicionRoleComponent.cs @@ -8,7 +8,6 @@ namespace Content.Shared.Suspicion [NetworkedComponent()] public abstract class SharedSuspicionRoleComponent : Component { - public sealed override string Name => "SuspicionRole"; } [Serializable, NetSerializable] diff --git a/Content.Shared/Tabletop/Components/SharedTabletopDraggableComponent.cs b/Content.Shared/Tabletop/Components/SharedTabletopDraggableComponent.cs index 92755495b43..d5ab674b3e7 100644 --- a/Content.Shared/Tabletop/Components/SharedTabletopDraggableComponent.cs +++ b/Content.Shared/Tabletop/Components/SharedTabletopDraggableComponent.cs @@ -9,6 +9,5 @@ namespace Content.Shared.Tabletop.Components [NetworkedComponent] public abstract class SharedTabletopDraggableComponent : Component { - public override string Name => "TabletopDraggable"; } } diff --git a/Content.Shared/Tag/TagComponent.cs b/Content.Shared/Tag/TagComponent.cs index 85dadb65e0c..5029dd5b2dc 100644 --- a/Content.Shared/Tag/TagComponent.cs +++ b/Content.Shared/Tag/TagComponent.cs @@ -14,8 +14,6 @@ namespace Content.Shared.Tag [RegisterComponent] public class TagComponent : Component, ISerializationHooks { - public override string Name => "Tag"; - [ViewVariables] [DataField("tags", customTypeSerializer: typeof(PrototypeIdHashSetSerializer))] private readonly HashSet _tags = new(); diff --git a/Content.Shared/Throwing/ThrownItemComponent.cs b/Content.Shared/Throwing/ThrownItemComponent.cs index 404ee8e9f04..59c39b553f5 100644 --- a/Content.Shared/Throwing/ThrownItemComponent.cs +++ b/Content.Shared/Throwing/ThrownItemComponent.cs @@ -8,8 +8,6 @@ namespace Content.Shared.Throwing [RegisterComponent, NetworkedComponent] public class ThrownItemComponent : Component { - public override string Name => "ThrownItem"; - public EntityUid? Thrower { get; set; } } diff --git a/Content.Shared/Tools/Components/SharedMultipleToolComponent.cs b/Content.Shared/Tools/Components/SharedMultipleToolComponent.cs index 9eab25365ab..4c33d9a2a87 100644 --- a/Content.Shared/Tools/Components/SharedMultipleToolComponent.cs +++ b/Content.Shared/Tools/Components/SharedMultipleToolComponent.cs @@ -8,7 +8,6 @@ namespace Content.Shared.Tools.Components [NetworkedComponent] public class SharedMultipleToolComponent : Component { - public override string Name => "MultipleTool"; } [NetSerializable, Serializable] diff --git a/Content.Shared/Tools/Components/SharedWelderComponent.cs b/Content.Shared/Tools/Components/SharedWelderComponent.cs index dd10bfa77ff..2aaada28254 100644 --- a/Content.Shared/Tools/Components/SharedWelderComponent.cs +++ b/Content.Shared/Tools/Components/SharedWelderComponent.cs @@ -8,8 +8,6 @@ namespace Content.Shared.Tools.Components [NetworkedComponent] public abstract class SharedWelderComponent : Component { - public override string Name => "Welder"; - public bool Lit { get; set; } } diff --git a/Content.Shared/Vapor/SharedVaporComponent.cs b/Content.Shared/Vapor/SharedVaporComponent.cs index a2395aa91d5..8d0160ff345 100644 --- a/Content.Shared/Vapor/SharedVaporComponent.cs +++ b/Content.Shared/Vapor/SharedVaporComponent.cs @@ -6,7 +6,6 @@ namespace Content.Shared.Vapor { public class SharedVaporComponent : Component { - public override string Name => "Vapor"; public const string SolutionName = "vapor"; } diff --git a/Content.Shared/VendingMachines/SharedVendingMachineComponent.cs b/Content.Shared/VendingMachines/SharedVendingMachineComponent.cs index 18279860191..220ccf0f8b8 100644 --- a/Content.Shared/VendingMachines/SharedVendingMachineComponent.cs +++ b/Content.Shared/VendingMachines/SharedVendingMachineComponent.cs @@ -10,8 +10,6 @@ namespace Content.Shared.VendingMachines [NetworkedComponent()] public class SharedVendingMachineComponent : Component { - public override string Name => "VendingMachine"; - [ViewVariables] public List Inventory = new(); diff --git a/Content.Shared/Weapons/Ranged/Components/SharedRangedWeaponComponent.cs b/Content.Shared/Weapons/Ranged/Components/SharedRangedWeaponComponent.cs index 83e85e97ffa..605dbc52fa7 100644 --- a/Content.Shared/Weapons/Ranged/Components/SharedRangedWeaponComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/SharedRangedWeaponComponent.cs @@ -12,7 +12,6 @@ namespace Content.Shared.Weapons.Ranged.Components { // Each RangedWeapon should have a RangedWeapon component + // some kind of RangedBarrelComponent (this dictates what ammo is retrieved). - public override string Name => "RangedWeapon"; } [Serializable, NetSerializable] diff --git a/Content.Shared/Window/SharedWindowComponent.cs b/Content.Shared/Window/SharedWindowComponent.cs index 1e2f451c07b..ae0ef6ee679 100644 --- a/Content.Shared/Window/SharedWindowComponent.cs +++ b/Content.Shared/Window/SharedWindowComponent.cs @@ -6,6 +6,5 @@ namespace Content.Shared.Window [NetworkedComponent] public class SharedWindowComponent : Component { - public override string Name => "Window"; } } diff --git a/Content.Shared/Wires/SharedWiresComponent.cs b/Content.Shared/Wires/SharedWiresComponent.cs index 225ef528732..306a9c663c8 100644 --- a/Content.Shared/Wires/SharedWiresComponent.cs +++ b/Content.Shared/Wires/SharedWiresComponent.cs @@ -11,8 +11,6 @@ namespace Content.Shared.Wires { public class SharedWiresComponent : Component { - public override string Name => "Wires"; - [Serializable, NetSerializable] public enum WiresVisuals {