Merge branch 'master' into hardsuit

.github/mapchecker/whitelist.yml

@@ -4,6 +4,7 @@ Nfsd: true
 LPBravo: true
 Cove: true
 Lodge: true
+Trade: true
 
 #Cove:
 #  - WallPlastitanium

Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml

@@ -0,0 +1,23 @@
+<tabs:DeltaTab xmlns="https://spacestation14.io"
+                  xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                  xmlns:tabs="clr-namespace:Content.Client.DeltaV.Options.UI.Tabs"
+                  xmlns:xNamespace="http://schemas.microsoft.com/winfx/2006/xaml"
+                  xmlns:s="clr-namespace:Content.Client.Stylesheets">
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Vertical" Margin="8 8 8 8" VerticalExpand="True">
+            <Label Text="{Loc 'ui-options-general-forknotice'}"
+                   FontColorOverride="{xNamespace:Static s:StyleNano.ConcerningOrangeFore}"
+                   StyleClasses="LabelKeyText"/>
+            <Label Text="{Loc 'ui-options-general-accessibility'}"
+                   FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
+                   StyleClasses="LabelKeyText"/>
+            <CheckBox Name="DisableFiltersCheckBox" Text="{Loc 'ui-options-no-filters'}" />
+        </BoxContainer>
+        <controls:StripeBack HasBottomEdge="False" HasMargins="False">
+            <Button Name="ApplyButton"
+                    Text="{Loc 'ui-options-apply'}"
+                    TextAlign="Center"
+                    HorizontalAlignment="Right" />
+        </controls:StripeBack>
+    </BoxContainer>
+</tabs:DeltaTab>

Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml.cs

@@ -0,0 +1,46 @@
+using Content.Shared.DeltaV.CCVars;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Configuration;
+
+namespace Content.Client.DeltaV.Options.UI.Tabs;
+
+[GenerateTypedNameReferences]
+public sealed partial class DeltaTab : Control
+{
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+    public DeltaTab()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        DisableFiltersCheckBox.OnToggled += OnCheckBoxToggled;
+        DisableFiltersCheckBox.Pressed = _cfg.GetCVar(DCCVars.NoVisionFilters);
+
+        ApplyButton.OnPressed += OnApplyButtonPressed;
+        UpdateApplyButton();
+    }
+
+    private void OnCheckBoxToggled(BaseButton.ButtonToggledEventArgs args)
+    {
+        UpdateApplyButton();
+    }
+
+    private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
+    {
+        _cfg.SetCVar(DCCVars.NoVisionFilters, DisableFiltersCheckBox.Pressed);
+
+        _cfg.SaveToFile();
+        UpdateApplyButton();
+    }
+
+    private void UpdateApplyButton()
+    {
+        var isNoVisionFiltersSame = DisableFiltersCheckBox.Pressed == _cfg.GetCVar(DCCVars.NoVisionFilters);
+
+        ApplyButton.Disabled = isNoVisionFiltersSame;
+    }
+}

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.DeltaV.Abilities;
+using Content.Shared.Abilities;
 
 namespace Content.Client.DeltaV.Overlays;
 
@@ -23,22 +23,29 @@ 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 == null)
+        if (ScreenTexture is 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,11 +1,16 @@
-using Content.Shared.DeltaV.Abilities;
+using Content.Shared.Abilities;
+using Content.Shared.DeltaV.CCVars;
 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!;
 
@@ -15,17 +20,42 @@ 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)
     {
-        _overlayMan.AddOverlay(_overlay);
+        if (uid == _playerMan.LocalEntity && !_cfg.GetCVar(DCCVars.NoVisionFilters))
+            _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/DogVisionOverlay.cs

@@ -0,0 +1,51 @@
+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 partial 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 bool BeforeDraw(in OverlayDrawArgs args)
+    {
+        if (_playerManager.LocalEntity is not { Valid: true } player
+            || !_entityManager.HasComponent<DogVisionComponent>(player))
+        {
+            return false;
+        }
+
+        return base.BeforeDraw(in args);
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (ScreenTexture is null)
+            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);
+        worldHandle.UseShader(null); // important - as of writing, construction overlay breaks without this
+    }
+}

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

@@ -1,14 +1,16 @@
 using Content.Shared.Abilities;
-using Robust.Client.GameObjects;
+using Content.Shared.DeltaV.CCVars;
 using Robust.Client.Graphics;
-using Robust.Client.Player;
+using Robust.Shared.Configuration;
 using Robust.Shared.Player;
 
 namespace Content.Client.Nyanotrasen.Overlays;
-public sealed class DogVisionSystem : EntitySystem
+
+public sealed partial 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!;
 
@@ -18,34 +20,42 @@ 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 OnPlayerAttached(EntityUid uid, DogVisionComponent component, LocalPlayerAttachedEvent args)
+    private void OnDogVisionInit(EntityUid uid, DogVisionComponent component, ComponentInit args)
     {
-        _overlayMan.AddOverlay(_overlay);
+        if (uid == _playerMan.LocalEntity && !_cfg.GetCVar(DCCVars.NoVisionFilters))
+            _overlayMan.AddOverlay(_overlay);
     }
 
-    private void OnPlayerDetached(EntityUid uid, DogVisionComponent component, LocalPlayerDetachedEvent args)
+    private void OnDogVisionShutdown(EntityUid uid, DogVisionComponent component, ComponentShutdown args)
     {
-        _overlayMan.RemoveOverlay(_overlay);
+        if (uid == _playerMan.LocalEntity)
+            _overlayMan.RemoveOverlay(_overlay);
     }
 
-    private void OnDogVisionInit(EntityUid uid, DogVisionComponent component, ComponentInit args)
+    private void OnPlayerAttached(EntityUid uid, DogVisionComponent component, LocalPlayerAttachedEvent args)
     {
-        if (_player.LocalPlayer?.ControlledEntity == uid)
+        if (!_cfg.GetCVar(DCCVars.NoVisionFilters))
             _overlayMan.AddOverlay(_overlay);
     }
 
-    private void OnDogVisionShutdown(EntityUid uid, DogVisionComponent component, ComponentShutdown args)
+    private void OnPlayerDetached(EntityUid uid, DogVisionComponent component, LocalPlayerDetachedEvent args)
     {
-        if (_player.LocalPlayer?.ControlledEntity == uid)
-        {
+        _overlayMan.RemoveOverlay(_overlay);
+    }
+
+    private void OnNoVisionFiltersChanged(bool enabled)
+    {
+        if (enabled)
             _overlayMan.RemoveOverlay(_overlay);
-        }
+        else
+            _overlayMan.AddOverlay(_overlay);
     }
 }

Content.Client/Options/UI/OptionsMenu.xaml

@@ -1,5 +1,6 @@
 <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">
@@ -8,5 +9,6 @@
         <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,6 +20,7 @@ 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.Client/PDA/PdaMenu.xaml

@@ -47,6 +47,9 @@
             <ContainerButton Name="StationAlertLevelInstructionsButton">
                 <RichTextLabel Name="StationAlertLevelInstructions" Access="Public"/>
             </ContainerButton>
+            <ContainerButton Name="BalanceButton">
+                <RichTextLabel Name="BalanceLabel" Access="Public"/>
+            </ContainerButton>
         </BoxContainer>
         <ScrollContainer HorizontalExpand="True" VerticalExpand="True" HScrollEnabled="True">
             <BoxContainer Orientation="Vertical"