Merge branch 'master' into accentless-gobbos

.github/workflows/publish.yml

@@ -6,7 +6,7 @@ concurrency:
 on:
   workflow_dispatch:
   # Frontier: re-enabled autopublish
-   schedule:
+  schedule:
     - cron: '0 10 * * *'
 
 jobs:

Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml

@@ -31,6 +31,7 @@
             <Button Name="BanButton" Text="{Loc player-panel-ban}" Disabled="True"/>
             <controls:ConfirmButton Name="RejuvenateButton" Text="{Loc player-panel-rejuvenate}" Disabled="True"/>
            </GridContainer>
+           <Button Name="JobWhitelistsButton" Text="{Loc player-panel-job-whitelists}" SetWidth="136" SetHeight="27" Disabled="True"/> <!-- DeltaV: Job whitelists -->
        </BoxContainer>
     </BoxContainer>
 </ui:FancyWindow>

Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml.cs

@@ -26,6 +26,7 @@ public sealed partial class PlayerPanel : FancyWindow
     public event Action? OnLogs;
     public event Action? OnDelete;
     public event Action? OnRejuvenate;
+    public event Action<NetUserId?>? OnOpenJobWhitelists; // DeltaV
 
     public NetUserId? TargetPlayer;
     public string? TargetUsername;
@@ -52,6 +53,8 @@ public PlayerPanel(IClientAdminManager adminManager)
             LogsButton.OnPressed += _ => OnLogs?.Invoke();
             DeleteButton.OnPressed += _ => OnDelete?.Invoke();
             RejuvenateButton.OnPressed += _ => OnRejuvenate?.Invoke();
+
+            JobWhitelistsButton.OnPressed += _ => OnOpenJobWhitelists?.Invoke(TargetPlayer); // DeltaV: Job whitelists
     }
 
     public void SetUsername(string player)
@@ -128,5 +131,6 @@ public void SetButtons()
         LogsButton.Disabled = !_adminManager.CanCommand("adminlogs");
         RejuvenateButton.Disabled = !_adminManager.HasFlag(AdminFlags.Debug);
         DeleteButton.Disabled = !_adminManager.HasFlag(AdminFlags.Debug);
+        JobWhitelistsButton.Disabled = !_adminManager.HasFlag(AdminFlags.Whitelist); // DeltaV
     }
 }

Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs

@@ -38,6 +38,7 @@ public PlayerPanelEui()
         PlayerPanel.OnLogs += () => SendMessage(new PlayerPanelLogsMessage());
         PlayerPanel.OnRejuvenate += () => SendMessage(new PlayerPanelRejuvenationMessage());
         PlayerPanel.OnDelete+= () => SendMessage(new PlayerPanelDeleteMessage());
+        PlayerPanel.OnOpenJobWhitelists += id => _console.ExecuteCommand($"jobwhitelists \"{id}\""); // DeltaV
 
         PlayerPanel.OnClose += () => SendMessage(new CloseEuiMessage());
     }

Content.Client/IconSmoothing/IconSmoothSystem.cs

@@ -81,21 +81,25 @@ public void SetStateBase(EntityUid uid, IconSmoothComponent component, string ne
 
         private void SetCornerLayers(SpriteComponent sprite, IconSmoothComponent component)
         {
-            sprite.LayerMapRemove(CornerLayers.SE);
-            sprite.LayerMapRemove(CornerLayers.NE);
-            sprite.LayerMapRemove(CornerLayers.NW);
-            sprite.LayerMapRemove(CornerLayers.SW);
-
+            // Frontier: Allow overlays on entities using CornerLayers smoothing - don't remove layers, adjust existing ones or create new ones.
             var state0 = $"{component.StateBase}0";
-            sprite.LayerMapSet(CornerLayers.SE, sprite.AddLayerState(state0));
-            sprite.LayerSetDirOffset(CornerLayers.SE, DirectionOffset.None);
-            sprite.LayerMapSet(CornerLayers.NE, sprite.AddLayerState(state0));
-            sprite.LayerSetDirOffset(CornerLayers.NE, DirectionOffset.CounterClockwise);
-            sprite.LayerMapSet(CornerLayers.NW, sprite.AddLayerState(state0));
-            sprite.LayerSetDirOffset(CornerLayers.NW, DirectionOffset.Flip);
-            sprite.LayerMapSet(CornerLayers.SW, sprite.AddLayerState(state0));
-            sprite.LayerSetDirOffset(CornerLayers.SW, DirectionOffset.Clockwise);
+            SetCornerLayerState(sprite, CornerLayers.SE, DirectionOffset.None, state0);
+            SetCornerLayerState(sprite, CornerLayers.NE, DirectionOffset.CounterClockwise, state0);
+            SetCornerLayerState(sprite, CornerLayers.NW, DirectionOffset.Flip, state0);
+            SetCornerLayerState(sprite, CornerLayers.SW, DirectionOffset.Clockwise, state0);
+            // End Frontier: Allow overlays on entities using CornerLayers smoothing - don't remove layers, adjust existing ones or create new ones.
+        }
+
+        // Frontier: set layer function to remove redundancy
+        private void SetCornerLayerState(SpriteComponent sprite, CornerLayers corner, DirectionOffset offset, string state)
+        {
+            if (sprite.LayerMapTryGet(corner, out var layer))
+                sprite.LayerSetState(layer, state);
+            else
+                sprite.LayerMapSet(corner, sprite.AddLayerState(state));
+            sprite.LayerSetDirOffset(corner, offset);
         }
+        // End Frontier: set layer function to remove redundancy
 
         private void OnShutdown(EntityUid uid, IconSmoothComponent component, ComponentShutdown args)
         {

Content.Client/Nyanotrasen/Overlays/DogVisionSystem.cs

@@ -1,5 +1,5 @@
 using Content.Shared.Abilities;
-using Content.Shared.DeltaV.CCVars;
+using Content.Shared._DV.CCVars;
 using Robust.Client.Graphics;
 using Robust.Shared.Configuration;
 using Robust.Shared.Player;

Content.Client/Options/UI/OptionsMenu.xaml

@@ -1,6 +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"
+            xmlns:dtabs="clr-namespace:Content.Client._DV.Options.UI.Tabs"
             Title="{Loc 'ui-options-title'}"
             MinSize="800 450">
     <TabContainer Name="Tabs" Access="Public">

Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs

@@ -167,6 +167,10 @@ public bool CheckWhitelist(JobPrototype job, [NotNullWhen(false)] out FormattedM
         if (!_cfg.GetCVar(CCVars.GameRoleWhitelist))
             return true;
 
+        // DeltaV - blanket whitelist check in client
+        //if (_whitelisted)
+        //    return true;
+
         if (job.Whitelisted && !_jobWhitelists.Contains(job.ID) && !_whitelisted) // Frontier: add _whitelisted
         {
             reason = FormattedMessage.FromUnformatted(Loc.GetString("role-not-whitelisted"));

Content.Client/Research/UI/DiskConsoleBoundUserInterface.cs

@@ -28,7 +28,7 @@ protected override void Open()
             {
                 SendMessage(new DiskConsolePrintDiskMessage());
             };
-            _menu.OnPrintRareButtonPressed += () =>
+            _menu.OnPrintRareButtonPressed += () => // Frontier: Rare disk
             {
                 SendMessage(new DiskConsolePrintRareDiskMessage());
             };

Content.Client/Stack/StackCustomSplitBoundUserInterface.cs

@@ -0,0 +1,41 @@
+// Cherry-picked from space-station-14#32938 courtesy of Ilya246
+using JetBrains.Annotations;
+using Content.Shared.Stacks;
+using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.Stack
+{
+    [UsedImplicitly]
+    public sealed class StackCustomSplitBoundUserInterface : BoundUserInterface
+    {
+        private IEntityManager _entManager;
+        private EntityUid _owner;
+        [ViewVariables]
+        private StackCustomSplitWindow? _window;
+
+        public StackCustomSplitBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+        {
+            _owner = owner;
+            _entManager = IoCManager.Resolve<IEntityManager>();
+        }
+
+        protected override void Open()
+        {
+            base.Open();
+            _window = this.CreateWindow<StackCustomSplitWindow>();
+
+            if (_entManager.TryGetComponent<StackComponent>(_owner, out var comp))
+                _window.SetMax(comp.Count);
+
+            _window.ApplyButton.OnPressed += _ =>
+            {
+                if (int.TryParse(_window.AmountLineEdit.Text, out var i))
+                {
+                    SendMessage(new StackCustomSplitAmountMessage(i));
+                    _window.Close();
+                }
+            };
+        }
+    }
+}

Content.Client/Stack/StackCustomSplitWindow.xaml

@@ -0,0 +1,15 @@
+<DefaultWindow xmlns="https://spacestation14.io"
+            Title="{Loc 'ui-custom-stack-split-title'}"
+            Resizable="False">
+    <!--Cherry-picked from space-station-14#32938 courtesy of Ilya246-->
+
+    <BoxContainer Orientation="Vertical" SeparationOverride="4" MinSize="240 80">
+        <BoxContainer Orientation="Horizontal">
+            <LineEdit Name="AmountLineEdit" Access="Public" HorizontalExpand="True" PlaceHolder="{Loc 'ui-custom-stack-split-line-edit-placeholder'}"/>
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
+          <Label Name="MaximumAmount" Access="Public" />
+        </BoxContainer>
+        <Button Name="ApplyButton" Access="Public" Text="{Loc 'ui-custom-stack-split-apply'}"/>
+    </BoxContainer>
+</DefaultWindow>

Content.Client/Stack/StackCustomSplitWindow.xaml.cs

@@ -0,0 +1,35 @@
+// Cherry-picked from space-station-14#32938 courtesy of Ilya246
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Stack
+{
+    [GenerateTypedNameReferences]
+    public sealed partial class StackCustomSplitWindow : DefaultWindow
+    {
+        private int _max = Int32.MaxValue;
+        private int _min = 1;
+
+        public StackCustomSplitWindow()
+        {
+            RobustXamlLoader.Load(this);
+            AmountLineEdit.OnTextChanged += OnValueChanged;
+        }
+
+        public void SetMax(int max)
+        {
+          _max = max;
+          MaximumAmount.Text = Loc.GetString("comp-stack-split-size", ("size", _max));
+        }
+
+        private void OnValueChanged(LineEdit.LineEditEventArgs args)
+        {
+            if (!int.TryParse(AmountLineEdit.Text, out var amount)  || amount > _max || amount < _min)
+                ApplyButton.Disabled = true;
+            else
+                ApplyButton.Disabled = false;
+        }
+    }
+}

Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs

@@ -26,7 +26,7 @@ public sealed class GuidebookUIController : UIController, IOnStateEntered<LobbyS
     [Dependency] private readonly IConfigurationManager _configuration = default!;
     [Dependency] private readonly JobRequirementsManager _jobRequirements = default!;
 
-    private const int PlaytimeOpenGuidebook = 60;
+    private const int PlaytimeOpenGuidebook = 180; // Frontier 60<180
 
     private GuidebookWindow? _guideWindow;
     private MenuButton? GuidebookButton => UIManager.GetActiveUIWidgetOrNull<MenuBar.Widgets.GameTopMenuBar>()?.GuidebookButton;
@@ -210,7 +210,7 @@ public void OpenGuidebook(
 
         // Expand up to depth-2.
         _guideWindow.Tree.SetAllExpanded(false);
-        _guideWindow.Tree.SetAllExpanded(true, 1);
+        _guideWindow.Tree.SetAllExpanded(true, 0); // Frontier: 1->0 (too many entries at depth 2)
 
         _guideWindow.OpenCenteredRight();
     }

Content.Client/DeltaV/Abilities/CrawlUnderObjectsSystem.cs → Content.Client/_DV/Abilities/CrawlUnderObjectsSystem.cs

@@ -1,9 +1,9 @@
-using Content.Shared.DeltaV.Abilities;
+using Content.Shared._DV.Abilities;
 using Content.Shared.Popups;
 using Robust.Client.GameObjects;
 using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
 
-namespace Content.Client.DeltaV.Abilities;
+namespace Content.Client._DV.Abilities;
 
 public sealed partial class HideUnderTableAbilitySystem : SharedCrawlUnderObjectsSystem
 {

Content.Client/_DV/Administration/UI/DepartmentWhitelistPanel.xaml

@@ -0,0 +1,11 @@
+<PanelContainer
+        xmlns="https://spacestation14.io"
+        xmlns:cc="clr-namespace:Content.Client._DV.Administration.UI"
+        StyleClasses="BackgroundDark"
+        HorizontalExpand="True"
+        Margin="4">
+    <BoxContainer Orientation="Vertical">
+        <CheckBox Name="Department"/> <!-- Toggles all jobs in the department at once -->
+	    <GridContainer Name="JobsContainer" Columns="4"/> <!-- Populated with each job to toggle individually-->
+    </BoxContainer>
+</PanelContainer>

Content.Client/_DV/Administration/UI/DepartmentWhitelistPanel.xaml.cs

@@ -0,0 +1,82 @@
+using Content.Shared.Roles;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._DV.Administration.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class DepartmentWhitelistPanel : PanelContainer
+{
+    public Action<ProtoId<JobPrototype>, bool>? OnSetJob;
+
+    public DepartmentWhitelistPanel(DepartmentPrototype department, IPrototypeManager proto, HashSet<ProtoId<JobPrototype>> whitelists, bool globalWhitelist) // Frontier: add globalWhitelist
+    {
+        RobustXamlLoader.Load(this);
+
+        var anyValid = false;//
+        var allWhitelisted = true;
+        var grey = Color.FromHex("#ccc");
+        foreach (var id in department.Roles)
+        {
+            var thisJob = id; // closure capturing funny
+
+            // Frontier: skip non-whitelisted roles, cache prototype
+            var jobProto = proto.Index(id);
+            if (!jobProto.Whitelisted)
+                continue;
+            else
+                anyValid = true;
+            // End Frontier
+
+            var button = new CheckBox();
+            button.Text = jobProto.LocalizedName;
+            if (!jobProto.Whitelisted)
+                button.Modulate = grey; // Let admins know whitelisting this job is only for futureproofing.
+            button.Pressed = whitelists.Contains(id) || globalWhitelist;
+            button.OnPressed += _ => OnButtonPressed(thisJob, button, globalWhitelist); // Frontier: check global whitelist
+            JobsContainer.AddChild(button);
+
+            allWhitelisted &= button.Pressed;
+        }
+
+        if (!anyValid) // Frontier: hide checkbox set if no valid events
+            Visible = false;  // Frontier
+
+        Department.Text = Loc.GetString(department.Name);
+        Department.Modulate = department.Color;
+        Department.Pressed = allWhitelisted;
+        Department.OnPressed += args => OnDepartmentPressed(department, proto, whitelists, globalWhitelist); // Frontier: check global whitelist
+    }
+
+    // Frontier: global whitelist handling
+    private void OnButtonPressed(ProtoId<JobPrototype> thisJob, CheckBox button, bool globalWhitelist)
+    {
+        if (globalWhitelist)
+            button.Pressed = true; // Force the button on.
+        else
+            OnSetJob?.Invoke(thisJob, button.Pressed);
+    }
+
+    private void OnDepartmentPressed(DepartmentPrototype department, IPrototypeManager proto, HashSet<ProtoId<JobPrototype>> whitelists, bool globalWhitelist)
+    {
+        // Frontier: global override
+        if (globalWhitelist)
+        {
+            Department.Pressed = true;
+            return;
+        }
+        // End Frontier: global override
+
+        foreach (var id in department.Roles)
+        {
+            // only request to whitelist roles that aren't already whitelisted, and vice versa - Frontier: roles must be whitelisted
+            if (whitelists.Contains(id) != Department.Pressed && proto.Index(id).Whitelisted)
+                OnSetJob?.Invoke(id, Department.Pressed);
+        }
+    }
+    // End Frontier
+}

Content.Client/_DV/Administration/UI/GhostRoleSetWhitelistPanel.xaml

@@ -0,0 +1,11 @@
+<PanelContainer
+        xmlns="https://spacestation14.io"
+        xmlns:cc="clr-namespace:Content.Client._DV.Administration.UI"
+        StyleClasses="BackgroundDark"
+        HorizontalExpand="True"
+        Margin="4"> <!-- Frontier: ghost role set whitelist -->
+    <BoxContainer Orientation="Vertical">
+        <CheckBox Name="GhostRoleSet"/> <!-- Toggles all jobs in the department at once -->
+	    <GridContainer Name="RolesContainer" Columns="4"/> <!-- Populated with each job to toggle individually-->
+    </BoxContainer>
+</PanelContainer>