diff --git a/Content.Client/Explosion/ExplosionOverlay.cs b/Content.Client/Explosion/ExplosionOverlay.cs index 8cf7447a5d8..22984fc81e2 100644 --- a/Content.Client/Explosion/ExplosionOverlay.cs +++ b/Content.Client/Explosion/ExplosionOverlay.cs @@ -16,6 +16,7 @@ public sealed class ExplosionOverlay : Overlay [Dependency] private readonly IRobustRandom _robustRandom = default!; [Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV; @@ -41,7 +42,7 @@ protected override void Draw(in OverlayDrawArgs args) if (visuals.Epicenter.MapId != args.MapId) continue; - if (!appearance.TryGetData(ExplosionAppearanceData.Progress, out int index)) + if (!_appearanceSystem.TryGetData(appearance.Owner, ExplosionAppearanceData.Progress, out int index)) continue; index = Math.Min(index, visuals.Intensity.Count - 1); diff --git a/Content.Client/Nyanotrasen/Kitchen/Visualizers/DeepFriedVisualizer.cs b/Content.Client/Nyanotrasen/Kitchen/Visualizers/DeepFriedVisualizer.cs index 97fea3d0ca9..c5f0123bddb 100644 --- a/Content.Client/Nyanotrasen/Kitchen/Visualizers/DeepFriedVisualizer.cs +++ b/Content.Client/Nyanotrasen/Kitchen/Visualizers/DeepFriedVisualizer.cs @@ -11,6 +11,7 @@ namespace Content.Client.Kitchen.Visualizers { public sealed class DeepFriedVisualizerSystem : VisualizerSystem { + [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; private readonly static string ShaderName = "Crispy"; public override void Initialize() @@ -26,7 +27,7 @@ protected override void OnAppearanceChange(EntityUid uid, DeepFriedComponent com if (args.Sprite == null) return; - if (!args.Component.TryGetData(DeepFriedVisuals.Fried, out bool isFried)) + if (!_appearanceSystem.TryGetData(uid, DeepFriedVisuals.Fried, out bool isFried)) return; for (var i = 0; i < args.Sprite.AllLayers.Count(); ++i) diff --git a/Content.Client/Nyanotrasen/Kitchen/Visualizers/DeepFryerVisualizer.cs b/Content.Client/Nyanotrasen/Kitchen/Visualizers/DeepFryerVisualizer.cs index 5d208d09598..ae7a89d6869 100644 --- a/Content.Client/Nyanotrasen/Kitchen/Visualizers/DeepFryerVisualizer.cs +++ b/Content.Client/Nyanotrasen/Kitchen/Visualizers/DeepFryerVisualizer.cs @@ -9,9 +9,11 @@ namespace Content.Client.Kitchen.Visualizers { public sealed class DeepFryerVisualizerSystem : VisualizerSystem { + [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; + protected override void OnAppearanceChange(EntityUid uid, DeepFryerComponent component, ref AppearanceChangeEvent args) { - if (!args.Component.TryGetData(DeepFryerVisuals.Bubbling, out bool isBubbling) || + if (!_appearanceSystem.TryGetData(uid, DeepFryerVisuals.Bubbling, out bool isBubbling) || !TryComp(uid, out var scvComponent)) { return; diff --git a/Content.Client/Nyanotrasen/Mail/MailSystem.cs b/Content.Client/Nyanotrasen/Mail/MailSystem.cs index c8d764a22f4..de63d74099b 100644 --- a/Content.Client/Nyanotrasen/Mail/MailSystem.cs +++ b/Content.Client/Nyanotrasen/Mail/MailSystem.cs @@ -28,13 +28,14 @@ public sealed class MailJobVisualizerSystem : VisualizerSystem [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly SpriteSystem _stateManager = default!; [Dependency] private readonly SpriteSystem _spriteSystem = default!; + [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; protected override void OnAppearanceChange(EntityUid uid, MailComponent component, ref AppearanceChangeEvent args) { if (args.Sprite == null) return; - args.Component.TryGetData(MailVisuals.JobIcon, out string job); + _appearanceSystem.TryGetData(uid, MailVisuals.JobIcon, out string job); if (string.IsNullOrEmpty(job)) job = "JobIconUnknown";