From b69b90197796852f91c6d5debe4b1dfd5c47f3bf Mon Sep 17 00:00:00 2001
From: Spatison <137375981+Spatison@users.noreply.github.com>
Date: Wed, 16 Oct 2024 23:49:48 +0300
Subject: [PATCH] fix

---
 Content.Client/_White/Overlays/NightVisionOverlay.cs         | 5 -----
 Content.Client/_White/Overlays/NightVisionSystem.cs          | 4 ++--
 Content.Client/_White/Overlays/ThermalOverlay.cs             | 5 -----
 Content.Client/_White/Overlays/ThermalVisionSystem.cs        | 4 ++--
 Content.Shared/_White/Overlays/BaseOverlayComponent.cs       | 1 -
 Content.Shared/_White/Overlays/SwitchableOverlayComponent.cs | 2 +-
 6 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 Content.Client/_White/Overlays/NightVisionOverlay.cs
 delete mode 100644 Content.Client/_White/Overlays/ThermalOverlay.cs

diff --git a/Content.Client/_White/Overlays/NightVisionOverlay.cs b/Content.Client/_White/Overlays/NightVisionOverlay.cs
deleted file mode 100644
index 25e3504347..0000000000
--- a/Content.Client/_White/Overlays/NightVisionOverlay.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using Content.Shared._White.Overlays;
-
-namespace Content.Client._White.Overlays;
-
-public sealed class NightVisionOverlay : BaseSwitchableOverlay<NightVisionComponent>;
diff --git a/Content.Client/_White/Overlays/NightVisionSystem.cs b/Content.Client/_White/Overlays/NightVisionSystem.cs
index cad8049751..9cbbc42f14 100644
--- a/Content.Client/_White/Overlays/NightVisionSystem.cs
+++ b/Content.Client/_White/Overlays/NightVisionSystem.cs
@@ -12,7 +12,7 @@ public sealed class NightVisionSystem : SwitchableOverlaySystem<NightVisionCompo
     [Dependency] private readonly IOverlayManager _overlayMan = default!;
     [Dependency] private readonly ILightManager _lightManager = default!;
 
-    private NightVisionOverlay _overlay = default!;
+    private BaseSwitchableOverlay<NightVisionComponent> _overlay = default!;
 
     public override void Initialize()
     {
@@ -22,7 +22,7 @@ public override void Initialize()
         SubscribeLocalEvent<NightVisionComponent, PlayerDetachedEvent>(OnPlayerDetached);
         SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRestart);
 
-        _overlay = new NightVisionOverlay();
+        _overlay = new BaseSwitchableOverlay<NightVisionComponent>();
     }
 
     private void OnPlayerAttached(EntityUid uid, NightVisionComponent component, PlayerAttachedEvent args)
diff --git a/Content.Client/_White/Overlays/ThermalOverlay.cs b/Content.Client/_White/Overlays/ThermalOverlay.cs
deleted file mode 100644
index 6f5da9e385..0000000000
--- a/Content.Client/_White/Overlays/ThermalOverlay.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using Content.Shared._White.Overlays;
-
-namespace Content.Client._White.Overlays;
-
-public sealed class ThermalOverlay : BaseSwitchableOverlay<ThermalVisionComponent>;
diff --git a/Content.Client/_White/Overlays/ThermalVisionSystem.cs b/Content.Client/_White/Overlays/ThermalVisionSystem.cs
index b20380484f..1dc16d50dc 100644
--- a/Content.Client/_White/Overlays/ThermalVisionSystem.cs
+++ b/Content.Client/_White/Overlays/ThermalVisionSystem.cs
@@ -12,7 +12,7 @@ public sealed class ThermalVisionSystem : SwitchableOverlaySystem<ThermalVisionC
     [Dependency] private readonly IOverlayManager _overlayMan = default!;
 
     private ThermalVisionOverlay _thermalOverlay = default!;
-    private ThermalOverlay _overlay = default!;
+    private BaseSwitchableOverlay<ThermalVisionComponent> _overlay = default!;
 
     public override void Initialize()
     {
@@ -23,7 +23,7 @@ public override void Initialize()
         SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRestart);
 
         _thermalOverlay = new ThermalVisionOverlay();
-        _overlay = new ThermalOverlay();
+        _overlay = new BaseSwitchableOverlay<ThermalVisionComponent>();
     }
 
     private void OnPlayerAttached(EntityUid uid, ThermalVisionComponent component, PlayerAttachedEvent args)
diff --git a/Content.Shared/_White/Overlays/BaseOverlayComponent.cs b/Content.Shared/_White/Overlays/BaseOverlayComponent.cs
index 5f0d9839c9..256b35011c 100644
--- a/Content.Shared/_White/Overlays/BaseOverlayComponent.cs
+++ b/Content.Shared/_White/Overlays/BaseOverlayComponent.cs
@@ -1,6 +1,5 @@
 namespace Content.Shared._White.Overlays;
 
-[RegisterComponent]
 public abstract partial class BaseOverlayComponent : Component
 {
     [DataField, ViewVariables(VVAccess.ReadOnly)]
diff --git a/Content.Shared/_White/Overlays/SwitchableOverlayComponent.cs b/Content.Shared/_White/Overlays/SwitchableOverlayComponent.cs
index b34dab095a..6db8ca6e40 100644
--- a/Content.Shared/_White/Overlays/SwitchableOverlayComponent.cs
+++ b/Content.Shared/_White/Overlays/SwitchableOverlayComponent.cs
@@ -3,7 +3,7 @@
 
 namespace Content.Shared._White.Overlays;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[AutoGenerateComponentState]
 public abstract partial class SwitchableOverlayComponent : BaseOverlayComponent
 {
     [DataField, AutoNetworkedField]