Fix a bunch of compiler warnings (#10518)
This commit is contained in:
@@ -13,8 +13,7 @@ namespace Content.Client.Atmos.EntitySystems;
|
|||||||
public sealed class AtmosPipeAppearanceSystem : EntitySystem
|
public sealed class AtmosPipeAppearanceSystem : EntitySystem
|
||||||
{
|
{
|
||||||
[Dependency] private readonly IResourceCache _resCache = default!;
|
[Dependency] private readonly IResourceCache _resCache = default!;
|
||||||
[Dependency] private readonly SubFloorHideSystem _subfloorSys = default!;
|
|
||||||
|
|
||||||
public override void Initialize()
|
public override void Initialize()
|
||||||
{
|
{
|
||||||
base.Initialize();
|
base.Initialize();
|
||||||
@@ -65,7 +64,7 @@ public sealed class AtmosPipeAppearanceSystem : EntitySystem
|
|||||||
|
|
||||||
// transform connected directions to local-coordinates
|
// transform connected directions to local-coordinates
|
||||||
var connectedDirections = worldConnectedDirections.RotatePipeDirection(-Transform(uid).LocalRotation);
|
var connectedDirections = worldConnectedDirections.RotatePipeDirection(-Transform(uid).LocalRotation);
|
||||||
|
|
||||||
foreach (PipeConnectionLayer layerKey in Enum.GetValues(typeof(PipeConnectionLayer)))
|
foreach (PipeConnectionLayer layerKey in Enum.GetValues(typeof(PipeConnectionLayer)))
|
||||||
{
|
{
|
||||||
if (!args.Sprite.LayerMapTryGet(layerKey, out var key))
|
if (!args.Sprite.LayerMapTryGet(layerKey, out var key))
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ namespace Content.Client.Atmos.Monitor
|
|||||||
[DataField("setOnDepowered")]
|
[DataField("setOnDepowered")]
|
||||||
private readonly Dictionary<string, string>? _setOnDepowered;
|
private readonly Dictionary<string, string>? _setOnDepowered;
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to your component being initialised instead.")]
|
||||||
public override void InitializeEntity(EntityUid entity)
|
public override void InitializeEntity(EntityUid entity)
|
||||||
{
|
{
|
||||||
base.InitializeEntity(entity);
|
base.InitializeEntity(entity);
|
||||||
@@ -33,6 +34,7 @@ namespace Content.Client.Atmos.Monitor
|
|||||||
IoCManager.InjectDependencies(this);
|
IoCManager.InjectDependencies(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
if (!_entityManager.TryGetComponent<SpriteComponent>(component.Owner, out var sprite))
|
if (!_entityManager.TryGetComponent<SpriteComponent>(component.Owner, out var sprite))
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ namespace Content.Client.Audio
|
|||||||
[Dependency] private readonly IBaseClient _client = default!;
|
[Dependency] private readonly IBaseClient _client = default!;
|
||||||
[Dependency] private readonly IConfigurationManager _configManager = default!;
|
[Dependency] private readonly IConfigurationManager _configManager = default!;
|
||||||
[Dependency] private readonly IGameTiming _timing = default!;
|
[Dependency] private readonly IGameTiming _timing = default!;
|
||||||
[Dependency] private readonly IMapManager _mapManager = default!;
|
|
||||||
[Dependency] private readonly IPlayerManager _playMan = default!;
|
[Dependency] private readonly IPlayerManager _playMan = default!;
|
||||||
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
|
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
|
||||||
[Dependency] private readonly IRobustRandom _robustRandom = default!;
|
[Dependency] private readonly IRobustRandom _robustRandom = default!;
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ namespace Content.Client.Buckle
|
|||||||
[UsedImplicitly]
|
[UsedImplicitly]
|
||||||
public sealed class BuckleVisualizer : AppearanceVisualizer
|
public sealed class BuckleVisualizer : AppearanceVisualizer
|
||||||
{
|
{
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
if (!component.TryGetData<bool>(BuckleVisuals.Buckled, out var buckled) ||
|
if (!component.TryGetData<bool>(BuckleVisuals.Buckled, out var buckled) ||
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ namespace Content.Client.Chemistry.Visualizers
|
|||||||
flick.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame(_state, 0f));
|
flick.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame(_state, 0f));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ namespace Content.Client.Chemistry.Visualizers
|
|||||||
[UsedImplicitly]
|
[UsedImplicitly]
|
||||||
public sealed class SmokeVisualizer : AppearanceVisualizer
|
public sealed class SmokeVisualizer : AppearanceVisualizer
|
||||||
{
|
{
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ namespace Content.Client.Chemistry.Visualizers
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ namespace Content.Client.CloningConsole.UI
|
|||||||
[GenerateTypedNameReferences]
|
[GenerateTypedNameReferences]
|
||||||
public partial class CloningConsoleWindow : DefaultWindow
|
public partial class CloningConsoleWindow : DefaultWindow
|
||||||
{
|
{
|
||||||
[Dependency] private readonly IGameTiming _timing = default!;
|
|
||||||
public CloningConsoleWindow()
|
public CloningConsoleWindow()
|
||||||
{
|
{
|
||||||
IoCManager.InjectDependencies(this);
|
IoCManager.InjectDependencies(this);
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ namespace Content.Client.Computer
|
|||||||
private string BodyBrokenState = "broken";
|
private string BodyBrokenState = "broken";
|
||||||
private string ScreenBroken = "computer_broken";
|
private string ScreenBroken = "computer_broken";
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to your component being initialised instead.")]
|
||||||
public override void InitializeEntity(EntityUid entity)
|
public override void InitializeEntity(EntityUid entity)
|
||||||
{
|
{
|
||||||
base.InitializeEntity(entity);
|
base.InitializeEntity(entity);
|
||||||
@@ -35,6 +36,7 @@ namespace Content.Client.Computer
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ namespace Content.Client.Construction
|
|||||||
[UsedImplicitly]
|
[UsedImplicitly]
|
||||||
public sealed class MachineFrameVisualizer : AppearanceVisualizer
|
public sealed class MachineFrameVisualizer : AppearanceVisualizer
|
||||||
{
|
{
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -24,8 +24,6 @@ public sealed partial class CrewManifestUi : DefaultWindow
|
|||||||
|
|
||||||
private readonly CrewManifestSystem _crewManifestSystem;
|
private readonly CrewManifestSystem _crewManifestSystem;
|
||||||
|
|
||||||
private EntityUid? _station;
|
|
||||||
|
|
||||||
public CrewManifestUi()
|
public CrewManifestUi()
|
||||||
{
|
{
|
||||||
RobustXamlLoader.Load(this);
|
RobustXamlLoader.Load(this);
|
||||||
|
|||||||
@@ -195,6 +195,11 @@ namespace Content.Client.Damage
|
|||||||
public readonly string? Color;
|
public readonly string? Color;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes an entity to be managed by this appearance controller.
|
||||||
|
/// DO NOT assume this is your only entity. Visualizers are shared.
|
||||||
|
/// </summary>
|
||||||
|
[Obsolete("Subscribe to your component being initialised instead.")]
|
||||||
public override void InitializeEntity(EntityUid entity)
|
public override void InitializeEntity(EntityUid entity)
|
||||||
{
|
{
|
||||||
base.InitializeEntity(entity);
|
base.InitializeEntity(entity);
|
||||||
@@ -492,6 +497,7 @@ namespace Content.Client.Damage
|
|||||||
spriteComponent.LayerSetVisible(newLayer, false);
|
spriteComponent.LayerSetVisible(newLayer, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
var entities = _entityManager;
|
var entities = _entityManager;
|
||||||
|
|||||||
@@ -141,6 +141,7 @@ namespace Content.Client.Disposal.Visualizers
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to your component being initialised instead.")]
|
||||||
public override void InitializeEntity(EntityUid entity)
|
public override void InitializeEntity(EntityUid entity)
|
||||||
{
|
{
|
||||||
base.InitializeEntity(entity);
|
base.InitializeEntity(entity);
|
||||||
@@ -151,6 +152,7 @@ namespace Content.Client.Disposal.Visualizers
|
|||||||
ChangeState(appearance);
|
ChangeState(appearance);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -134,6 +134,7 @@ namespace Content.Client.Doors
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to your component being initialised instead.")]
|
||||||
public override void InitializeEntity(EntityUid entity)
|
public override void InitializeEntity(EntityUid entity)
|
||||||
{
|
{
|
||||||
if (!_entMan.HasComponent<AnimationPlayerComponent>(entity))
|
if (!_entMan.HasComponent<AnimationPlayerComponent>(entity))
|
||||||
@@ -142,6 +143,7 @@ namespace Content.Client.Doors
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
// only start playing animations once.
|
// only start playing animations once.
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ namespace Content.Client.Explosion
|
|||||||
[DataField("state")]
|
[DataField("state")]
|
||||||
private string? _state;
|
private string? _state;
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ namespace Content.Client.Fluids
|
|||||||
// Whether the puddle has a unique sprite we don't want to overwrite
|
// Whether the puddle has a unique sprite we don't want to overwrite
|
||||||
[DataField("customPuddleSprite")] public bool CustomPuddleSprite;
|
[DataField("customPuddleSprite")] public bool CustomPuddleSprite;
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to your component being initialised instead.")]
|
||||||
public override void InitializeEntity(EntityUid entity)
|
public override void InitializeEntity(EntityUid entity)
|
||||||
{
|
{
|
||||||
base.InitializeEntity(entity);
|
base.InitializeEntity(entity);
|
||||||
@@ -44,6 +45,7 @@ namespace Content.Client.Fluids
|
|||||||
spriteComponent.Rotation = Angle.FromDegrees(_random.Next(0, 359));
|
spriteComponent.Rotation = Angle.FromDegrees(_random.Next(0, 359));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ namespace Content.Client.Gravity
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to your component being initialised instead.")]
|
||||||
public override void InitializeEntity(EntityUid entity)
|
public override void InitializeEntity(EntityUid entity)
|
||||||
{
|
{
|
||||||
base.InitializeEntity(entity);
|
base.InitializeEntity(entity);
|
||||||
@@ -49,6 +50,7 @@ namespace Content.Client.Gravity
|
|||||||
sprite.LayerMapReserveBlank(GravityGeneratorVisualLayers.Core);
|
sprite.LayerMapReserveBlank(GravityGeneratorVisualLayers.Core);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -232,7 +232,7 @@ namespace Content.Client.IconSmoothing
|
|||||||
sprite.LayerSetState(0, $"{smooth.StateBase}{(int) dirs}");
|
sprite.LayerSetState(0, $"{smooth.StateBase}{(int) dirs}");
|
||||||
}
|
}
|
||||||
|
|
||||||
protected bool MatchingEntity(IconSmoothComponent smooth, IEnumerable<EntityUid> candidates, EntityQuery<IconSmoothComponent> smoothQuery)
|
private bool MatchingEntity(IconSmoothComponent smooth, IEnumerable<EntityUid> candidates, EntityQuery<IconSmoothComponent> smoothQuery)
|
||||||
{
|
{
|
||||||
foreach (var entity in candidates)
|
foreach (var entity in candidates)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ namespace Content.Client.Info
|
|||||||
{
|
{
|
||||||
public sealed class RulesAndInfoWindow : DefaultWindow
|
public sealed class RulesAndInfoWindow : DefaultWindow
|
||||||
{
|
{
|
||||||
[Dependency] private readonly RulesManager _rulesManager = default!;
|
|
||||||
[Dependency] private readonly IResourceCache _resourceManager = default!;
|
[Dependency] private readonly IResourceCache _resourceManager = default!;
|
||||||
[Dependency] private readonly IConfigurationManager _cfgManager = default!;
|
[Dependency] private readonly IConfigurationManager _cfgManager = default!;
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ namespace Content.Client.Kitchen.UI
|
|||||||
public sealed class MicrowaveBoundUserInterface : BoundUserInterface
|
public sealed class MicrowaveBoundUserInterface : BoundUserInterface
|
||||||
{
|
{
|
||||||
[Dependency] private readonly IEntityManager _entityManager = default!;
|
[Dependency] private readonly IEntityManager _entityManager = default!;
|
||||||
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
|
|
||||||
|
|
||||||
private MicrowaveMenu? _menu;
|
private MicrowaveMenu? _menu;
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ namespace Content.Client.Kitchen.Visualizers
|
|||||||
[UsedImplicitly]
|
[UsedImplicitly]
|
||||||
public sealed class MicrowaveVisualizer : AppearanceVisualizer
|
public sealed class MicrowaveVisualizer : AppearanceVisualizer
|
||||||
{
|
{
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ namespace Content.Client.Kitchen.Visualizers
|
|||||||
{
|
{
|
||||||
public sealed class ReagentGrinderVisualizer : AppearanceVisualizer
|
public sealed class ReagentGrinderVisualizer : AppearanceVisualizer
|
||||||
{
|
{
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ namespace Content.Client.Light
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ namespace Content.Client.Light.Visualizers
|
|||||||
[DataDefinition]
|
[DataDefinition]
|
||||||
public sealed class EmergencyLightVisualizer : AppearanceVisualizer
|
public sealed class EmergencyLightVisualizer : AppearanceVisualizer
|
||||||
{
|
{
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ namespace Content.Client.Light.Visualizers
|
|||||||
[UsedImplicitly]
|
[UsedImplicitly]
|
||||||
public sealed class ExpendableLightVisualizer : AppearanceVisualizer
|
public sealed class ExpendableLightVisualizer : AppearanceVisualizer
|
||||||
{
|
{
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ namespace Content.Client.Light.Visualizers
|
|||||||
private Action<string>? _radiatingCallback;
|
private Action<string>? _radiatingCallback;
|
||||||
private Action<string>? _blinkingCallback;
|
private Action<string>? _blinkingCallback;
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ namespace Content.Client.Light.Visualizers
|
|||||||
[UsedImplicitly]
|
[UsedImplicitly]
|
||||||
public sealed class LightBulbVisualizer : AppearanceVisualizer
|
public sealed class LightBulbVisualizer : AppearanceVisualizer
|
||||||
{
|
{
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ namespace Content.Client.Light.Visualizers
|
|||||||
|
|
||||||
private Action<string>? _blinkingCallback;
|
private Action<string>? _blinkingCallback;
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ namespace Content.Client.MachineLinking
|
|||||||
[DataField("layer")]
|
[DataField("layer")]
|
||||||
private int Layer { get; }
|
private int Layer { get; }
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to your component being initialised instead.")]
|
||||||
public override void InitializeEntity(EntityUid entity)
|
public override void InitializeEntity(EntityUid entity)
|
||||||
{
|
{
|
||||||
base.InitializeEntity(entity);
|
base.InitializeEntity(entity);
|
||||||
@@ -23,6 +24,7 @@ namespace Content.Client.MachineLinking
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ namespace Content.Client.MedicalScanner
|
|||||||
[UsedImplicitly]
|
[UsedImplicitly]
|
||||||
public sealed class MedicalScannerVisualizer : AppearanceVisualizer
|
public sealed class MedicalScannerVisualizer : AppearanceVisualizer
|
||||||
{
|
{
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ namespace Content.Client.Nutrition.Visualizers
|
|||||||
[DataField("state")]
|
[DataField("state")]
|
||||||
private string? _state;
|
private string? _state;
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to your component being initialised instead.")]
|
||||||
public override void InitializeEntity(EntityUid entity)
|
public override void InitializeEntity(EntityUid entity)
|
||||||
{
|
{
|
||||||
base.InitializeEntity(entity);
|
base.InitializeEntity(entity);
|
||||||
@@ -24,6 +25,7 @@ namespace Content.Client.Nutrition.Visualizers
|
|||||||
sprite.LayerSetVisible(CreamPiedVisualLayers.Pie, false);
|
sprite.LayerSetVisible(CreamPiedVisualLayers.Pie, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ namespace Content.Client.Nutrition.Visualizers
|
|||||||
[DataField("stateOpen")]
|
[DataField("stateOpen")]
|
||||||
private string? _stateOpen;
|
private string? _stateOpen;
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ public sealed class TargetOutlineSystem : EntitySystem
|
|||||||
[Dependency] private readonly IPlayerManager _playerManager = default!;
|
[Dependency] private readonly IPlayerManager _playerManager = default!;
|
||||||
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
|
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
|
||||||
[Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
|
[Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
|
||||||
[Dependency] private readonly SpriteSystem _spriteSystem = default!;
|
|
||||||
|
|
||||||
private bool _enabled = false;
|
private bool _enabled = false;
|
||||||
|
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ namespace Content.Client.PDA
|
|||||||
IDLight
|
IDLight
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to your component being initialised instead.")]
|
||||||
public override void InitializeEntity(EntityUid entity)
|
public override void InitializeEntity(EntityUid entity)
|
||||||
{
|
{
|
||||||
base.InitializeEntity(entity);
|
base.InitializeEntity(entity);
|
||||||
@@ -45,6 +46,7 @@ namespace Content.Client.PDA
|
|||||||
sprite.LayerSetVisible(PDAVisualLayers.IDLight, appearance.IdSlot.StartingItem != null);
|
sprite.LayerSetVisible(PDAVisualLayers.IDLight, appearance.IdSlot.StartingItem != null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ public sealed class GeneratedParallaxTextureSource : IParallaxTextureSource
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private ResourcePath PreviousParallaxConfigPath => new($"/parallax_{Identifier}config_old");
|
private ResourcePath PreviousParallaxConfigPath => new($"/parallax_{Identifier}config_old");
|
||||||
|
|
||||||
async Task<Texture> IParallaxTextureSource.GenerateTexture(CancellationToken cancel = default)
|
async Task<Texture> IParallaxTextureSource.GenerateTexture(CancellationToken cancel)
|
||||||
{
|
{
|
||||||
var parallaxConfig = GetParallaxConfig();
|
var parallaxConfig = GetParallaxConfig();
|
||||||
if (parallaxConfig == null)
|
if (parallaxConfig == null)
|
||||||
|
|||||||
@@ -18,9 +18,9 @@ public sealed class ImageParallaxTextureSource : IParallaxTextureSource
|
|||||||
[DataField("path", required: true)]
|
[DataField("path", required: true)]
|
||||||
public ResourcePath Path { get; } = default!;
|
public ResourcePath Path { get; } = default!;
|
||||||
|
|
||||||
async Task<Texture> IParallaxTextureSource.GenerateTexture(CancellationToken cancel = default)
|
Task<Texture> IParallaxTextureSource.GenerateTexture(CancellationToken cancel)
|
||||||
{
|
{
|
||||||
return StaticIoC.ResC.GetTexture(Path);
|
return Task.FromResult(StaticIoC.ResC.GetTexture(Path));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ namespace Content.Client.ParticleAccelerator
|
|||||||
_states.Add(ParticleAcceleratorVisualState.Level3, _baseState + "p3");
|
_states.Add(ParticleAcceleratorVisualState.Level3, _baseState + "p3");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to your component being initialised instead.")]
|
||||||
public override void InitializeEntity(EntityUid entity)
|
public override void InitializeEntity(EntityUid entity)
|
||||||
{
|
{
|
||||||
base.InitializeEntity(entity);
|
base.InitializeEntity(entity);
|
||||||
@@ -47,6 +48,7 @@ namespace Content.Client.ParticleAccelerator
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ namespace Content.Client.Pinpointer
|
|||||||
[UsedImplicitly]
|
[UsedImplicitly]
|
||||||
public sealed class PinpointerVisualizer : AppearanceVisualizer
|
public sealed class PinpointerVisualizer : AppearanceVisualizer
|
||||||
{
|
{
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ namespace Content.Client.PneumaticCannon
|
|||||||
{
|
{
|
||||||
public sealed class PneumaticCannonVisualizer : AppearanceVisualizer
|
public sealed class PneumaticCannonVisualizer : AppearanceVisualizer
|
||||||
{
|
{
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ namespace Content.Client.Pointing
|
|||||||
[UsedImplicitly]
|
[UsedImplicitly]
|
||||||
public sealed class RoguePointingArrowVisualizer : AppearanceVisualizer
|
public sealed class RoguePointingArrowVisualizer : AppearanceVisualizer
|
||||||
{
|
{
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ namespace Content.Client.Popups
|
|||||||
[Dependency] private readonly IInputManager _inputManager = default!;
|
[Dependency] private readonly IInputManager _inputManager = default!;
|
||||||
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
|
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
|
||||||
[Dependency] private readonly IEyeManager _eyeManager = default!;
|
[Dependency] private readonly IEyeManager _eyeManager = default!;
|
||||||
[Dependency] private readonly IMapManager _map = default!;
|
|
||||||
[Dependency] private readonly IPlayerManager _playerManager = default!;
|
[Dependency] private readonly IPlayerManager _playerManager = default!;
|
||||||
[Dependency] private readonly ExamineSystemShared _examineSystem = default!;
|
[Dependency] private readonly ExamineSystemShared _examineSystem = default!;
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ namespace Content.Client.Power.APC
|
|||||||
public static readonly Color EmagColor = Color.FromHex("#1f48d6");
|
public static readonly Color EmagColor = Color.FromHex("#1f48d6");
|
||||||
|
|
||||||
[UsedImplicitly]
|
[UsedImplicitly]
|
||||||
|
[Obsolete("Subscribe to your component being initialised instead.")]
|
||||||
public override void InitializeEntity(EntityUid entity)
|
public override void InitializeEntity(EntityUid entity)
|
||||||
{
|
{
|
||||||
base.InitializeEntity(entity);
|
base.InitializeEntity(entity);
|
||||||
@@ -37,6 +38,7 @@ namespace Content.Client.Power.APC
|
|||||||
sprite.LayerSetShader(Layers.Environment, "unshaded");
|
sprite.LayerSetShader(Layers.Environment, "unshaded");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ namespace Content.Client.Power.SMES
|
|||||||
[UsedImplicitly]
|
[UsedImplicitly]
|
||||||
public sealed class SmesVisualizer : AppearanceVisualizer
|
public sealed class SmesVisualizer : AppearanceVisualizer
|
||||||
{
|
{
|
||||||
|
[Obsolete("Subscribe to your component being initialised instead.")]
|
||||||
public override void InitializeEntity(EntityUid entity)
|
public override void InitializeEntity(EntityUid entity)
|
||||||
{
|
{
|
||||||
base.InitializeEntity(entity);
|
base.InitializeEntity(entity);
|
||||||
@@ -25,6 +26,7 @@ namespace Content.Client.Power.SMES
|
|||||||
sprite.LayerSetShader(Layers.Output, "unshaded");
|
sprite.LayerSetShader(Layers.Output, "unshaded");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ namespace Content.Client.Power
|
|||||||
[UsedImplicitly]
|
[UsedImplicitly]
|
||||||
public sealed class PowerDeviceVisualizer : AppearanceVisualizer
|
public sealed class PowerDeviceVisualizer : AppearanceVisualizer
|
||||||
{
|
{
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ namespace Content.Client.PowerCell
|
|||||||
[UsedImplicitly]
|
[UsedImplicitly]
|
||||||
public sealed class PowerChargerVisualizer : AppearanceVisualizer
|
public sealed class PowerChargerVisualizer : AppearanceVisualizer
|
||||||
{
|
{
|
||||||
|
[Obsolete("Subscribe to your component being initialised instead.")]
|
||||||
public override void InitializeEntity(EntityUid entity)
|
public override void InitializeEntity(EntityUid entity)
|
||||||
{
|
{
|
||||||
base.InitializeEntity(entity);
|
base.InitializeEntity(entity);
|
||||||
@@ -23,6 +24,7 @@ namespace Content.Client.PowerCell
|
|||||||
sprite.LayerSetShader(Layers.Light, "unshaded");
|
sprite.LayerSetShader(Layers.Light, "unshaded");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ namespace Content.Client.Recycling
|
|||||||
[DataField("state_off")]
|
[DataField("state_off")]
|
||||||
private string _stateOff = "grinder-o0";
|
private string _stateOff = "grinder-o0";
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to your component being initialised instead.")]
|
||||||
public override void InitializeEntity(EntityUid entity)
|
public override void InitializeEntity(EntityUid entity)
|
||||||
{
|
{
|
||||||
base.InitializeEntity(entity);
|
base.InitializeEntity(entity);
|
||||||
@@ -31,6 +32,7 @@ namespace Content.Client.Recycling
|
|||||||
UpdateAppearance(appearance, sprite);
|
UpdateAppearance(appearance, sprite);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ namespace Content.Client.Rotation
|
|||||||
[UsedImplicitly]
|
[UsedImplicitly]
|
||||||
public sealed class RotationVisualizer : AppearanceVisualizer
|
public sealed class RotationVisualizer : AppearanceVisualizer
|
||||||
{
|
{
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ namespace Content.Client.Security
|
|||||||
[UsedImplicitly]
|
[UsedImplicitly]
|
||||||
public sealed class DeployableBarrierVisualizer : AppearanceVisualizer
|
public sealed class DeployableBarrierVisualizer : AppearanceVisualizer
|
||||||
{
|
{
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ namespace Content.Client.Shuttles
|
|||||||
{
|
{
|
||||||
public sealed class ThrusterVisualizer : AppearanceVisualizer
|
public sealed class ThrusterVisualizer : AppearanceVisualizer
|
||||||
{
|
{
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ namespace Content.Client.Singularity.Visualizers
|
|||||||
private const string OverlayBeam = "beam";
|
private const string OverlayBeam = "beam";
|
||||||
private const string OverlayUnderPowered = "underpowered";
|
private const string OverlayUnderPowered = "underpowered";
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -44,11 +44,13 @@ namespace Content.Client.Singularity.Visualizers
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to your component being initialised instead.")]
|
||||||
public override void InitializeEntity(EntityUid entity)
|
public override void InitializeEntity(EntityUid entity)
|
||||||
{
|
{
|
||||||
IoCManager.Resolve<IEntityManager>().EnsureComponent<AnimationPlayerComponent>(entity);
|
IoCManager.Resolve<IEntityManager>().EnsureComponent<AnimationPlayerComponent>(entity);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ namespace Content.Client.Singularity.Visualizers
|
|||||||
[DataField("layer")]
|
[DataField("layer")]
|
||||||
private int Layer { get; } = 0;
|
private int Layer { get; } = 0;
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to your component being initialised instead.")]
|
||||||
public override void InitializeEntity(EntityUid entity)
|
public override void InitializeEntity(EntityUid entity)
|
||||||
{
|
{
|
||||||
base.InitializeEntity(entity);
|
base.InitializeEntity(entity);
|
||||||
@@ -21,6 +22,7 @@ namespace Content.Client.Singularity.Visualizers
|
|||||||
IoCManager.Resolve<IEntityManager>().GetComponentOrNull<SpriteComponent>(entity)?.LayerMapReserveBlank(Layer);
|
IoCManager.Resolve<IEntityManager>().GetComponentOrNull<SpriteComponent>(entity)?.LayerMapReserveBlank(Layer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ namespace Content.Client.Smoking
|
|||||||
IoCManager.InjectDependencies(this);
|
IoCManager.InjectDependencies(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -78,6 +78,7 @@ namespace Content.Client.Stack
|
|||||||
|
|
||||||
[DataField("sprite")] private ResourcePath? _spritePath;
|
[DataField("sprite")] private ResourcePath? _spritePath;
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to your component being initialised instead.")]
|
||||||
public override void InitializeEntity(EntityUid entity)
|
public override void InitializeEntity(EntityUid entity)
|
||||||
{
|
{
|
||||||
base.InitializeEntity(entity);
|
base.InitializeEntity(entity);
|
||||||
@@ -97,6 +98,7 @@ namespace Content.Client.Stack
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ namespace Content.Client.Storage.Visualizers
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to your component being initialised instead.")]
|
||||||
public override void InitializeEntity(EntityUid entity)
|
public override void InitializeEntity(EntityUid entity)
|
||||||
{
|
{
|
||||||
base.InitializeEntity(entity);
|
base.InitializeEntity(entity);
|
||||||
@@ -40,6 +41,7 @@ namespace Content.Client.Storage.Visualizers
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ namespace Content.Client.Storage.Visualizers
|
|||||||
[DataField("state_closed")]
|
[DataField("state_closed")]
|
||||||
private string? _stateClosed;
|
private string? _stateClosed;
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to your component being initialised instead.")]
|
||||||
public override void InitializeEntity(EntityUid entity)
|
public override void InitializeEntity(EntityUid entity)
|
||||||
{
|
{
|
||||||
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out ISpriteComponent? sprite))
|
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out ISpriteComponent? sprite))
|
||||||
@@ -40,6 +41,7 @@ namespace Content.Client.Storage.Visualizers
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
@@ -63,7 +65,7 @@ namespace Content.Client.Storage.Visualizers
|
|||||||
sprite.LayerSetState(StorageVisualLayers.Door, _stateOpen);
|
sprite.LayerSetState(StorageVisualLayers.Door, _stateOpen);
|
||||||
sprite.LayerSetVisible(StorageVisualLayers.Door, true);
|
sprite.LayerSetVisible(StorageVisualLayers.Door, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_stateBaseAlt != null)
|
if (_stateBaseAlt != null)
|
||||||
sprite.LayerSetState(0, _stateBaseAlt);
|
sprite.LayerSetState(0, _stateBaseAlt);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ namespace Content.Client.Tabletop.Visualizers
|
|||||||
[UsedImplicitly]
|
[UsedImplicitly]
|
||||||
public sealed class TabletopItemVisualizer : AppearanceVisualizer
|
public sealed class TabletopItemVisualizer : AppearanceVisualizer
|
||||||
{
|
{
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent appearance)
|
public override void OnChangeData(AppearanceComponent appearance)
|
||||||
{
|
{
|
||||||
var entities = IoCManager.Resolve<IEntityManager>();
|
var entities = IoCManager.Resolve<IEntityManager>();
|
||||||
|
|||||||
@@ -35,11 +35,13 @@ namespace Content.Client.Trigger
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to your component being initialised instead.")]
|
||||||
public override void InitializeEntity(EntityUid entity)
|
public override void InitializeEntity(EntityUid entity)
|
||||||
{
|
{
|
||||||
IoCManager.Resolve<IEntityManager>().EnsureComponent<AnimationPlayerComponent>(entity);
|
IoCManager.Resolve<IEntityManager>().EnsureComponent<AnimationPlayerComponent>(entity);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
var entMan = IoCManager.Resolve<IEntityManager>();
|
var entMan = IoCManager.Resolve<IEntityManager>();
|
||||||
|
|||||||
@@ -120,6 +120,7 @@ namespace Content.Client.VendingMachines.UI
|
|||||||
flick.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame(key, 0f));
|
flick.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame(key, 0f));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to your component being initialised instead.")]
|
||||||
public override void InitializeEntity(EntityUid entity)
|
public override void InitializeEntity(EntityUid entity)
|
||||||
{
|
{
|
||||||
base.InitializeEntity(entity);
|
base.InitializeEntity(entity);
|
||||||
@@ -137,6 +138,7 @@ namespace Content.Client.VendingMachines.UI
|
|||||||
spriteComponent.LayerSetVisible(VendingMachineVisualLayers.Unlit, true);
|
spriteComponent.LayerSetVisible(VendingMachineVisualLayers.Unlit, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ public sealed class FoldableVisualizer : AppearanceVisualizer
|
|||||||
[DataField("key")]
|
[DataField("key")]
|
||||||
private string _key = default!;
|
private string _key = default!;
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent appearance)
|
public override void OnChangeData(AppearanceComponent appearance)
|
||||||
{
|
{
|
||||||
base.OnChangeData(appearance);
|
base.OnChangeData(appearance);
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ namespace Content.Client.Visualizer
|
|||||||
States = _statesRaw.ToDictionary(kvp => ResolveRef(kvp.Key), kvp => kvp.Value);
|
States = _statesRaw.ToDictionary(kvp => ResolveRef(kvp.Key), kvp => kvp.Value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ namespace Content.Client.Visualizer
|
|||||||
[DataField("key")]
|
[DataField("key")]
|
||||||
private string _key = default!;
|
private string _key = default!;
|
||||||
|
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent appearance)
|
public override void OnChangeData(AppearanceComponent appearance)
|
||||||
{
|
{
|
||||||
base.OnChangeData(appearance);
|
base.OnChangeData(appearance);
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ namespace Content.Client.Wall
|
|||||||
[UsedImplicitly]
|
[UsedImplicitly]
|
||||||
public sealed class ReinforcedWallVisualizer : AppearanceVisualizer
|
public sealed class ReinforcedWallVisualizer : AppearanceVisualizer
|
||||||
{
|
{
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ namespace Content.Client.Wires.Visualizers
|
|||||||
{
|
{
|
||||||
public sealed class WiresVisualizer : AppearanceVisualizer
|
public sealed class WiresVisualizer : AppearanceVisualizer
|
||||||
{
|
{
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ namespace Content.Client.Xenoarchaeology.XenoArtifacts;
|
|||||||
|
|
||||||
public sealed class RandomArtifactVisualizer : AppearanceVisualizer
|
public sealed class RandomArtifactVisualizer : AppearanceVisualizer
|
||||||
{
|
{
|
||||||
|
[Obsolete("Subscribe to AppearanceChangeEvent instead.")]
|
||||||
public override void OnChangeData(AppearanceComponent component)
|
public override void OnChangeData(AppearanceComponent component)
|
||||||
{
|
{
|
||||||
base.OnChangeData(component);
|
base.OnChangeData(component);
|
||||||
|
|||||||
@@ -14,8 +14,6 @@ namespace Content.Server.Abilities.Boxer
|
|||||||
{
|
{
|
||||||
public sealed class BoxingSystem : EntitySystem
|
public sealed class BoxingSystem : EntitySystem
|
||||||
{
|
{
|
||||||
[Dependency] private readonly StunSystem _stunSystem = default!;
|
|
||||||
[Dependency] private readonly IRobustRandom _robustRandom = default!;
|
|
||||||
[Dependency] private readonly SharedContainerSystem _containerSystem = default!;
|
[Dependency] private readonly SharedContainerSystem _containerSystem = default!;
|
||||||
|
|
||||||
public override void Initialize()
|
public override void Initialize()
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ namespace Content.Server.Access.Systems
|
|||||||
{
|
{
|
||||||
public sealed class IdCardSystem : SharedIdCardSystem
|
public sealed class IdCardSystem : SharedIdCardSystem
|
||||||
{
|
{
|
||||||
[Dependency] private readonly InventorySystem _inventorySystem = default!;
|
|
||||||
[Dependency] private readonly PopupSystem _popupSystem = default!;
|
[Dependency] private readonly PopupSystem _popupSystem = default!;
|
||||||
[Dependency] private readonly IRobustRandom _random = default!;
|
[Dependency] private readonly IRobustRandom _random = default!;
|
||||||
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
|
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ namespace Content.Server.Administration.Systems;
|
|||||||
|
|
||||||
public sealed partial class AdminVerbSystem
|
public sealed partial class AdminVerbSystem
|
||||||
{
|
{
|
||||||
[Dependency] private readonly IConfigurationManager _cfg = default!;
|
|
||||||
[Dependency] private readonly ZombifyOnDeathSystem _zombify = default!;
|
[Dependency] private readonly ZombifyOnDeathSystem _zombify = default!;
|
||||||
[Dependency] private readonly TraitorRuleSystem _traitorRule = default!;
|
[Dependency] private readonly TraitorRuleSystem _traitorRule = default!;
|
||||||
[Dependency] private readonly NukeopsRuleSystem _nukeopsRule = default!;
|
[Dependency] private readonly NukeopsRuleSystem _nukeopsRule = default!;
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ namespace Content.Server.Atmos.EntitySystems
|
|||||||
public AtmosExposedGetAirEvent(EntityUid entity, bool invalidate = false)
|
public AtmosExposedGetAirEvent(EntityUid entity, bool invalidate = false)
|
||||||
{
|
{
|
||||||
Entity = entity;
|
Entity = entity;
|
||||||
invalidate = invalidate;
|
Invalidate = invalidate;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
|
|||||||
public sealed class GasPassiveGateSystem : EntitySystem
|
public sealed class GasPassiveGateSystem : EntitySystem
|
||||||
{
|
{
|
||||||
[Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
|
[Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
|
||||||
[Dependency] private readonly ExamineSystemShared _examineSystem = default!;
|
|
||||||
|
|
||||||
public override void Initialize()
|
public override void Initialize()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
|
|||||||
[Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
|
[Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
|
||||||
[Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
|
[Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
|
||||||
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
|
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
|
||||||
[Dependency] private readonly PricingSystem _pricing = default!;
|
|
||||||
[Dependency] private readonly SharedHandsSystem _handsSystem = default!;
|
[Dependency] private readonly SharedHandsSystem _handsSystem = default!;
|
||||||
|
|
||||||
public override void Initialize()
|
public override void Initialize()
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ namespace Content.Server.Chat.Managers
|
|||||||
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
|
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
|
||||||
[Dependency] private readonly IServerPreferencesManager _preferencesManager = default!;
|
[Dependency] private readonly IServerPreferencesManager _preferencesManager = default!;
|
||||||
[Dependency] private readonly IConfigurationManager _configurationManager = default!;
|
[Dependency] private readonly IConfigurationManager _configurationManager = default!;
|
||||||
[Dependency] private readonly IMapManager _mapManager = default!;
|
|
||||||
[Dependency] private readonly IEntityManager _entityManager = default!;
|
[Dependency] private readonly IEntityManager _entityManager = default!;
|
||||||
|
|
||||||
private StationSystem _stationSystem = default!;
|
private StationSystem _stationSystem = default!;
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ namespace Content.Server.Cloning.Systems
|
|||||||
{
|
{
|
||||||
[Dependency] private readonly SignalLinkerSystem _signalSystem = default!;
|
[Dependency] private readonly SignalLinkerSystem _signalSystem = default!;
|
||||||
[Dependency] private readonly IPlayerManager _playerManager = default!;
|
[Dependency] private readonly IPlayerManager _playerManager = default!;
|
||||||
[Dependency] private readonly IGameTiming _gameTiming = default!;
|
|
||||||
[Dependency] private readonly CloningSystem _cloningSystem = default!;
|
[Dependency] private readonly CloningSystem _cloningSystem = default!;
|
||||||
[Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
|
[Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
|
||||||
[Dependency] private readonly MobStateSystem _mobStateSystem = default!;
|
[Dependency] private readonly MobStateSystem _mobStateSystem = default!;
|
||||||
|
|||||||
@@ -246,8 +246,6 @@ namespace Content.Server.Construction
|
|||||||
{
|
{
|
||||||
public EntityUid User;
|
public EntityUid User;
|
||||||
public EntityUid Using;
|
public EntityUid Using;
|
||||||
|
|
||||||
public readonly TransformComponent Transform = default!;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private sealed class TryUnanchorCompletedEvent : AnchorEvent
|
private sealed class TryUnanchorCompletedEvent : AnchorEvent
|
||||||
|
|||||||
@@ -23,10 +23,8 @@ public sealed class CrewManifestSystem : EntitySystem
|
|||||||
{
|
{
|
||||||
[Dependency] private readonly StationSystem _stationSystem = default!;
|
[Dependency] private readonly StationSystem _stationSystem = default!;
|
||||||
[Dependency] private readonly StationRecordsSystem _recordsSystem = default!;
|
[Dependency] private readonly StationRecordsSystem _recordsSystem = default!;
|
||||||
[Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
|
|
||||||
[Dependency] private readonly EuiManager _euiManager = default!;
|
[Dependency] private readonly EuiManager _euiManager = default!;
|
||||||
[Dependency] private readonly IConfigurationManager _configManager = default!;
|
[Dependency] private readonly IConfigurationManager _configManager = default!;
|
||||||
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Cached crew manifest entries. The alternative is to outright
|
/// Cached crew manifest entries. The alternative is to outright
|
||||||
|
|||||||
@@ -38,7 +38,6 @@ namespace Content.Server.Disposal.Unit.EntitySystems
|
|||||||
{
|
{
|
||||||
public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
|
public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
|
||||||
{
|
{
|
||||||
[Dependency] private readonly IMapManager _mapManager = default!;
|
|
||||||
[Dependency] private readonly IRobustRandom _robustRandom = default!;
|
[Dependency] private readonly IRobustRandom _robustRandom = default!;
|
||||||
[Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
|
[Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
|
||||||
[Dependency] private readonly AtmosphereSystem _atmosSystem = default!;
|
[Dependency] private readonly AtmosphereSystem _atmosSystem = default!;
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ public sealed partial class ExplosionSystem : EntitySystem
|
|||||||
[Dependency] private readonly DamageableSystem _damageableSystem = default!;
|
[Dependency] private readonly DamageableSystem _damageableSystem = default!;
|
||||||
[Dependency] private readonly NodeGroupSystem _nodeGroupSystem = default!;
|
[Dependency] private readonly NodeGroupSystem _nodeGroupSystem = default!;
|
||||||
[Dependency] private readonly SharedCameraRecoilSystem _recoilSystem = default!;
|
[Dependency] private readonly SharedCameraRecoilSystem _recoilSystem = default!;
|
||||||
[Dependency] private readonly EntityLookupSystem _entityLookup = default!;
|
|
||||||
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
|
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
|
||||||
[Dependency] private readonly ThrowingSystem _throwingSystem = default!;
|
[Dependency] private readonly ThrowingSystem _throwingSystem = default!;
|
||||||
[Dependency] private readonly SharedTransformSystem _transformSystem = default!;
|
[Dependency] private readonly SharedTransformSystem _transformSystem = default!;
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ public sealed class PiratesRuleSystem : GameRuleSystem
|
|||||||
[Dependency] private readonly IMapManager _mapManager = default!;
|
[Dependency] private readonly IMapManager _mapManager = default!;
|
||||||
[Dependency] private readonly StationSpawningSystem _stationSpawningSystem = default!;
|
[Dependency] private readonly StationSpawningSystem _stationSpawningSystem = default!;
|
||||||
[Dependency] private readonly StationSystem _stationSystem = default!;
|
[Dependency] private readonly StationSystem _stationSystem = default!;
|
||||||
[Dependency] private readonly RoundEndSystem _roundEndSystem = default!;
|
|
||||||
[Dependency] private readonly PricingSystem _pricingSystem = default!;
|
[Dependency] private readonly PricingSystem _pricingSystem = default!;
|
||||||
|
|
||||||
[ViewVariables]
|
[ViewVariables]
|
||||||
|
|||||||
@@ -25,7 +25,6 @@ namespace Content.Server.Light.EntitySystems
|
|||||||
{
|
{
|
||||||
[Dependency] private readonly PopupSystem _popup = default!;
|
[Dependency] private readonly PopupSystem _popup = default!;
|
||||||
[Dependency] private readonly PowerCellSystem _powerCell = default!;
|
[Dependency] private readonly PowerCellSystem _powerCell = default!;
|
||||||
[Dependency] private readonly ActionsSystem _actionSystem = default!;
|
|
||||||
[Dependency] private readonly IPrototypeManager _proto = default!;
|
[Dependency] private readonly IPrototypeManager _proto = default!;
|
||||||
|
|
||||||
// TODO: Ideally you'd be able to subscribe to power stuff to get events at certain percentages.. or something?
|
// TODO: Ideally you'd be able to subscribe to power stuff to get events at certain percentages.. or something?
|
||||||
|
|||||||
@@ -17,10 +17,9 @@ namespace Content.Server.Medical
|
|||||||
{
|
{
|
||||||
public sealed class StethoscopeSystem : EntitySystem
|
public sealed class StethoscopeSystem : EntitySystem
|
||||||
{
|
{
|
||||||
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
|
|
||||||
[Dependency] private readonly PopupSystem _popupSystem = default!;
|
[Dependency] private readonly PopupSystem _popupSystem = default!;
|
||||||
[Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
|
[Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
|
||||||
[Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
|
|
||||||
public override void Initialize()
|
public override void Initialize()
|
||||||
{
|
{
|
||||||
base.Initialize();
|
base.Initialize();
|
||||||
|
|||||||
@@ -12,8 +12,6 @@ namespace Content.Server.Mousetrap;
|
|||||||
|
|
||||||
public sealed class MousetrapSystem : EntitySystem
|
public sealed class MousetrapSystem : EntitySystem
|
||||||
{
|
{
|
||||||
[Dependency] private readonly InventorySystem _inventorySystem = default!;
|
|
||||||
[Dependency] private readonly TriggerSystem _triggerSystem = default!;
|
|
||||||
[Dependency] private readonly PopupSystem _popupSystem = default!;
|
[Dependency] private readonly PopupSystem _popupSystem = default!;
|
||||||
|
|
||||||
public override void Initialize()
|
public override void Initialize()
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ namespace Content.Server.Nuke
|
|||||||
{
|
{
|
||||||
[Dependency] private readonly IRobustRandom _random = default!;
|
[Dependency] private readonly IRobustRandom _random = default!;
|
||||||
[Dependency] private readonly ChatSystem _chatSystem = default!;
|
[Dependency] private readonly ChatSystem _chatSystem = default!;
|
||||||
[Dependency] private readonly StationSystem _stationSystem = default!;
|
|
||||||
|
|
||||||
private const int CodeLength = 6;
|
private const int CodeLength = 6;
|
||||||
public string Code { get; private set; } = default!;
|
public string Code { get; private set; } = default!;
|
||||||
|
|||||||
@@ -454,7 +454,6 @@ public sealed partial class ShuttleSystem
|
|||||||
|
|
||||||
var xformQuery = GetEntityQuery<TransformComponent>();
|
var xformQuery = GetEntityQuery<TransformComponent>();
|
||||||
var shuttleAABB = Comp<IMapGridComponent>(component.Owner).Grid.LocalAABB;
|
var shuttleAABB = Comp<IMapGridComponent>(component.Owner).Grid.LocalAABB;
|
||||||
Box2? aabb = null;
|
|
||||||
|
|
||||||
// Spawn nearby.
|
// Spawn nearby.
|
||||||
// We essentially expand the Box2 of the target area until nothing else is added then we know it's valid.
|
// We essentially expand the Box2 of the target area until nothing else is added then we know it's valid.
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ namespace Content.Server.Singularity.EntitySystems
|
|||||||
[Dependency] private readonly IMapManager _mapManager = default!;
|
[Dependency] private readonly IMapManager _mapManager = default!;
|
||||||
[Dependency] private readonly SharedContainerSystem _container = default!;
|
[Dependency] private readonly SharedContainerSystem _container = default!;
|
||||||
[Dependency] private readonly PVSOverrideSystem _pvs = default!;
|
[Dependency] private readonly PVSOverrideSystem _pvs = default!;
|
||||||
[Dependency] private readonly ContainmentFieldGeneratorSystem _fieldGeneratorSystem = default!;
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// How much energy the singulo gains from destroying a tile.
|
/// How much energy the singulo gains from destroying a tile.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -131,7 +130,7 @@ namespace Content.Server.Singularity.EntitySystems
|
|||||||
return entity != component.Owner &&
|
return entity != component.Owner &&
|
||||||
!EntityManager.HasComponent<IMapGridComponent>(entity) &&
|
!EntityManager.HasComponent<IMapGridComponent>(entity) &&
|
||||||
!EntityManager.HasComponent<GhostComponent>(entity) &&
|
!EntityManager.HasComponent<GhostComponent>(entity) &&
|
||||||
!EntityManager.HasComponent<StationDataComponent>(entity) && // these SHOULD be in null-space... but just in case. Also, maybe someone moves a singularity there..
|
!EntityManager.HasComponent<StationDataComponent>(entity) && // these SHOULD be in null-space... but just in case. Also, maybe someone moves a singularity there..
|
||||||
(component.Level > 4 ||
|
(component.Level > 4 ||
|
||||||
!EntityManager.HasComponent<ContainmentFieldComponent>(entity) &&
|
!EntityManager.HasComponent<ContainmentFieldComponent>(entity) &&
|
||||||
!EntityManager.HasComponent<ContainmentFieldGeneratorComponent>(entity));
|
!EntityManager.HasComponent<ContainmentFieldGeneratorComponent>(entity));
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ namespace Content.Server.Weapon.Ranged.Systems;
|
|||||||
|
|
||||||
public sealed class RechargeBasicEntityAmmoSystem : EntitySystem
|
public sealed class RechargeBasicEntityAmmoSystem : EntitySystem
|
||||||
{
|
{
|
||||||
[Dependency] private readonly IGameTiming _gameTiming = default!;
|
|
||||||
[Dependency] private readonly IRobustRandom _random = default!;
|
[Dependency] private readonly IRobustRandom _random = default!;
|
||||||
[Dependency] private readonly SharedGunSystem _gun = default!;
|
[Dependency] private readonly SharedGunSystem _gun = default!;
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ namespace Content.Server.Zombies
|
|||||||
{
|
{
|
||||||
public sealed class ZombieSystem : EntitySystem
|
public sealed class ZombieSystem : EntitySystem
|
||||||
{
|
{
|
||||||
[Dependency] private readonly DamageableSystem _damage = default!;
|
|
||||||
[Dependency] private readonly DiseaseSystem _disease = default!;
|
[Dependency] private readonly DiseaseSystem _disease = default!;
|
||||||
[Dependency] private readonly BloodstreamSystem _bloodstream = default!;
|
[Dependency] private readonly BloodstreamSystem _bloodstream = default!;
|
||||||
[Dependency] private readonly ZombifyOnDeathSystem _zombify = default!;
|
[Dependency] private readonly ZombifyOnDeathSystem _zombify = default!;
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ namespace Content.Shared.Decals
|
|||||||
public abstract class SharedDecalSystem : EntitySystem
|
public abstract class SharedDecalSystem : EntitySystem
|
||||||
{
|
{
|
||||||
[Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
|
[Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
|
||||||
[Dependency] private readonly IConfigurationManager _configurationManager = default!;
|
|
||||||
[Dependency] protected readonly IMapManager MapManager = default!;
|
[Dependency] protected readonly IMapManager MapManager = default!;
|
||||||
|
|
||||||
protected readonly Dictionary<EntityUid, Dictionary<uint, Vector2i>> ChunkIndex = new();
|
protected readonly Dictionary<EntityUid, Dictionary<uint, Vector2i>> ChunkIndex = new();
|
||||||
|
|||||||
@@ -46,7 +46,6 @@ namespace Content.Shared.Interaction
|
|||||||
[Dependency] private readonly RotateToFaceSystem _rotateToFaceSystem = default!;
|
[Dependency] private readonly RotateToFaceSystem _rotateToFaceSystem = default!;
|
||||||
[Dependency] private readonly SharedPopupSystem _popupSystem = default!;
|
[Dependency] private readonly SharedPopupSystem _popupSystem = default!;
|
||||||
[Dependency] private readonly UseDelaySystem _useDelay = default!;
|
[Dependency] private readonly UseDelaySystem _useDelay = default!;
|
||||||
[Dependency] private readonly SharedPhysicsSystem _physicsSystem = default!;
|
|
||||||
[Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
|
[Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
|
||||||
|
|
||||||
private const CollisionGroup InRangeUnobstructedMask
|
private const CollisionGroup InRangeUnobstructedMask
|
||||||
@@ -607,7 +606,7 @@ namespace Content.Shared.Interaction
|
|||||||
/// Finds components with the InteractUsing interface and calls their function
|
/// Finds components with the InteractUsing interface and calls their function
|
||||||
/// NOTE: Does not have an InRangeUnobstructed check
|
/// NOTE: Does not have an InRangeUnobstructed check
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public async void InteractUsing(
|
public void InteractUsing(
|
||||||
EntityUid user,
|
EntityUid user,
|
||||||
EntityUid used,
|
EntityUid used,
|
||||||
EntityUid target,
|
EntityUid target,
|
||||||
@@ -636,7 +635,7 @@ namespace Content.Shared.Interaction
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Used when clicking on an entity resulted in no other interaction. Used for low-priority interactions.
|
/// Used when clicking on an entity resulted in no other interaction. Used for low-priority interactions.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public async void InteractDoAfter(EntityUid user, EntityUid used, EntityUid? target, EntityCoordinates clickLocation, bool canReach)
|
public void InteractDoAfter(EntityUid user, EntityUid used, EntityUid? target, EntityCoordinates clickLocation, bool canReach)
|
||||||
{
|
{
|
||||||
if (target is {Valid: false})
|
if (target is {Valid: false})
|
||||||
target = null;
|
target = null;
|
||||||
|
|||||||
@@ -43,7 +43,6 @@ namespace Content.Shared.Storage
|
|||||||
Key,
|
Key,
|
||||||
}
|
}
|
||||||
|
|
||||||
[Dependency] private readonly IEntityManager _entMan = default!;
|
|
||||||
public abstract IReadOnlyList<EntityUid>? StoredEntities { get; }
|
public abstract IReadOnlyList<EntityUid>? StoredEntities { get; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
Reference in New Issue
Block a user