Revert "The Bird, the Vulp and the Un-Cloneable (#1316)"

This reverts commit c89fbf7.

Content.Client/DeltaV/Overlays/UltraVisionOverlay.cs

@@ -2,7 +2,7 @@
 using Robust.Client.Player;
 using Robust.Shared.Enums;
 using Robust.Shared.Prototypes;
-using Content.Shared.Abilities;
+using Content.Shared.DeltaV.Abilities;
 
 namespace Content.Client.DeltaV.Overlays;
 
@@ -23,29 +23,22 @@ public UltraVisionOverlay()
         _ultraVisionShader = _prototypeManager.Index<ShaderPrototype>("UltraVision").Instance().Duplicate();
     }
 
-    protected override bool BeforeDraw(in OverlayDrawArgs args)
-    {
-        if (_playerManager.LocalEntity is not { Valid: true } player
-            || !_entityManager.HasComponent<UltraVisionComponent>(player))
-        {
-            return false;
-        }
-
-        return base.BeforeDraw(in args);
-    }
-
     protected override void Draw(in OverlayDrawArgs args)
     {
-        if (ScreenTexture is null)
+        if (ScreenTexture == null)
             return;
+        if (_playerManager.LocalPlayer?.ControlledEntity is not {Valid: true} player)
+            return;
+        if (!_entityManager.HasComponent<UltraVisionComponent>(player))
+            return;
+
+        _ultraVisionShader?.SetParameter("SCREEN_TEXTURE", ScreenTexture);
 
-        _ultraVisionShader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
 
         var worldHandle = args.WorldHandle;
         var viewport = args.WorldBounds;
         worldHandle.SetTransform(Matrix3.Identity);
         worldHandle.UseShader(_ultraVisionShader);
         worldHandle.DrawRect(viewport, Color.White);
-        worldHandle.UseShader(null); // important - as of writing, construction overlay breaks without this
     }
 }

Content.Client/DeltaV/Overlays/UltraVisionSystem.cs

@@ -1,16 +1,11 @@
-using Content.Shared.Abilities;
-using Content.Shared.DeltaV.CCVars;
+using Content.Shared.DeltaV.Abilities;
 using Robust.Client.Graphics;
-using Robust.Shared.Configuration;
-using Robust.Shared.Player;
 
 namespace Content.Client.DeltaV.Overlays;
 
 public sealed partial class UltraVisionSystem : EntitySystem
 {
     [Dependency] private readonly IOverlayManager _overlayMan = default!;
-    [Dependency] private readonly IConfigurationManager _cfg = default!;
-    [Dependency] private readonly ISharedPlayerManager _playerMan = default!;
 
     private UltraVisionOverlay _overlay = default!;
 
@@ -20,42 +15,17 @@ public override void Initialize()
 
         SubscribeLocalEvent<UltraVisionComponent, ComponentInit>(OnUltraVisionInit);
         SubscribeLocalEvent<UltraVisionComponent, ComponentShutdown>(OnUltraVisionShutdown);
-        SubscribeLocalEvent<UltraVisionComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
-        SubscribeLocalEvent<UltraVisionComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
-
-        Subs.CVar(_cfg, DCCVars.NoVisionFilters, OnNoVisionFiltersChanged);
-
+
         _overlay = new();
     }
 
     private void OnUltraVisionInit(EntityUid uid, UltraVisionComponent component, ComponentInit args)
     {
-        if (uid == _playerMan.LocalEntity && !_cfg.GetCVar(DCCVars.NoVisionFilters))
-            _overlayMan.AddOverlay(_overlay);
+        _overlayMan.AddOverlay(_overlay);
     }
 
     private void OnUltraVisionShutdown(EntityUid uid, UltraVisionComponent component, ComponentShutdown args)
-    {
-        if (uid == _playerMan.LocalEntity)
-            _overlayMan.RemoveOverlay(_overlay);
-    }
-
-    private void OnPlayerAttached(EntityUid uid, UltraVisionComponent component, LocalPlayerAttachedEvent args)
-    {
-        if (!_cfg.GetCVar(DCCVars.NoVisionFilters))
-            _overlayMan.AddOverlay(_overlay);
-    }
-
-    private void OnPlayerDetached(EntityUid uid, UltraVisionComponent component, LocalPlayerDetachedEvent args)
     {
         _overlayMan.RemoveOverlay(_overlay);
     }
-
-    private void OnNoVisionFiltersChanged(bool enabled)
-    {
-        if (enabled)
-            _overlayMan.RemoveOverlay(_overlay);
-        else
-            _overlayMan.AddOverlay(_overlay);
-    }
 }

Content.Client/Nyanotrasen/Overlays/Overlays/DogVisionOverlay.cs

@@ -0,0 +1,45 @@
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Shared.Enums;
+using Robust.Shared.Prototypes;
+using Content.Shared.Abilities;
+
+namespace Content.Client.Nyanotrasen.Overlays
+{
+    public sealed class DogVisionOverlay : Overlay
+    {
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] IEntityManager _entityManager = default!;
+
+
+        public override bool RequestScreenTexture => true;
+        public override OverlaySpace Space => OverlaySpace.WorldSpace;
+        private readonly ShaderInstance _dogVisionShader;
+
+        public DogVisionOverlay()
+        {
+            IoCManager.InjectDependencies(this);
+            _dogVisionShader = _prototypeManager.Index<ShaderPrototype>("DogVision").Instance().Duplicate();
+        }
+
+        protected override void Draw(in OverlayDrawArgs args)
+        {
+            if (ScreenTexture == null)
+                return;
+            if (_playerManager.LocalPlayer?.ControlledEntity is not {Valid: true} player)
+                return;
+            if (!_entityManager.HasComponent<DogVisionComponent>(player))
+                return;
+
+            _dogVisionShader?.SetParameter("SCREEN_TEXTURE", ScreenTexture);
+
+
+            var worldHandle = args.WorldHandle;
+            var viewport = args.WorldBounds;
+            worldHandle.SetTransform(Matrix3.Identity);
+            worldHandle.UseShader(_dogVisionShader);
+            worldHandle.DrawRect(viewport, Color.White);
+        }
+    }
+}

Content.Client/Nyanotrasen/Overlays/DogVisionSystem.cs → Content.Client/Nyanotrasen/Overlays/Overlays/DogVisionSystem.cs

@@ -1,16 +1,14 @@
 using Content.Shared.Abilities;
-using Content.Shared.DeltaV.CCVars;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
-using Robust.Shared.Configuration;
+using Robust.Client.Player;
 using Robust.Shared.Player;
 
 namespace Content.Client.Nyanotrasen.Overlays;
-
-public sealed partial class DogVisionSystem : EntitySystem
+public sealed class DogVisionSystem : EntitySystem
 {
+    [Dependency] private readonly IPlayerManager _player = default!;
     [Dependency] private readonly IOverlayManager _overlayMan = default!;
-    [Dependency] private readonly IConfigurationManager _cfg = default!;
-    [Dependency] private readonly ISharedPlayerManager _playerMan = default!;
 
     private DogVisionOverlay _overlay = default!;
 
@@ -20,42 +18,34 @@ public override void Initialize()
 
         SubscribeLocalEvent<DogVisionComponent, ComponentInit>(OnDogVisionInit);
         SubscribeLocalEvent<DogVisionComponent, ComponentShutdown>(OnDogVisionShutdown);
+
         SubscribeLocalEvent<DogVisionComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
         SubscribeLocalEvent<DogVisionComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
 
-        Subs.CVar(_cfg, DCCVars.NoVisionFilters, OnNoVisionFiltersChanged);
-
         _overlay = new();
     }
 
-    private void OnDogVisionInit(EntityUid uid, DogVisionComponent component, ComponentInit args)
+    private void OnPlayerAttached(EntityUid uid, DogVisionComponent component, LocalPlayerAttachedEvent args)
     {
-        if (uid == _playerMan.LocalEntity && !_cfg.GetCVar(DCCVars.NoVisionFilters))
-            _overlayMan.AddOverlay(_overlay);
+        _overlayMan.AddOverlay(_overlay);
     }
 
-    private void OnDogVisionShutdown(EntityUid uid, DogVisionComponent component, ComponentShutdown args)
+    private void OnPlayerDetached(EntityUid uid, DogVisionComponent component, LocalPlayerDetachedEvent args)
     {
-        if (uid == _playerMan.LocalEntity)
-            _overlayMan.RemoveOverlay(_overlay);
+        _overlayMan.RemoveOverlay(_overlay);
     }
 
-    private void OnPlayerAttached(EntityUid uid, DogVisionComponent component, LocalPlayerAttachedEvent args)
+    private void OnDogVisionInit(EntityUid uid, DogVisionComponent component, ComponentInit args)
     {
-        if (!_cfg.GetCVar(DCCVars.NoVisionFilters))
+        if (_player.LocalPlayer?.ControlledEntity == uid)
             _overlayMan.AddOverlay(_overlay);
     }
 
-    private void OnPlayerDetached(EntityUid uid, DogVisionComponent component, LocalPlayerDetachedEvent args)
-    {
-        _overlayMan.RemoveOverlay(_overlay);
-    }
-
-    private void OnNoVisionFiltersChanged(bool enabled)
+    private void OnDogVisionShutdown(EntityUid uid, DogVisionComponent component, ComponentShutdown args)
     {
-        if (enabled)
+        if (_player.LocalPlayer?.ControlledEntity == uid)
+        {
             _overlayMan.RemoveOverlay(_overlay);
-        else
-            _overlayMan.AddOverlay(_overlay);
+        }
     }
 }

Content.Client/Options/UI/OptionsMenu.xaml

@@ -1,6 +1,5 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             xmlns:tabs="clr-namespace:Content.Client.Options.UI.Tabs"
-            xmlns:dtabs="clr-namespace:Content.Client.DeltaV.Options.UI.Tabs"
             Title="{Loc 'ui-options-title'}"
             MinSize="800 450">
     <TabContainer Name="Tabs" Access="Public">
@@ -9,6 +8,5 @@
         <tabs:KeyRebindTab Name="KeyRebindTab" />
         <tabs:AudioTab Name="AudioTab" />
         <tabs:NetworkTab Name="NetworkTab" />
-        <dtabs:DeltaTab Name="ExtraTab" />
     </TabContainer>
 </DefaultWindow>

Content.Client/Options/UI/OptionsMenu.xaml.cs

@@ -20,7 +20,6 @@ public OptionsMenu()
             Tabs.SetTabTitle(2, Loc.GetString("ui-options-tab-controls"));
             Tabs.SetTabTitle(3, Loc.GetString("ui-options-tab-audio"));
             Tabs.SetTabTitle(4, Loc.GetString("ui-options-tab-network"));
-            Tabs.SetTabTitle(5, Loc.GetString("ui-options-tab-extra")); // Extra settings
 
             UpdateTabs();
         }

Content.Server/Cloning/CloningSystem.cs

@@ -203,19 +203,6 @@ public bool TryCloning(EntityUid uid, EntityUid bodyToClone, Entity<MindComponen
             if (_configManager.GetCVar(CCVars.BiomassEasyMode))
                 cloningCost = (int) Math.Round(cloningCost * EasyModeCloningCost);
 
-            // Check if they have the uncloneable trait
-            if (TryComp<UncloneableComponent>(bodyToClone, out _))
-            {
-                if (clonePod.ConnectedConsole != null)
-                {
-                    _chatSystem.TrySendInGameICMessage(clonePod.ConnectedConsole.Value,
-                        Loc.GetString("cloning-console-uncloneable-trait-error"),
-                        InGameICChatType.Speak, false);
-                }
-
-                return false;
-            }
-
             // biomass checks
             var biomassAmount = _material.GetMaterialAmount(uid, clonePod.RequiredMaterial);