From a9e0d8725e48a76a34a1af0e8f2ab8a6bfe871b0 Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Tue, 13 May 2025 21:58:03 -0400
Subject: [PATCH] Cleanup warnings in `DamageStateVisualizerSystem` (#37435)

Cleanup warnings in DamageStateVisualizerSystem
---
 .../DamageStateVisualizerSystem.cs            | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/Content.Client/DamageState/DamageStateVisualizerSystem.cs b/Content.Client/DamageState/DamageStateVisualizerSystem.cs
index 8ed18e7e42..de92381f02 100644
--- a/Content.Client/DamageState/DamageStateVisualizerSystem.cs
+++ b/Content.Client/DamageState/DamageStateVisualizerSystem.cs
@@ -6,6 +6,8 @@ namespace Content.Client.DamageState;
 
 public sealed class DamageStateVisualizerSystem : VisualizerSystem<DamageStateVisualsComponent>
 {
+    [Dependency] private readonly SpriteSystem _sprite = default!;
+
     protected override void OnAppearanceChange(EntityUid uid, DamageStateVisualsComponent component, ref AppearanceChangeEvent args)
     {
         var sprite = args.Sprite;
@@ -21,34 +23,34 @@ public sealed class DamageStateVisualizerSystem : VisualizerSystem<DamageStateVi
         }
 
         // Brain no worky rn so this was just easier.
-        foreach (var key in new []{ DamageStateVisualLayers.Base, DamageStateVisualLayers.BaseUnshaded })
+        foreach (var key in new[] { DamageStateVisualLayers.Base, DamageStateVisualLayers.BaseUnshaded })
         {
-            if (!sprite.LayerMapTryGet(key, out _)) continue;
+            if (!_sprite.LayerMapTryGet((uid, sprite), key, out _, false)) continue;
 
-            sprite.LayerSetVisible(key, false);
+            _sprite.LayerSetVisible((uid, sprite), key, false);
         }
 
         foreach (var (key, state) in layers)
         {
             // Inheritance moment.
-            if (!sprite.LayerMapTryGet(key, out _)) continue;
+            if (!_sprite.LayerMapTryGet((uid, sprite), key, out _, false)) continue;
 
-            sprite.LayerSetVisible(key, true);
-            sprite.LayerSetState(key, state);
+            _sprite.LayerSetVisible((uid, sprite), key, true);
+            _sprite.LayerSetRsiState((uid, sprite), key, state);
         }
 
         // So they don't draw over mobs anymore
         if (data == MobState.Dead)
         {
-            if (sprite.DrawDepth > (int) DrawDepth.DeadMobs)
+            if (sprite.DrawDepth > (int)DrawDepth.DeadMobs)
             {
                 component.OriginalDrawDepth = sprite.DrawDepth;
-                sprite.DrawDepth = (int) DrawDepth.DeadMobs;
+                _sprite.SetDrawDepth((uid, sprite), (int)DrawDepth.DeadMobs);
             }
         }
         else if (component.OriginalDrawDepth != null)
         {
-            sprite.DrawDepth = component.OriginalDrawDepth.Value;
+            _sprite.SetDrawDepth((uid, sprite), component.OriginalDrawDepth.Value);
             component.OriginalDrawDepth = null;
         }
     }