Merge branch 'master' of https://github.com/dvir001/frontier-station-14…

… into 2024-04-29-MailTruck
new-frontiers-14 · Jun 7, 2024 · 0ffc1b9 · 0ffc1b9
2 parents 77b773a + c8eee32
commit 0ffc1b9
Show file tree

Hide file tree

Showing 844 changed files with 70,776 additions and 16,874 deletions.
diff --git a/.github/mapchecker/whitelist.yml b/.github/mapchecker/whitelist.yml
@@ -4,6 +4,7 @@ Nfsd: true
 LPBravo: true
 Cove: true
 Lodge: true
+Trade: true
 
 #Cove:
 #  - WallPlastitanium

diff --git a/Content.Client/Administration/AdminNameOverlay.cs b/Content.Client/Administration/AdminNameOverlay.cs
@@ -61,14 +61,12 @@ protected override void Draw(in OverlayDrawArgs args)
                 var screenCoordinates = _eyeManager.WorldToScreen(aabb.Center +
                                                                   new Angle(-_eyeManager.CurrentEye.Rotation).RotateVec(
                                                                       aabb.TopRight - aabb.Center)) + new Vector2(1f, 7f);
-                var balance_str = playerInfo.Balance == int.MinValue ? "NO BALANCE" : playerInfo.Balance.ToString(); // Frontier
                 if (playerInfo.Antag)
                 {
                     args.ScreenHandle.DrawString(_font, screenCoordinates + (lineoffset * 2), "ANTAG", Color.OrangeRed);
                 }
                 args.ScreenHandle.DrawString(_font, screenCoordinates+lineoffset, playerInfo.Username, playerInfo.Connected ? Color.Yellow : Color.White);
                 args.ScreenHandle.DrawString(_font, screenCoordinates, playerInfo.CharacterName, playerInfo.Connected ? Color.Aquamarine : Color.White);
-                args.ScreenHandle.DrawString(_font, screenCoordinates + 3 * lineoffset, $"balance: {balance_str}", playerInfo.Connected ? Color.Aquamarine : Color.White);
             }
         }
     }

diff --git a/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs b/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs
@@ -23,6 +23,8 @@ public AdminAnnounceWindow()
             AnnounceMethod.SetItemMetadata(0, AdminAnnounceType.Station);
             AnnounceMethod.AddItem(_localization.GetString("admin-announce-type-server"));
             AnnounceMethod.SetItemMetadata(1, AdminAnnounceType.Server);
+            AnnounceMethod.AddItem(_localization.GetString("admin-announce-type-antag"));  // Frontier
+            AnnounceMethod.SetItemMetadata(2, AdminAnnounceType.Antag);  // Frontier
             AnnounceMethod.OnItemSelected += AnnounceMethodOnOnItemSelected;
             Announcement.OnKeyBindUp += AnnouncementOnOnTextChanged;
         }
@@ -35,7 +37,8 @@ private void AnnouncementOnOnTextChanged(GUIBoundKeyEventArgs args)
         private void AnnounceMethodOnOnItemSelected(OptionButton.ItemSelectedEventArgs args)
         {
             AnnounceMethod.SelectId(args.Id);
-            Announcer.Editable = ((AdminAnnounceType?)args.Button.SelectedMetadata ?? AdminAnnounceType.Station) == AdminAnnounceType.Station;
+            Announcer.Editable = ((AdminAnnounceType?)args.Button.SelectedMetadata ?? AdminAnnounceType.Station) == AdminAnnounceType.Station
+            || ((AdminAnnounceType?)args.Button.SelectedMetadata ?? AdminAnnounceType.Antag) == AdminAnnounceType.Antag; // Frontier
         }
     }
 }
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
@@ -121,8 +121,7 @@ private void RefreshPlayerList(IReadOnlyList<PlayerInfo> players)
                     player.Antag ? "YES" : "NO",
                     new StyleBoxFlat(useAltColor ? _altColor : _defaultColor),
                     player.Connected,
-                    player.PlaytimeString, // Frontier
-                    player.Balance == int.MinValue ? "NO BALANCE" : player.Balance.ToString()); // Frontier
+                    player.PlaytimeString);
                 entry.PlayerEntity = player.NetEntity;
                 entry.OnKeyBindDown += args => OnEntryKeyBindDown?.Invoke(entry, args);
                 entry.ToolTip = Loc.GetString("player-tab-entry-tooltip");
@@ -152,9 +151,8 @@ private int Compare(PlayerInfo x, PlayerInfo y)
                 Header.Job => Compare(x.StartingJob, y.StartingJob),
                 Header.Antagonist => x.Antag.CompareTo(y.Antag),
                 Header.Playtime => TimeSpan.Compare(x.OverallPlaytime ?? default, y.OverallPlaytime ?? default),
-                Header.Balance => x.Balance.CompareTo(y.Balance), // Frontier
                 _ => 1
-            }; ;
+            };
         }
 
         private int Compare(string x, string y)

diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
@@ -27,9 +27,5 @@
                SizeFlagsStretchRatio="2"
                HorizontalExpand="True"
                ClipText="True"/>
-        <Label Name="BalanceLabel"
-               SizeFlagsStretchRatio="2"
-               HorizontalExpand="True"
-               ClipText="True"/>
     </BoxContainer>
 </ContainerButton>
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -10,7 +10,7 @@ public sealed partial class PlayerTabEntry : ContainerButton
 {
     public NetEntity? PlayerEntity;
 
-    public PlayerTabEntry(string username, string character, string identity, string job, string antagonist, StyleBox styleBox, bool connected, string overallPlaytime, string balance) // Frontier - Add int balance
+    public PlayerTabEntry(string username, string character, string identity, string job, string antagonist, StyleBox styleBox, bool connected, string overallPlaytime)
     {
         RobustXamlLoader.Load(this);
 
@@ -24,6 +24,5 @@ public PlayerTabEntry(string username, string character, string identity, string
         AntagonistLabel.Text = antagonist;
         BackgroundColorPanel.PanelOverride = styleBox;
         OverallPlaytimeLabel.Text = overallPlaytime;
-        BalanceLabel.Text = balance.ToString(); // Frontier
     }
 }
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
@@ -1,4 +1,4 @@
-<Control xmlns="https://spacestation14.io"
+<Control xmlns="https://spacestation14.io"
                  xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
     <PanelContainer Name="BackgroundColorPanel" Access="Public"/>
     <BoxContainer Orientation="Horizontal"
@@ -31,18 +31,11 @@
                ClipText="True"
                Text="{Loc player-tab-antagonist}"
                MouseFilter="Pass"/>
-        <cc:VSeparator/>
         <Label Name="PlaytimeLabel"
                SizeFlagsStretchRatio="2"
                HorizontalExpand="True"
                ClipText="True"
                Text="{Loc player-tab-playtime}"
                MouseFilter="Pass"/>
-        <Label Name="BalanceLabel"
-               SizeFlagsStretchRatio="2"
-               HorizontalExpand="True"
-               ClipText="True"
-               Text="{Loc player-tab-balance}"
-               MouseFilter="Pass"/>
     </BoxContainer>
 </Control>
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs
@@ -1,4 +1,4 @@
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -20,7 +20,6 @@ public PlayerTabHeader()
         JobLabel.OnKeyBindDown += JobClicked;
         AntagonistLabel.OnKeyBindDown += AntagonistClicked;
         PlaytimeLabel.OnKeyBindDown += PlaytimeClicked;
-        BalanceLabel.OnKeyBindDown += BalanceClicked; // Frontier
     }
 
     public Label GetHeader(Header header)
@@ -32,7 +31,6 @@ public Label GetHeader(Header header)
             Header.Job => JobLabel,
             Header.Antagonist => AntagonistLabel,
             Header.Playtime => PlaytimeLabel,
-            Header.Balance => BalanceLabel, // Frontier
             _ => throw new ArgumentOutOfRangeException(nameof(header), header, null)
         };
     }
@@ -44,7 +42,6 @@ public void ResetHeaderText()
         JobLabel.Text = Loc.GetString("player-tab-job");
         AntagonistLabel.Text = Loc.GetString("player-tab-antagonist");
         PlaytimeLabel.Text = Loc.GetString("player-tab-playtime");
-        BalanceLabel.Text = Loc.GetString("player-tab-balance"); // Frontier
     }
 
     private void HeaderClicked(GUIBoundKeyEventArgs args, Header header)
@@ -83,11 +80,6 @@ private void PlaytimeClicked(GUIBoundKeyEventArgs args)
         HeaderClicked(args, Header.Playtime);
     }
 
-    private void BalanceClicked(GUIBoundKeyEventArgs args) // Frontier
-    {
-        HeaderClicked(args, Header.Balance);
-    }
-
     protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);
@@ -99,7 +91,6 @@ protected override void Dispose(bool disposing)
             JobLabel.OnKeyBindDown -= JobClicked;
             AntagonistLabel.OnKeyBindDown -= AntagonistClicked;
             PlaytimeLabel.OnKeyBindDown -= PlaytimeClicked;
-            BalanceLabel.OnKeyBindDown -= BalanceClicked; // Frontier
         }
     }
 
@@ -109,7 +100,6 @@ public enum Header
         Character,
         Job,
         Antagonist,
-        Playtime,
-        Balance // Frontier
+        Playtime
     }
 }
diff --git a/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml b/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>
diff --git a/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml.cs b/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;
+    }
+}
diff --git a/Content.Client/DeltaV/Overlays/UltraVisionOverlay.cs b/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
     }
 }
diff --git a/Content.Client/DeltaV/Overlays/UltraVisionSystem.cs b/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);
+    }
 }