From 3e28b7f236325f82b41ff8491cd272da18c82aaa Mon Sep 17 00:00:00 2001
From: ModeratelyAware <84935671+ModeratelyAware@users.noreply.github.com>
Date: Tue, 26 Jul 2022 17:40:13 -0700
Subject: [PATCH] Converted FireExtinguisherVisualizer to generic visualizer
 (#10058)

---
 .../FireExtinguisherVisualizer.cs             | 40 -------------------
 Content.Server/Entry/IgnoredComponents.cs     |  2 +-
 .../Objects/Misc/fire_extinguisher.yml        | 10 +++--
 3 files changed, 7 insertions(+), 45 deletions(-)
 delete mode 100644 Content.Client/Extinguisher/FireExtinguisherVisualizer.cs

diff --git a/Content.Client/Extinguisher/FireExtinguisherVisualizer.cs b/Content.Client/Extinguisher/FireExtinguisherVisualizer.cs
deleted file mode 100644
index 1f69afbaa5..0000000000
--- a/Content.Client/Extinguisher/FireExtinguisherVisualizer.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using Content.Shared.Extinguisher;
-using JetBrains.Annotations;
-using Robust.Client.GameObjects;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Serialization.Manager.Attributes;
-
-namespace Content.Client.Extinguisher
-{
-    [UsedImplicitly]
-    public sealed class FireExtinguisherVisualizer : AppearanceVisualizer
-    {
-        [DataField("safety_on_state")]
-        private string? _safetyOnState;
-        [DataField("safety_off_state")]
-        private string? _safetyOffState;
-
-        public override void OnChangeData(AppearanceComponent component)
-        {
-            base.OnChangeData(component);
-
-            if (component.TryGetData<bool>(FireExtinguisherVisuals.Safety, out var safety))
-            {
-                SetSafety(component, safety);
-            }
-        }
-
-        private void SetSafety(AppearanceComponent component, bool safety)
-        {
-            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner);
-
-            sprite.LayerSetState(FireExtinguisherVisualLayers.Base, safety ? _safetyOnState : _safetyOffState);
-        }
-    }
-
-    public enum FireExtinguisherVisualLayers : byte
-    {
-        Base
-    }
-}
diff --git a/Content.Server/Entry/IgnoredComponents.cs b/Content.Server/Entry/IgnoredComponents.cs
index 82e714c4f6..2fe6a3918b 100644
--- a/Content.Server/Entry/IgnoredComponents.cs
+++ b/Content.Server/Entry/IgnoredComponents.cs
@@ -3,7 +3,7 @@ namespace Content.Server.Entry
 {
     public static class IgnoredComponents
     {
-        public static string[] List => new [] {
+        public static string[] List => new[] {
             "ConstructionGhost",
             "IconSmooth",
             "StasisBedVisuals",
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
index 1b13d4f4b7..69b8c84402 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -9,7 +9,7 @@
     sprite: Objects/Misc/fire_extinguisher.rsi
     layers:
         - state: fire_extinguisher_closed
-          map: [ "enum.FireExtinguisherVisualLayers.Base" ]
+          map: [ "enabled" ]
   - type: Item
     sprite: Objects/Misc/fire_extinguisher.rsi
     size: 10
@@ -44,10 +44,12 @@
     hitSound:
       path: /Audio/Weapons/smash.ogg
   - type: Appearance
+  - type: GenericVisualizer
     visuals:
-      - type: FireExtinguisherVisualizer
-        safety_on_state: fire_extinguisher_closed
-        safety_off_state: fire_extinguisher_open
+      enum.FireExtinguisherVisuals.Safety:
+        enabled:
+          True: { state: fire_extinguisher_closed }
+          False: { state: fire_extinguisher_open }
 
 - type: entity
   name: extinguisher spray