From f91b44ef5a7ad2700d74cdfc6f513633166cde36 Mon Sep 17 00:00:00 2001
From: Debug <49997488+DebugOk@users.noreply.github.com>
Date: Thu, 22 Feb 2024 23:38:31 +0100
Subject: [PATCH] Remove DefaultVision in favor of the setting

---
 .../Abilities/DefaultVisionComponent.cs       |  8 --------
 .../DeltaV/Abilities/DefaultVisionSystem.cs   | 20 -------------------
 .../Locale/en-US/deltav/traits/traits.ftl     |  3 ---
 .../Prototypes/DeltaV/Traits/altvision.yml    |  7 -------
 4 files changed, 38 deletions(-)
 delete mode 100644 Content.Shared/DeltaV/Abilities/DefaultVisionComponent.cs
 delete mode 100644 Content.Shared/DeltaV/Abilities/DefaultVisionSystem.cs

diff --git a/Content.Shared/DeltaV/Abilities/DefaultVisionComponent.cs b/Content.Shared/DeltaV/Abilities/DefaultVisionComponent.cs
deleted file mode 100644
index 0126450e5d4..00000000000
--- a/Content.Shared/DeltaV/Abilities/DefaultVisionComponent.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Robust.Shared.GameStates;
-namespace Content.Shared.DeltaV.Abilities;
-
-[RegisterComponent]
-[NetworkedComponent]
-
-public sealed partial class DefaultVisionComponent : Component
-{}
diff --git a/Content.Shared/DeltaV/Abilities/DefaultVisionSystem.cs b/Content.Shared/DeltaV/Abilities/DefaultVisionSystem.cs
deleted file mode 100644
index 7c8fc363540..00000000000
--- a/Content.Shared/DeltaV/Abilities/DefaultVisionSystem.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Shared.Abilities;
-using Content.Shared.DeltaV.Abilities;
-
-namespace Content.Client.DeltaV.Overlays;
-
-public sealed partial class DefaultVisionSystem : EntitySystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<DefaultVisionComponent, ComponentInit>(OnDefaultVisionInit);
-    }
-
-    private void OnDefaultVisionInit(EntityUid uid, DefaultVisionComponent component, ComponentInit args)
-    {
-        RemComp<UltraVisionComponent>(uid);
-        RemComp<DogVisionComponent>(uid);
-    }
-}
diff --git a/Resources/Locale/en-US/deltav/traits/traits.ftl b/Resources/Locale/en-US/deltav/traits/traits.ftl
index 104c091d02e..e00cec47077 100644
--- a/Resources/Locale/en-US/deltav/traits/traits.ftl
+++ b/Resources/Locale/en-US/deltav/traits/traits.ftl
@@ -9,8 +9,5 @@ trait-deuteranopia-name = Deuteranopia
 trait-deuteranopia-desc = Whether through custom bionic eyes, random mutation,
                           or being a Vulpkanin, you have red–green colour blindness.
 
-trait-defaultvision-name = Normal Vision
-trait-defaultvision-desc = You lack any vision variation from the norm for a non-human species.
-
 trait-uncloneable-name = Uncloneable
 trait-uncloneable-desc = Cannot be cloned
diff --git a/Resources/Prototypes/DeltaV/Traits/altvision.yml b/Resources/Prototypes/DeltaV/Traits/altvision.yml
index 7606cbf912b..c361d1b51d8 100644
--- a/Resources/Prototypes/DeltaV/Traits/altvision.yml
+++ b/Resources/Prototypes/DeltaV/Traits/altvision.yml
@@ -11,10 +11,3 @@
   description: trait-deuteranopia-desc
   components:
     - type: DogVision
-
-- type: trait
-  id: DefaultVision
-  name: trait-defaultvision-name
-  description: trait-defaultvision-desc
-  components:
-    - type: DefaultVision