This commit is contained in:
wrexbe
2022-02-01 19:35:40 -08:00
committed by GitHub
parent fa8a7e609a
commit 17db0775c8
436 changed files with 20 additions and 828 deletions

View File

@@ -89,7 +89,6 @@ namespace Content.Benchmarks
private class DummyComponent : Component private class DummyComponent : Component
{ {
public override string Name => "Dummy";
} }
} }
} }

View File

@@ -11,8 +11,6 @@ namespace Content.Client.Animations
[RegisterComponent] [RegisterComponent]
public sealed class AnimationsTestComponent : Component public sealed class AnimationsTestComponent : Component
{ {
public override string Name => "AnimationsTest";
protected override void Initialize() protected override void Initialize()
{ {
base.Initialize(); base.Initialize();

View File

@@ -13,8 +13,6 @@ namespace Content.Client.CharacterInfo.Components
[RegisterComponent] [RegisterComponent]
public sealed class CharacterInfoComponent : Component, ICharacterUI public sealed class CharacterInfoComponent : Component, ICharacterUI
{ {
public override string Name => "CharacterInfo";
public CharacterInfoControl Control = default!; public CharacterInfoControl Control = default!;
public Control Scene { get; set; } = default!; public Control Scene { get; set; } = default!;

View File

@@ -14,8 +14,6 @@ namespace Content.Client.CharacterInterface
[RegisterComponent] [RegisterComponent]
public class CharacterInterfaceComponent : Component public class CharacterInterfaceComponent : Component
{ {
public override string Name => "Character Interface Component";
/// <summary> /// <summary>
/// Window to hold each of the character interfaces /// Window to hold each of the character interfaces
/// </summary> /// </summary>

View File

@@ -14,8 +14,6 @@ namespace Content.Client.Clickable
[RegisterComponent] [RegisterComponent]
public sealed class ClickableComponent : Component public sealed class ClickableComponent : Component
{ {
public override string Name => "Clickable";
[Dependency] private readonly IClickMapManager _clickMapManager = default!; [Dependency] private readonly IClickMapManager _clickMapManager = default!;
[ViewVariables] [DataField("bounds")] private DirBoundData? _data; [ViewVariables] [DataField("bounds")] private DirBoundData? _data;

View File

@@ -13,8 +13,6 @@ namespace Content.Client.Clothing
[NetworkedComponent()] [NetworkedComponent()]
public class ClothingComponent : ItemComponent public class ClothingComponent : ItemComponent
{ {
public override string Name => "Clothing";
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
[DataField("femaleMask")] [DataField("femaleMask")]
public FemaleClothingMask FemaleMask { get; } = FemaleClothingMask.UniformFull; public FemaleClothingMask FemaleMask { get; } = FemaleClothingMask.UniformFull;

View File

@@ -7,8 +7,6 @@ namespace Content.Client.Construction
[RegisterComponent] [RegisterComponent]
public class ConstructionGhostComponent : Component public class ConstructionGhostComponent : Component
{ {
public override string Name => "ConstructionGhost";
[ViewVariables] public ConstructionPrototype? Prototype { get; set; } [ViewVariables] public ConstructionPrototype? Prototype { get; set; }
[ViewVariables] public int GhostId { get; set; } [ViewVariables] public int GhostId { get; set; }
} }

View File

@@ -13,8 +13,6 @@ namespace Content.Client.Damage
[RegisterComponent] [RegisterComponent]
public class DamageVisualizerDataComponent : Component public class DamageVisualizerDataComponent : Component
{ {
public override string Name => "DamageVisualizerData";
public List<object> TargetLayerMapKeys = new(); public List<object> TargetLayerMapKeys = new();
public bool Disabled = false; public bool Disabled = false;
public bool Valid = true; public bool Valid = true;

View File

@@ -13,8 +13,6 @@ namespace Content.Client.DoAfter
[RegisterComponent] [RegisterComponent]
public sealed class DoAfterComponent : SharedDoAfterComponent public sealed class DoAfterComponent : SharedDoAfterComponent
{ {
public override string Name => "DoAfter";
public IReadOnlyDictionary<byte, ClientDoAfter> DoAfters => _doAfters; public IReadOnlyDictionary<byte, ClientDoAfter> DoAfters => _doAfters;
private readonly Dictionary<byte, ClientDoAfter> _doAfters = new(); private readonly Dictionary<byte, ClientDoAfter> _doAfters = new();

View File

@@ -32,8 +32,6 @@ namespace Content.Client.IconSmoothing
[DataField("mode")] [DataField("mode")]
private IconSmoothingMode _mode = IconSmoothingMode.Corners; private IconSmoothingMode _mode = IconSmoothingMode.Corners;
public override string Name => "IconSmooth";
internal ISpriteComponent? Sprite { get; private set; } internal ISpriteComponent? Sprite { get; private set; }
public (GridId, Vector2i)? LastPosition; public (GridId, Vector2i)? LastPosition;

View File

@@ -15,9 +15,6 @@ namespace Content.Client.Interactable.Components
private const float DefaultWidth = 1; private const float DefaultWidth = 1;
private const string ShaderInRange = "SelectionOutlineInrange"; private const string ShaderInRange = "SelectionOutlineInrange";
private const string ShaderOutOfRange = "SelectionOutline"; private const string ShaderOutOfRange = "SelectionOutline";
public override string Name => "InteractionOutline";
private bool _inRange; private bool _inRange;
private ShaderInstance? _shader; private ShaderInstance? _shader;
private int _lastRenderScale; private int _lastRenderScale;

View File

@@ -5,8 +5,5 @@ namespace Content.Client.Items.Components
[RegisterComponent] [RegisterComponent]
public class ItemStatusComponent : Component public class ItemStatusComponent : Component
{ {
public override string Name => "ItemStatus";
} }
} }

View File

@@ -7,8 +7,6 @@ namespace Content.Client.Markers
[RegisterComponent] [RegisterComponent]
public sealed class MarkerComponent : Component public sealed class MarkerComponent : Component
{ {
public override string Name => "Marker";
protected override void Startup() protected override void Startup()
{ {
base.Startup(); base.Startup();

View File

@@ -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. /// Spawns a set of entities on the client only, and removes them when this component is removed.
/// </summary> /// </summary>
[RegisterComponent] [RegisterComponent]
[ComponentProtoName("ClientEntitySpawner")]
public class ClientEntitySpawnerComponent : Component public class ClientEntitySpawnerComponent : Component
{ {
[Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IEntityManager _entMan = default!;
public override string Name => "ClientEntitySpawner";
[DataField("prototypes")] private List<string> _prototypes = new() { "HVDummyWire" }; [DataField("prototypes")] private List<string> _prototypes = new() { "HVDummyWire" };
private readonly List<EntityUid> _entity = new(); private readonly List<EntityUid> _entity = new();

View File

@@ -16,8 +16,6 @@ namespace Content.Client.Tools.Components
[RegisterComponent, Friend(typeof(ToolSystem), typeof(StatusControl))] [RegisterComponent, Friend(typeof(ToolSystem), typeof(StatusControl))]
public class WelderComponent : SharedWelderComponent, IItemStatus public class WelderComponent : SharedWelderComponent, IItemStatus
{ {
public override string Name => "Welder";
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
public bool UiUpdateNeeded { get; set; } public bool UiUpdateNeeded { get; set; }

View File

@@ -11,8 +11,6 @@ namespace Content.Client.Wall.Components
[ComponentReference(typeof(IconSmoothComponent))] [ComponentReference(typeof(IconSmoothComponent))]
public class ReinforcedWallComponent : IconSmoothComponent // whyyyyyyyyy public class ReinforcedWallComponent : IconSmoothComponent // whyyyyyyyyy
{ {
public override string Name => "ReinforcedWall";
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
[DataField("reinforcedBase")] [DataField("reinforcedBase")]
private string? _reinforcedStateBase = default; private string? _reinforcedStateBase = default;

View File

@@ -8,8 +8,6 @@ namespace Content.Client.Weapons.Melee.Components
[RegisterComponent] [RegisterComponent]
public sealed class MeleeLungeComponent : Component public sealed class MeleeLungeComponent : Component
{ {
public override string Name => "MeleeLunge";
private const float ResetTime = 0.3f; private const float ResetTime = 0.3f;
private const float BaseOffset = 0.25f; private const float BaseOffset = 0.25f;

View File

@@ -11,9 +11,6 @@ namespace Content.Client.Weapons.Melee.Components
public sealed class MeleeWeaponArcAnimationComponent : Component public sealed class MeleeWeaponArcAnimationComponent : Component
{ {
[Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IEntityManager _entMan = default!;
public override string Name => "MeleeWeaponArcAnimation";
private MeleeWeaponAnimationPrototype? _meleeWeaponAnimation; private MeleeWeaponAnimationPrototype? _meleeWeaponAnimation;
private float _timer; private float _timer;

View File

@@ -19,8 +19,6 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components
[NetworkedComponent()] [NetworkedComponent()]
public class ClientBatteryBarrelComponent : Component, IItemStatus public class ClientBatteryBarrelComponent : Component, IItemStatus
{ {
public override string Name => "BatteryBarrel";
private StatusControl? _statusControl; private StatusControl? _statusControl;
/// <summary> /// <summary>

View File

@@ -19,8 +19,6 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components
[NetworkedComponent()] [NetworkedComponent()]
public class ClientBoltActionBarrelComponent : Component, IItemStatus public class ClientBoltActionBarrelComponent : Component, IItemStatus
{ {
public override string Name => "BoltActionBarrel";
private StatusControl? _statusControl; private StatusControl? _statusControl;
/// <summary> /// <summary>

View File

@@ -67,9 +67,6 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components
} }
} }
}; };
public override string Name => "MagazineBarrel";
private StatusControl? _statusControl; private StatusControl? _statusControl;
/// <summary> /// <summary>

View File

@@ -19,8 +19,6 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components
[NetworkedComponent()] [NetworkedComponent()]
public class ClientPumpBarrelComponent : Component, IItemStatus public class ClientPumpBarrelComponent : Component, IItemStatus
{ {
public override string Name => "PumpBarrel";
private StatusControl? _statusControl; private StatusControl? _statusControl;
/// <summary> /// <summary>

View File

@@ -17,8 +17,6 @@ namespace Content.Client.Weapons.Ranged.Barrels.Components
[NetworkedComponent()] [NetworkedComponent()]
public class ClientRevolverBarrelComponent : Component, IItemStatus public class ClientRevolverBarrelComponent : Component, IItemStatus
{ {
public override string Name => "RevolverBarrel";
private StatusControl? _statusControl; private StatusControl? _statusControl;
/// <summary> /// <summary>

View File

@@ -392,8 +392,6 @@ namespace Content.IntegrationTests.Tests.Networking
[NetworkedComponent()] [NetworkedComponent()]
private sealed class PredictionTestComponent : Component private sealed class PredictionTestComponent : Component
{ {
public override string Name => "PredictionTest";
private bool _foo; private bool _foo;
public bool Foo public bool Foo

View File

@@ -18,8 +18,6 @@ namespace Content.Server.AI.Components
{ {
[DataField("logic")] private float _visionRadius = 8.0f; [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 // TODO: Need to ECS a lot more of the AI first before we can ECS this
/// <summary> /// <summary>
/// Whether the AI is actively iterated. /// Whether the AI is actively iterated.

View File

@@ -7,8 +7,6 @@ namespace Content.Server.AI.Components
[RegisterComponent] [RegisterComponent]
public sealed class AiFactionTagComponent : Component public sealed class AiFactionTagComponent : Component
{ {
public override string Name => "AiFactionTag";
[DataField("factions")] [DataField("factions")]
public Faction Factions { get; private set; } = Faction.None; public Faction Factions { get; private set; } = Faction.None;
} }

View File

@@ -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. // TODO: Need to split out the IMover stuff for NPC to a generic one that can be used for hoomans as well.
[RegisterComponent] [RegisterComponent]
[ComponentProtoName("UtilityAI")]
[ComponentReference(typeof(AiControllerComponent)), ComponentReference(typeof(IMoverComponent))] [ComponentReference(typeof(AiControllerComponent)), ComponentReference(typeof(IMoverComponent))]
public sealed class UtilityAi : AiControllerComponent, ISerializationHooks 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) // 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) // Also RepeatOperators (e.g. if we're following an entity keep repeating MoveToEntity)
private AiActionSystem _planner = default!; private AiActionSystem _planner = default!;

View File

@@ -6,8 +6,6 @@ namespace Content.Server.AME.Components
[RegisterComponent] [RegisterComponent]
public class AMEFuelContainerComponent : Component public class AMEFuelContainerComponent : Component
{ {
public override string Name => "AMEFuelContainer";
private int _fuelAmount; private int _fuelAmount;
private int _maxFuelAmount; private int _maxFuelAmount;

View File

@@ -25,8 +25,6 @@ namespace Content.Server.AME.Components
[Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly IServerEntityManager _serverEntityManager = default!; [Dependency] private readonly IServerEntityManager _serverEntityManager = default!;
public override string Name => "AMEPart";
[DataField("unwrapSound")] [DataField("unwrapSound")]
private SoundSpecifier _unwrapSound = new SoundPathSpecifier("/Audio/Effects/unwrap.ogg"); private SoundSpecifier _unwrapSound = new SoundPathSpecifier("/Audio/Effects/unwrap.ogg");

View File

@@ -9,8 +9,6 @@ namespace Content.Server.Access.Components
[RegisterComponent] [RegisterComponent]
public class PresetIdCardComponent : Component public class PresetIdCardComponent : Component
{ {
public override string Name => "PresetIdCard";
[DataField("job")] [DataField("job")]
public readonly string? JobName; public readonly string? JobName;
} }

View File

@@ -11,8 +11,6 @@ namespace Content.Server.Advertise
[RegisterComponent, Friend(typeof(AdvertiseSystem))] [RegisterComponent, Friend(typeof(AdvertiseSystem))]
public class AdvertiseComponent : Component public class AdvertiseComponent : Component
{ {
public override string Name => "Advertise";
/// <summary> /// <summary>
/// Minimum time in seconds to wait before saying a new ad, in seconds. Has to be larger than or equal to 1. /// Minimum time in seconds to wait before saying a new ad, in seconds. Has to be larger than or equal to 1.
/// </summary> /// </summary>

View File

@@ -13,8 +13,6 @@ namespace Content.Server.Animals.Components
[RegisterComponent, Friend(typeof(UdderSystem))] [RegisterComponent, Friend(typeof(UdderSystem))]
internal class UdderComponent : Component internal class UdderComponent : Component
{ {
public override string Name => "Udder";
/// <summary> /// <summary>
/// The reagent to produce. /// The reagent to produce.
/// </summary> /// </summary>

View File

@@ -20,9 +20,6 @@ namespace Content.Server.Arcade.Components
public class BlockGameArcadeComponent : Component, IActivate public class BlockGameArcadeComponent : Component, IActivate
{ {
[Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IRobustRandom _random = default!;
public override string Name => "BlockGameArcade";
[Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly IEntityManager _entityManager = default!;
private bool Powered => _entityManager.TryGetComponent<ApcPowerReceiverComponent>(Owner, out var powerReceiverComponent) && powerReceiverComponent.Powered; private bool Powered => _entityManager.TryGetComponent<ApcPowerReceiverComponent>(Owner, out var powerReceiverComponent) && powerReceiverComponent.Powered;

View File

@@ -7,8 +7,6 @@ namespace Content.Server.Armor
[RegisterComponent] [RegisterComponent]
public class ArmorComponent : Component public class ArmorComponent : Component
{ {
public override string Name => "Armor";
[DataField("modifiers", required: true)] [DataField("modifiers", required: true)]
public DamageModifierSet Modifiers = default!; public DamageModifierSet Modifiers = default!;
} }

View File

@@ -13,8 +13,6 @@ namespace Content.Server.Atmos.Components
[RegisterComponent] [RegisterComponent]
public class AirtightComponent : Component public class AirtightComponent : Component
{ {
public override string Name => "Airtight";
public (GridId Grid, Vector2i Tile) LastPosition { get; set; } public (GridId Grid, Vector2i Tile) LastPosition { get; set; }
[DataField("airBlockedDirection", customTypeSerializer: typeof(FlagSerializer<AtmosDirectionFlags>))] [DataField("airBlockedDirection", customTypeSerializer: typeof(FlagSerializer<AtmosDirectionFlags>))]

View File

@@ -9,6 +9,5 @@ namespace Content.Server.Atmos.Components
[RegisterComponent] [RegisterComponent]
public class AtmosExposedComponent : Component public class AtmosExposedComponent : Component
{ {
public override string Name => "AtmosExposed";
} }
} }

View File

@@ -9,8 +9,6 @@ namespace Content.Server.Atmos.Components
[RegisterComponent] [RegisterComponent]
public class AtmosFixMarkerComponent : Component public class AtmosFixMarkerComponent : Component
{ {
public override string Name => "AtmosFixMarker";
// See FixGridAtmos for more details // See FixGridAtmos for more details
[DataField("mode")] [DataField("mode")]
public int Mode { get; set; } = 0; public int Mode { get; set; } = 0;

View File

@@ -12,8 +12,6 @@ namespace Content.Server.Atmos.Components
[RegisterComponent] [RegisterComponent]
public class BarotraumaComponent : Component public class BarotraumaComponent : Component
{ {
public override string Name => "Barotrauma";
[DataField("damage", required: true)] [DataField("damage", required: true)]
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
public DamageSpecifier Damage = default!; public DamageSpecifier Damage = default!;

View File

@@ -12,6 +12,7 @@ namespace Content.Server.Atmos.Components
/// Used in internals as breath tool. /// Used in internals as breath tool.
/// </summary> /// </summary>
[RegisterComponent] [RegisterComponent]
[ComponentProtoName("BreathMask")]
public class BreathToolComponent : Component public class BreathToolComponent : Component
{ {
[Dependency] private readonly IEntityManager _entities = default!; [Dependency] private readonly IEntityManager _entities = default!;
@@ -21,8 +22,6 @@ namespace Content.Server.Atmos.Components
/// </summary> /// </summary>
[DataField("allowedSlots")] [DataField("allowedSlots")]
public SlotFlags AllowedSlots = SlotFlags.MASK; public SlotFlags AllowedSlots = SlotFlags.MASK;
public override string Name => "BreathMask";
public bool IsFunctional; public bool IsFunctional;
public EntityUid ConnectedInternalsEntity; public EntityUid ConnectedInternalsEntity;

View File

@@ -10,8 +10,6 @@ namespace Content.Server.Atmos.Components
[RegisterComponent] [RegisterComponent]
public class FlammableComponent : Component public class FlammableComponent : Component
{ {
public override string Name => "Flammable";
[ViewVariables] [ViewVariables]
public bool Resisting = false; public bool Resisting = false;

View File

@@ -7,8 +7,6 @@ namespace Content.Server.Atmos.Components
[RegisterComponent] [RegisterComponent]
public class GasMixtureHolderComponent : Component, IGasMixtureHolder public class GasMixtureHolderComponent : Component, IGasMixtureHolder
{ {
public override string Name => "GasMixtureHolder";
[ViewVariables] [DataField("air")] public GasMixture Air { get; set; } = new GasMixture(); [ViewVariables] [DataField("air")] public GasMixture Air { get; set; } = new GasMixture();
} }
} }

View File

@@ -36,8 +36,6 @@ namespace Content.Server.Atmos.Components
{ {
[Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IEntityManager _entMan = default!;
public override string Name => "GasTank";
private const float MaxExplosionRange = 14f; private const float MaxExplosionRange = 14f;
private const float DefaultOutputPressure = Atmospherics.OneAtmosphere; private const float DefaultOutputPressure = Atmospherics.OneAtmosphere;

View File

@@ -20,8 +20,6 @@ namespace Content.Server.Atmos.Components
[RegisterComponent, Serializable] [RegisterComponent, Serializable]
public class GridAtmosphereComponent : Component, IAtmosphereComponent, ISerializationHooks public class GridAtmosphereComponent : Component, IAtmosphereComponent, ISerializationHooks
{ {
public override string Name => "GridAtmosphere";
public virtual bool Simulated => true; public virtual bool Simulated => true;
[ViewVariables] [ViewVariables]

View File

@@ -11,9 +11,7 @@ namespace Content.Server.Atmos.Components
[RegisterComponent] [RegisterComponent]
public class IgniteOnCollideComponent : Component public class IgniteOnCollideComponent : Component
{ {
public override string Name => "IgniteOnCollide";
[DataField("fireStacks")] [DataField("fireStacks")]
public float FireStacks { get; set; } public float FireStacks { get; set; }
} }
} }

View File

@@ -20,8 +20,6 @@ namespace Content.Server.Atmos.Components
[Dependency] private readonly IRobustRandom _robustRandom = default!; [Dependency] private readonly IRobustRandom _robustRandom = default!;
[Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IEntityManager _entMan = default!;
public override string Name => "MovedByPressure";
private const float MoveForcePushRatio = 1f; private const float MoveForcePushRatio = 1f;
private const float MoveForceForcePushRatio = 1f; private const float MoveForceForcePushRatio = 1f;
private const float ProbabilityOffset = 25f; private const float ProbabilityOffset = 25f;

View File

@@ -7,8 +7,6 @@ namespace Content.Server.Atmos.Components
[RegisterComponent] [RegisterComponent]
public class PressureProtectionComponent : Component public class PressureProtectionComponent : Component
{ {
public override string Name => "PressureProtection";
[DataField("highPressureMultiplier")] [DataField("highPressureMultiplier")]
public float HighPressureMultiplier { get; } = 1f; public float HighPressureMultiplier { get; } = 1f;

View File

@@ -6,8 +6,6 @@ namespace Content.Server.Atmos.Components
[ComponentReference(typeof(IAtmosphereComponent))] [ComponentReference(typeof(IAtmosphereComponent))]
public class SpaceAtmosphereComponent : Component, IAtmosphereComponent public class SpaceAtmosphereComponent : Component, IAtmosphereComponent
{ {
public override string Name => "SpaceAtmosphere";
public bool Simulated => false; public bool Simulated => false;
} }
} }

View File

@@ -7,8 +7,6 @@ namespace Content.Server.Atmos.Components;
[RegisterComponent] [RegisterComponent]
public class TemperatureProtectionComponent : Component public class TemperatureProtectionComponent : Component
{ {
public override string Name => "TemperatureProtection";
/// <summary> /// <summary>
/// How much to multiply temperature deltas by. /// How much to multiply temperature deltas by.
/// </summary> /// </summary>

View File

@@ -12,8 +12,6 @@ namespace Content.Server.Atmos.Components
[Serializable] [Serializable]
public class UnsimulatedGridAtmosphereComponent : GridAtmosphereComponent public class UnsimulatedGridAtmosphereComponent : GridAtmosphereComponent
{ {
public override string Name => "UnsimulatedGridAtmosphere";
public override bool Simulated => false; public override bool Simulated => false;
} }
} }

View File

@@ -29,8 +29,6 @@ namespace Content.Server.Atmos.Monitor.Components
// Remember to null this afterwards. // Remember to null this afterwards.
[ViewVariables] public IAirAlarmModeUpdate? CurrentModeUpdater { get; set; } [ViewVariables] public IAirAlarmModeUpdate? CurrentModeUpdater { get; set; }
public override string Name => "AirAlarm";
public Dictionary<string, IAtmosDeviceData> DeviceData = new(); public Dictionary<string, IAtmosDeviceData> DeviceData = new();
public HashSet<NetUserId> ActivePlayers = new(); public HashSet<NetUserId> ActivePlayers = new();

View File

@@ -28,8 +28,6 @@ namespace Content.Server.Atmos.Monitor.Components
[RegisterComponent] [RegisterComponent]
public class AtmosAlarmableComponent : Component public class AtmosAlarmableComponent : Component
{ {
public override string Name => "AtmosAlarmable";
[ViewVariables] [ViewVariables]
public List<EntityUid> LinkedMonitors { get; set; } = new(); public List<EntityUid> LinkedMonitors { get; set; } = new();

View File

@@ -14,8 +14,6 @@ namespace Content.Server.Atmos.Monitor.Components
[RegisterComponent] [RegisterComponent]
public class AtmosMonitorComponent : Component public class AtmosMonitorComponent : Component
{ {
public override string Name => "AtmosMonitor";
// Whether this monitor can send alarms, // Whether this monitor can send alarms,
// or recieve atmos command events. // or recieve atmos command events.
// //

View File

@@ -24,9 +24,6 @@ namespace Content.Server.Atmos.Monitor.Components
[Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IEntityManager _entMan = default!;
private AtmosMonitorSystem? _atmosMonitorSystem; private AtmosMonitorSystem? _atmosMonitorSystem;
public override string Name => "FireAlarm";
private CancellationTokenSource _powerPulsedCancel = new(); private CancellationTokenSource _powerPulsedCancel = new();
private int PowerPulsedTimeout = 30; private int PowerPulsedTimeout = 30;

View File

@@ -10,8 +10,6 @@ namespace Content.Server.Atmos.Piping.Binary.Components
[RegisterComponent] [RegisterComponent]
public class GasDualPortVentPumpComponent : Component public class GasDualPortVentPumpComponent : Component
{ {
public override string Name => "GasDualPortVentPump";
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
public bool Enabled { get; set; } = true; public bool Enabled { get; set; } = true;

View File

@@ -8,8 +8,6 @@ namespace Content.Server.Atmos.Piping.Binary.Components
[RegisterComponent] [RegisterComponent]
public class GasPassiveGateComponent : Component public class GasPassiveGateComponent : Component
{ {
public override string Name => "GasPassiveGate";
[DataField("enabled")] [DataField("enabled")]
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
public bool Enabled { get; set; } = true; public bool Enabled { get; set; } = true;

View File

@@ -7,8 +7,6 @@ namespace Content.Server.Atmos.Piping.Binary.Components
[RegisterComponent] [RegisterComponent]
public class GasPortComponent : Component public class GasPortComponent : Component
{ {
public override string Name => "GasPort";
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
[DataField("pipe")] [DataField("pipe")]
public string PipeName { get; set; } = "connected"; public string PipeName { get; set; } = "connected";

View File

@@ -8,8 +8,6 @@ namespace Content.Server.Atmos.Piping.Binary.Components
[RegisterComponent] [RegisterComponent]
public class GasPressurePumpComponent : Component public class GasPressurePumpComponent : Component
{ {
public override string Name => "GasPressurePump";
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
public bool Enabled { get; set; } = true; public bool Enabled { get; set; } = true;

View File

@@ -8,8 +8,6 @@ namespace Content.Server.Atmos.Piping.Binary.Components
[RegisterComponent] [RegisterComponent]
public class GasValveComponent : Component public class GasValveComponent : Component
{ {
public override string Name => "GasValve";
[ViewVariables] [ViewVariables]
[DataField("open")] [DataField("open")]
public bool Open { get; set; } = true; public bool Open { get; set; } = true;

View File

@@ -8,8 +8,6 @@ namespace Content.Server.Atmos.Piping.Binary.Components
[RegisterComponent] [RegisterComponent]
public class GasVolumePumpComponent : Component public class GasVolumePumpComponent : Component
{ {
public override string Name => "GasVolumePump";
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
public bool Enabled { get; set; } = true; public bool Enabled { get; set; } = true;

View File

@@ -13,8 +13,6 @@ namespace Content.Server.Atmos.Piping.Components
[RegisterComponent] [RegisterComponent]
public class AtmosDeviceComponent : Component public class AtmosDeviceComponent : Component
{ {
public override string Name => "AtmosDevice";
/// <summary> /// <summary>
/// Whether this device requires being anchored to join an atmosphere. /// Whether this device requires being anchored to join an atmosphere.
/// </summary> /// </summary>

View File

@@ -10,8 +10,6 @@ namespace Content.Server.Atmos.Piping.Components
[RegisterComponent] [RegisterComponent]
public class AtmosPipeColorComponent : Component public class AtmosPipeColorComponent : Component
{ {
public override string Name => "AtmosPipeColor";
[DataField("color")] [DataField("color")]
public Color Color { get; set; } = Color.White; public Color Color { get; set; } = Color.White;

View File

@@ -7,8 +7,6 @@ namespace Content.Server.Atmos.Piping.Components
[RegisterComponent] [RegisterComponent]
public class AtmosUnsafeUnanchorComponent : Component public class AtmosUnsafeUnanchorComponent : Component
{ {
public override string Name => "AtmosUnsafeUnanchor";
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
[DataField("enabled")] [DataField("enabled")]
public bool Enabled { get; set; } = true; public bool Enabled { get; set; } = true;

View File

@@ -8,8 +8,6 @@ namespace Content.Server.Atmos.Piping.Other.Components
[RegisterComponent] [RegisterComponent]
public class GasMinerComponent : Component public class GasMinerComponent : Component
{ {
public override string Name => "GasMiner";
public bool Enabled { get; set; } = true; public bool Enabled { get; set; } = true;
public bool Broken { get; set; } = false; public bool Broken { get; set; } = false;

View File

@@ -10,8 +10,6 @@ namespace Content.Server.Atmos.Piping.Trinary.Components
[RegisterComponent] [RegisterComponent]
public class GasFilterComponent : Component public class GasFilterComponent : Component
{ {
public override string Name => "GasFilter";
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
public bool Enabled { get; set; } = true; public bool Enabled { get; set; } = true;

View File

@@ -8,8 +8,6 @@ namespace Content.Server.Atmos.Piping.Trinary.Components
[RegisterComponent] [RegisterComponent]
public class GasMixerComponent : Component public class GasMixerComponent : Component
{ {
public override string Name => "GasMixer";
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
public bool Enabled = true; public bool Enabled = true;

View File

@@ -8,8 +8,6 @@ namespace Content.Server.Atmos.Piping.Unary.Components
[RegisterComponent] [RegisterComponent]
public class GasCanisterComponent : Component public class GasCanisterComponent : Component
{ {
public override string Name => "GasCanister";
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
[DataField("port")] [DataField("port")]
public string PortName { get; set; } = "port"; public string PortName { get; set; } = "port";

View File

@@ -7,7 +7,6 @@ namespace Content.Server.Atmos.Piping.Unary.Components
[RegisterComponent] [RegisterComponent]
public class GasOutletInjectorComponent : Component public class GasOutletInjectorComponent : Component
{ {
public override string Name => "GasOutletInjector";
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
public bool Enabled { get; set; } = true; public bool Enabled { get; set; } = true;

View File

@@ -6,8 +6,6 @@ namespace Content.Server.Atmos.Piping.Unary.Components
[RegisterComponent] [RegisterComponent]
public class GasPassiveVentComponent : Component public class GasPassiveVentComponent : Component
{ {
public override string Name => "GasPassiveVent";
[DataField("inlet")] [DataField("inlet")]
public string InletName = "pipe"; public string InletName = "pipe";
} }

View File

@@ -7,8 +7,6 @@ namespace Content.Server.Atmos.Piping.Unary.Components
[RegisterComponent] [RegisterComponent]
public class GasPortableComponent : Component public class GasPortableComponent : Component
{ {
public override string Name => "GasPortable";
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
[DataField("port")] [DataField("port")]
public string PortName { get; set; } = "port"; public string PortName { get; set; } = "port";

View File

@@ -13,8 +13,6 @@ namespace Content.Server.Atmos.Piping.Unary.Components
[RegisterComponent] [RegisterComponent]
public class GasThermoMachineComponent : Component, IRefreshParts, ISerializationHooks public class GasThermoMachineComponent : Component, IRefreshParts, ISerializationHooks
{ {
public override string Name => "GasThermoMachine";
[DataField("inlet")] [DataField("inlet")]
public string InletName { get; set; } = "pipe"; public string InletName { get; set; } = "pipe";

View File

@@ -10,8 +10,6 @@ namespace Content.Server.Atmos.Piping.Unary.Components
[RegisterComponent] [RegisterComponent]
public class GasVentPumpComponent : Component public class GasVentPumpComponent : Component
{ {
public override string Name => "GasVentPump";
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
public bool Enabled { get; set; } = true; public bool Enabled { get; set; } = true;

View File

@@ -11,8 +11,6 @@ namespace Content.Server.Atmos.Piping.Unary.Components
[RegisterComponent] [RegisterComponent]
public class GasVentScrubberComponent : Component public class GasVentScrubberComponent : Component
{ {
public override string Name => "GasVentScrubber";
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
public bool Enabled { get; set; } = true; public bool Enabled { get; set; } = true;

View File

@@ -9,6 +9,5 @@ namespace Content.Server.Audio
[RegisterComponent] [RegisterComponent]
public class AmbientOnPoweredComponent : Component public class AmbientOnPoweredComponent : Component
{ {
public override string Name => "AmbientOnPowered";
} }
} }

View File

@@ -7,8 +7,6 @@ namespace Content.Server.BarSign
[RegisterComponent] [RegisterComponent]
public class BarSignComponent : Component public class BarSignComponent : Component
{ {
public override string Name => "BarSign";
[DataField("current")] [DataField("current")]
[ViewVariables(VVAccess.ReadOnly)] [ViewVariables(VVAccess.ReadOnly)]
public string? CurrentSign; public string? CurrentSign;

View File

@@ -13,8 +13,6 @@ namespace Content.Server.Body.Components
[RegisterComponent, Friend(typeof(BloodstreamSystem))] [RegisterComponent, Friend(typeof(BloodstreamSystem))]
public class BloodstreamComponent : Component, IGasMixtureHolder public class BloodstreamComponent : Component, IGasMixtureHolder
{ {
public override string Name => "Bloodstream";
/// <summary> /// <summary>
/// Max volume of internal solution storage /// Max volume of internal solution storage
/// </summary> /// </summary>

View File

@@ -7,6 +7,5 @@ namespace Content.Server.Body.Components
[RegisterComponent, Friend(typeof(BrainSystem))] [RegisterComponent, Friend(typeof(BrainSystem))]
public class BrainComponent : Component public class BrainComponent : Component
{ {
public override string Name => "Brain";
} }
} }

View File

@@ -10,7 +10,6 @@ namespace Content.Server.Body.Components
{ {
[Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IEntityManager _entMan = default!;
public override string Name => "Internals";
[ViewVariables] public EntityUid? GasTankEntity { get; set; } [ViewVariables] public EntityUid? GasTankEntity { get; set; }
[ViewVariables] public EntityUid? BreathToolEntity { get; set; } [ViewVariables] public EntityUid? BreathToolEntity { get; set; }

View File

@@ -12,8 +12,6 @@ namespace Content.Server.Body.Components;
[RegisterComponent, Friend(typeof(LungSystem))] [RegisterComponent, Friend(typeof(LungSystem))]
public class LungComponent : Component public class LungComponent : Component
{ {
public override string Name => "Lung";
public float AccumulatedFrametime; public float AccumulatedFrametime;
[ViewVariables] [ViewVariables]

View File

@@ -17,8 +17,6 @@ namespace Content.Server.Body.Components
[RegisterComponent, Friend(typeof(MetabolizerSystem))] [RegisterComponent, Friend(typeof(MetabolizerSystem))]
public class MetabolizerComponent : Component public class MetabolizerComponent : Component
{ {
public override string Name => "Metabolizer";
public float AccumulatedFrametime = 0.0f; public float AccumulatedFrametime = 0.0f;
/// <summary> /// <summary>

View File

@@ -12,8 +12,6 @@ namespace Content.Server.Body.Components
[RegisterComponent, Friend(typeof(RespiratorSystem))] [RegisterComponent, Friend(typeof(RespiratorSystem))]
public class RespiratorComponent : Component public class RespiratorComponent : Component
{ {
public override string Name => "Respirator";
[ViewVariables] [ViewVariables]
[DataField("needsGases")] [DataField("needsGases")]
public Dictionary<Gas, float> NeedsGases { get; set; } = new(); public Dictionary<Gas, float> NeedsGases { get; set; } = new();

View File

@@ -12,8 +12,6 @@ namespace Content.Server.Body.Components
[RegisterComponent, Friend(typeof(StomachSystem))] [RegisterComponent, Friend(typeof(StomachSystem))]
public class StomachComponent : Component public class StomachComponent : Component
{ {
public override string Name => "Stomach";
public float AccumulatedFrameTime; public float AccumulatedFrameTime;
/// <summary> /// <summary>

View File

@@ -10,8 +10,6 @@ namespace Content.Server.Body.Components;
[Friend(typeof(ThermalRegulatorSystem))] [Friend(typeof(ThermalRegulatorSystem))]
public class ThermalRegulatorComponent : Component public class ThermalRegulatorComponent : Component
{ {
public override string Name => "ThermalRegulator";
/// <summary> /// <summary>
/// Heat generated due to metabolism. It's generated via metabolism /// Heat generated due to metabolism. It's generated via metabolism
/// </summary> /// </summary>

View File

@@ -11,8 +11,6 @@ namespace Content.Server.Botany.Components
[RegisterComponent] [RegisterComponent]
public class LogComponent : Component, IInteractUsing public class LogComponent : Component, IInteractUsing
{ {
public override string Name => "Log";
async Task<bool> IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs) async Task<bool> IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs)
{ {
if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(eventArgs.User)) if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(eventArgs.User))

View File

@@ -47,8 +47,6 @@ namespace Content.Server.Botany.Components
[Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IEntityManager _entMan = default!;
public override string Name => "PlantHolder";
[ViewVariables] private int _lastProduce; [ViewVariables] private int _lastProduce;
[ViewVariables(VVAccess.ReadWrite)] private int _missingGas; [ViewVariables(VVAccess.ReadWrite)] private int _missingGas;

View File

@@ -16,7 +16,6 @@ namespace Content.Server.Botany.Components
[RegisterComponent] [RegisterComponent]
public class ProduceComponent : Component, ISerializationHooks public class ProduceComponent : Component, ISerializationHooks
{ {
public override string Name => "Produce";
[DataField("targetSolution")] public string SolutionName { get; set; } = "food"; [DataField("targetSolution")] public string SolutionName { get; set; } = "food";
[DataField("seed")] private string? _seedName; [DataField("seed")] private string? _seedName;

View File

@@ -14,8 +14,6 @@ namespace Content.Server.Botany.Components
public class SeedComponent : Component, IExamine public class SeedComponent : Component, IExamine
#pragma warning restore 618 #pragma warning restore 618
{ {
public override string Name => "Seed";
[DataField("seed")] [DataField("seed")]
private string? _seedName; private string? _seedName;

View File

@@ -15,8 +15,6 @@ namespace Content.Server.Botany.Components
[Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IEntityManager _entMan = default!;
[Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IRobustRandom _random = default!;
public override string Name => "SeedExtractor";
// TODO: Upgradeable machines. // TODO: Upgradeable machines.
private int _minSeeds = 1; private int _minSeeds = 1;
private int _maxSeeds = 4; private int _maxSeeds = 4;

View File

@@ -12,8 +12,6 @@ namespace Content.Server.Cabinet
[RegisterComponent] [RegisterComponent]
public class ItemCabinetComponent : Component public class ItemCabinetComponent : Component
{ {
public override string Name => "ItemCabinet";
/// <summary> /// <summary>
/// Sound to be played when the cabinet door is opened. /// Sound to be played when the cabinet door is opened.
/// </summary> /// </summary>

View File

@@ -27,7 +27,6 @@ namespace Content.Server.Cargo.Components
{ {
[Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IEntityManager _entMan = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
public override string Name => "CargoTelepad";
private const float TeleportDuration = 0.5f; private const float TeleportDuration = 0.5f;
private const float TeleportDelay = 15f; private const float TeleportDelay = 15f;

View File

@@ -16,7 +16,6 @@ namespace Content.Server.Chemistry.Components
{ {
[Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IEntityManager _entMan = default!;
public override string Name => "FoamSolutionAreaEffect";
public new const string SolutionName = "solutionArea"; public new const string SolutionName = "solutionArea";
[DataField("foamedMetalPrototype")] private string? _foamedMetalPrototype; [DataField("foamedMetalPrototype")] private string? _foamedMetalPrototype;

View File

@@ -10,8 +10,6 @@ namespace Content.Server.Chemistry.Components
[RegisterComponent] [RegisterComponent]
public class MeleeChemicalInjectorComponent : Component public class MeleeChemicalInjectorComponent : Component
{ {
public override string Name => "MeleeChemicalInjector";
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
[DataField("transferAmount")] [DataField("transferAmount")]
public FixedPoint2 TransferAmount { get; set; } = FixedPoint2.New(1); public FixedPoint2 TransferAmount { get; set; } = FixedPoint2.New(1);

View File

@@ -10,8 +10,6 @@ namespace Content.Server.Chemistry.Components
[RegisterComponent] [RegisterComponent]
public class ReagentTankComponent : Component public class ReagentTankComponent : Component
{ {
public override string Name => "ReagentTank";
[DataField("transferAmount")] [DataField("transferAmount")]
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
public FixedPoint2 TransferAmount { get; set; } = FixedPoint2.New(10); public FixedPoint2 TransferAmount { get; set; } = FixedPoint2.New(10);

View File

@@ -11,8 +11,6 @@ namespace Content.Server.Chemistry.Components
[RegisterComponent] [RegisterComponent]
public class RehydratableComponent : Component public class RehydratableComponent : Component
{ {
public override string Name => "Rehydratable";
[ViewVariables] [ViewVariables]
[DataField("catalyst")] [DataField("catalyst")]
internal string CatalystPrototype = "Water"; internal string CatalystPrototype = "Water";

View File

@@ -16,7 +16,6 @@ namespace Content.Server.Chemistry.Components
{ {
[Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IEntityManager _entMan = default!;
public override string Name => "SmokeSolutionAreaEffect";
public new const string SolutionName = "solutionArea"; public new const string SolutionName = "solutionArea";
protected override void UpdateVisuals() protected override void UpdateVisuals()

View File

@@ -13,8 +13,6 @@ namespace Content.Server.Chemistry.Components
[RegisterComponent] [RegisterComponent]
public class SolutionAreaEffectInceptionComponent : Component public class SolutionAreaEffectInceptionComponent : Component
{ {
public override string Name => "AreaEffectInception";
private const float ReactionDelay = 1.5f; private const float ReactionDelay = 1.5f;
private readonly HashSet<SolutionAreaEffectComponent> _group = new(); private readonly HashSet<SolutionAreaEffectComponent> _group = new();

View File

@@ -13,7 +13,6 @@ namespace Content.Server.Chemistry.Components
[RegisterComponent] [RegisterComponent]
internal sealed class SolutionInjectOnCollideComponent : Component internal sealed class SolutionInjectOnCollideComponent : Component
{ {
public override string Name => "SolutionInjectOnCollide";
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
[DataField("transferAmount")] [DataField("transferAmount")]

View File

@@ -11,8 +11,6 @@ namespace Content.Server.Chemistry.Components.SolutionManager
[RegisterComponent] [RegisterComponent]
public class DrainableSolutionComponent : Component public class DrainableSolutionComponent : Component
{ {
public override string Name => "DrainableSolution";
/// <summary> /// <summary>
/// Solution name that can be drained. /// Solution name that can be drained.
/// </summary> /// </summary>

View File

@@ -10,8 +10,6 @@ namespace Content.Server.Chemistry.Components.SolutionManager
[RegisterComponent] [RegisterComponent]
public class DrawableSolutionComponent : Component public class DrawableSolutionComponent : Component
{ {
public override string Name => "DrawableSolution";
/// <summary> /// <summary>
/// Solution name that can be removed with syringes. /// Solution name that can be removed with syringes.
/// </summary> /// </summary>

View File

@@ -7,8 +7,6 @@ namespace Content.Server.Chemistry.Components.SolutionManager
[RegisterComponent] [RegisterComponent]
public class ExaminableSolutionComponent: Component public class ExaminableSolutionComponent: Component
{ {
public override string Name => "ExaminableSolution";
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
[DataField("solution")] [DataField("solution")]
public string Solution { get; set; } = "default"; public string Solution { get; set; } = "default";

View File

@@ -10,7 +10,6 @@ namespace Content.Server.Chemistry.Components.SolutionManager
[RegisterComponent] [RegisterComponent]
public class InjectableSolutionComponent : Component public class InjectableSolutionComponent : Component
{ {
public override string Name => "InjectableSolution";
/// <summary> /// <summary>
/// Solution name which can be added with syringes. /// Solution name which can be added with syringes.

Some files were not shown because too many files have changed in this diff Show More