[pull] upstream from space-wizards:master

.github/PULL_REQUEST_TEMPLATE.md

@@ -14,7 +14,7 @@
 Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. -->
 
 ## Requirements
-<!-- Confirm the following by placing an X in the brackets [X]: -->
+<!-- Confirm the following by placing an X in the brackets without spaces inside (for example: [X] ): -->
 - [ ] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
 - [ ] I have added media to this PR or it does not require an in-game showcase.
 <!-- You should understand that not following the above may get your PR closed at maintainer’s discretion -->

Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs

@@ -48,6 +48,10 @@ protected override void Open()
                     (uint) _window.BottleDosage.Value, _window.LabelLine));
             _window.BufferSortButton.OnPressed += _ => SendMessage(
                     new ChemMasterSortingTypeCycleMessage());
+            _window.OutputBufferDraw.OnPressed += _ => SendMessage(
+                new ChemMasterOutputDrawSourceMessage(ChemMasterDrawSource.Internal));
+            _window.OutputBeakerDraw.OnPressed += _ => SendMessage(
+                new ChemMasterOutputDrawSourceMessage(ChemMasterDrawSource.External));
 
             for (uint i = 0; i < _window.PillTypeButtons.Length; i++)
             {

Content.Client/Chemistry/UI/ChemMasterWindow.xaml

@@ -79,10 +79,13 @@
 
             <!-- Packaging -->
             <BoxContainer Orientation="Horizontal">
-                <Label Text="{Loc 'chem-master-window-packaging-text'}" />
+                <Label Text="{Loc 'chem-master-output-source'}" StyleClasses="LabelSecondaryColor" Margin="0 0 5 0"/>
+                <Button MinSize="80 0" Name="OutputBufferDraw" Access="Public" Text="{Loc 'chem-master-output-buffer-draw'}" ToggleMode="True" StyleClasses="OpenRight" />
+                <Button MinSize="80 0" Name="OutputBeakerDraw" Access="Public" Text="{Loc 'chem-master-output-beaker-draw'}" ToggleMode="True" StyleClasses="OpenLeft" />
                 <Control HorizontalExpand="True"/>
-                <Label Text="{Loc 'chem-master-window-buffer-label'}" />
-                <Label Name="BufferCurrentVolume" StyleClasses="LabelWeak" />
+                <!-- Output Draw Source -->
+                <Label Name="DrawSource"/>
+                <Label Name="BufferCurrentVolume" StyleClasses="LabelSecondaryColor" />
             </BoxContainer>
 
             <!-- Wrap the packaging info-->

Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs

@@ -150,7 +150,17 @@ public void UpdateState(BoundUserInterfaceState state)
             // Ensure the Panel Info is updated, including UI elements for Buffer Volume, Output Container and so on
             UpdatePanelInfo(castState);
 
-            BufferCurrentVolume.Text = $" {castState.BufferCurrentVolume?.Int() ?? 0}u";
+            switch (castState.DrawSource)
+            {
+                case ChemMasterDrawSource.Internal:
+                    SetBufferText(castState.BufferCurrentVolume, "chem-master-output-buffer-draw");
+                    break;
+                case ChemMasterDrawSource.External:
+                    SetBufferText(castState.InputContainerInfo?.CurrentVolume, "chem-master-output-beaker-draw");
+                    break;
+                default:
+                    throw new($"Chemmaster {castState.OutputContainerInfo} draw source is not set");
+            }
 
             InputEjectButton.Disabled = castState.InputContainerInfo is null;
             OutputEjectButton.Disabled = castState.OutputContainerInfo is null;
@@ -168,9 +178,14 @@ private void UpdateDosageFields(ChemMasterBoundUserInterfaceState castState)
             var holdsReagents = output?.Reagents != null;
             var pillNumberMax = holdsReagents ? 0 : remainingCapacity;
             var bottleAmountMax = holdsReagents ? remainingCapacity : 0;
-            var bufferVolume = castState.BufferCurrentVolume?.Int() ?? 0;
+            var outputVolume = castState.DrawSource switch
+            {
+                ChemMasterDrawSource.Internal => castState.BufferCurrentVolume?.Int() ?? 0,
+                ChemMasterDrawSource.External => castState.InputContainerInfo?.CurrentVolume.Int() ?? 0,
+                _ => 0,
+            };
 
-            PillDosage.Value = (int)Math.Min(bufferVolume, castState.PillDosageLimit);
+            PillDosage.Value = (int)Math.Min(outputVolume, castState.PillDosageLimit);
 
             PillTypeButtons[castState.SelectedPillType].Pressed = true;
 
@@ -186,25 +201,35 @@ private void UpdateDosageFields(ChemMasterBoundUserInterfaceState castState)
             // Avoid division by zero
             if (PillDosage.Value > 0)
             {
-                PillNumber.Value = Math.Min(bufferVolume / PillDosage.Value, pillNumberMax);
+                PillNumber.Value = Math.Min(outputVolume / PillDosage.Value, pillNumberMax);
             }
             else
             {
                 PillNumber.Value = 0;
             }
 
-            BottleDosage.Value = Math.Min(bottleAmountMax, bufferVolume);
+            BottleDosage.Value = Math.Min(bottleAmountMax, outputVolume);
         }
         /// <summary>
-        /// Generate a product label based on reagents in the buffer.
+        /// Generate a product label based on reagents in the buffer or beaker.
         /// </summary>
         /// <param name="state">State data sent by the server.</param>
         private string GenerateLabel(ChemMasterBoundUserInterfaceState state)
         {
-            if (state.BufferCurrentVolume == 0)
+            if (
+                state.BufferCurrentVolume == 0 && state.DrawSource == ChemMasterDrawSource.Internal ||
+                state.InputContainerInfo?.CurrentVolume == 0 && state.DrawSource == ChemMasterDrawSource.External ||
+                state.InputContainerInfo?.Reagents == null
+            )
                 return "";
 
-            var reagent = state.BufferReagents.OrderBy(r => r.Quantity).First().Reagent;
+            var reagent = (state.DrawSource switch
+                {
+                    ChemMasterDrawSource.Internal => state.BufferReagents,
+                    ChemMasterDrawSource.External => state.InputContainerInfo.Reagents ?? [],
+                    _ => throw new($"Chemmaster {state.OutputContainerInfo} draw source is not set"),
+                }).MinBy(r => r.Quantity)
+                .Reagent;
             _prototypeManager.TryIndex(reagent.Prototype, out ReagentPrototype? proto);
             return proto?.LocalizedName ?? "";
         }
@@ -233,6 +258,8 @@ private void UpdatePanelInfo(ChemMasterBoundUserInterfaceState state)
                 _ => Loc.GetString("chem-master-window-sort-type-none")
             };
 
+            OutputBufferDraw.Pressed = state.DrawSource == ChemMasterDrawSource.Internal;
+            OutputBeakerDraw.Pressed = state.DrawSource == ChemMasterDrawSource.External;
 
             if (!state.BufferReagents.Any())
             {
@@ -414,6 +441,12 @@ public string LabelLine
             get => LabelLineEdit.Text;
             set => LabelLineEdit.Text = value;
         }
+
+        private void SetBufferText(FixedPoint2? volume, string text)
+        {
+            BufferCurrentVolume.Text = $" {volume ?? FixedPoint2.Zero}u";
+            DrawSource.Text = Loc.GetString(text);
+        }
     }
 
     public sealed class ReagentButton : Button

Content.Client/CombatMode/CombatModeIndicatorsOverlay.cs

@@ -4,10 +4,8 @@
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
-using Robust.Client.Serialization;
 using Robust.Client.UserInterface;
 using Robust.Shared.Enums;
-using Robust.Shared.Graphics;
 using Robust.Shared.Utility;
 
 namespace Content.Client.CombatMode;

Content.Client/Construction/UI/ConstructionMenuPresenter.cs

@@ -30,7 +30,10 @@ internal sealed class ConstructionMenuPresenter : IDisposable
         [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IClientPreferencesManager _preferencesManager = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
+
         private readonly SpriteSystem _spriteSystem;
+        private readonly ISawmill _sawmill;
 
         private readonly IConstructionMenuView _constructionView;
         private readonly EntityWhitelistSystem _whitelistSystem;
@@ -90,6 +93,7 @@ public ConstructionMenuPresenter()
             _constructionView = new ConstructionMenu();
             _whitelistSystem = _entManager.System<EntityWhitelistSystem>();
             _spriteSystem = _entManager.System<SpriteSystem>();
+            _sawmill = _logManager.GetSawmill("construction.ui");
 
             // This is required so that if we load after the system is initialized, we can bind to it immediately
             if (_systemManager.TryGetEntitySystem<ConstructionSystem>(out var constructionSystem))
@@ -284,7 +288,7 @@ private void PopulateGrid(GridContainer recipesGrid,
 
                 if (!_constructionSystem!.TryGetRecipePrototype(recipe.ID, out var targetProtoId))
                 {
-                    Logger.Error("Cannot find the target prototype in the recipe cache with the id \"{0}\" of {1}.",
+                    _sawmill.Error("Cannot find the target prototype in the recipe cache with the id \"{0}\" of {1}.",
                         recipe.ID,
                         nameof(ConstructionPrototype));
                     continue;

Content.Client/Kitchen/EntitySystems/ReagentGrinderSystem.cs

@@ -0,0 +1,8 @@
+using Content.Shared.Kitchen.EntitySystems;
+using JetBrains.Annotations;
+
+namespace Content.Client.Kitchen.EntitySystems;
+
+[UsedImplicitly]
+public sealed class ReagentGrinderSystem : SharedReagentGrinderSystem;
+

Content.Client/Launcher/LauncherConnecting.cs

@@ -20,8 +20,10 @@ public sealed class LauncherConnecting : Robust.Client.State.State
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly IClipboardManager _clipboard = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
 
         private LauncherConnectingGui? _control;
+        private ISawmill _sawmill = default!;
 
         private Page _currentPage;
         private string? _connectFailReason;
@@ -61,6 +63,8 @@ protected override void Startup()
         {
             _control = new LauncherConnectingGui(this, _random, _prototypeManager, _cfg, _clipboard);
 
+            _sawmill = _logManager.GetSawmill("launcher-ui");
+
             _userInterfaceManager.StateRoot.AddChild(_control);
 
             _clientNetManager.ConnectFailed += OnConnectFailed;
@@ -115,12 +119,12 @@ public bool Redial()
                 }
                 else
                 {
-                    Logger.InfoS("launcher-ui", $"Redial not possible, no Ss14Address");
+                    _sawmill.Info($"Redial not possible, no Ss14Address");
                 }
             }
             catch (Exception ex)
             {
-                Logger.ErrorS("launcher-ui", $"Redial exception: {ex}");
+                _sawmill.Error($"Redial exception: {ex}");
             }
             return false;
         }

Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs

@@ -23,7 +23,6 @@ protected override void Open()
 
         _window = this.CreateWindowCenteredLeft<IFFConsoleWindow>();
         _window.ShowIFF += SendIFFMessage;
-        _window.ShowVessel += SendVesselMessage;
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -44,14 +43,6 @@ private void SendIFFMessage(bool obj)
         });
     }
 
-    private void SendVesselMessage(bool obj)
-    {
-        SendMessage(new IFFShowVesselMessage()
-        {
-            Show = obj,
-        });
-    }
-
     protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);

Content.Client/Shuttles/UI/IFFConsoleWindow.xaml

@@ -9,12 +9,6 @@
                 <Button Name="ShowIFFOnButton" Text="{Loc 'iff-console-on'}" StyleClasses="OpenRight" />
                 <Button Name="ShowIFFOffButton" Text="{Loc 'iff-console-off'}" StyleClasses="OpenLeft" />
             </BoxContainer>
-
-            <Label Name="ShowVesselLabel" Text="{Loc 'iff-console-show-vessel-label'}" HorizontalExpand="True" StyleClasses="highlight" />
-            <BoxContainer Orientation="Horizontal" MinWidth="120">
-                <Button Name="ShowVesselOnButton" Text="{Loc 'iff-console-on'}" StyleClasses="OpenRight" />
-                <Button Name="ShowVesselOffButton" Text="{Loc 'iff-console-off'}" StyleClasses="OpenLeft" />
-            </BoxContainer>
         </GridContainer>
     </BoxContainer>
 </controls:FancyWindow>

Content.Client/Shuttles/UI/IFFConsoleWindow.xaml.cs

@@ -13,9 +13,7 @@ public sealed partial class IFFConsoleWindow : FancyWindow,
     IComputerWindow<IFFConsoleBoundUserInterfaceState>
 {
     private readonly ButtonGroup _showIFFButtonGroup = new();
-    private readonly ButtonGroup _showVesselButtonGroup = new();
     public event Action<bool>? ShowIFF;
-    public event Action<bool>? ShowVessel;
 
     public IFFConsoleWindow()
     {
@@ -24,31 +22,21 @@ public IFFConsoleWindow()
         ShowIFFOnButton.Group = _showIFFButtonGroup;
         ShowIFFOnButton.OnPressed += args => ShowIFFPressed(true);
         ShowIFFOffButton.OnPressed += args => ShowIFFPressed(false);
-
-        ShowVesselOffButton.Group = _showVesselButtonGroup;
-        ShowVesselOnButton.Group = _showVesselButtonGroup;
-        ShowVesselOnButton.OnPressed += args => ShowVesselPressed(true);
-        ShowVesselOffButton.OnPressed += args => ShowVesselPressed(false);
     }
 
     private void ShowIFFPressed(bool pressed)
     {
         ShowIFF?.Invoke(pressed);
     }
 
-    private void ShowVesselPressed(bool pressed)
-    {
-        ShowVessel?.Invoke(pressed);
-    }
-
     public void UpdateState(IFFConsoleBoundUserInterfaceState state)
     {
-        if ((state.AllowedFlags & IFFFlags.HideLabel) != 0x0)
+        if ((state.AllowedFlags & IFFFlags.HideLabel) != 0x0 || (state.AllowedFlags & IFFFlags.Hide) != 0x0)
         {
             ShowIFFOffButton.Disabled = false;
             ShowIFFOnButton.Disabled = false;
 
-            if ((state.Flags & IFFFlags.HideLabel) != 0x0)
+            if ((state.Flags & IFFFlags.HideLabel) != 0x0 || (state.Flags & IFFFlags.Hide) != 0x0)
             {
                 ShowIFFOffButton.Pressed = true;
             }
@@ -62,25 +50,5 @@ public void UpdateState(IFFConsoleBoundUserInterfaceState state)
             ShowIFFOffButton.Disabled = true;
             ShowIFFOnButton.Disabled = true;
         }
-
-        if ((state.AllowedFlags & IFFFlags.Hide) != 0x0)
-        {
-            ShowVesselOffButton.Disabled = false;
-            ShowVesselOnButton.Disabled = false;
-
-            if ((state.Flags & IFFFlags.Hide) != 0x0)
-            {
-                ShowVesselOffButton.Pressed = true;
-            }
-            else
-            {
-                ShowVesselOnButton.Pressed = true;
-            }
-        }
-        else
-        {
-            ShowVesselOffButton.Disabled = true;
-            ShowVesselOnButton.Disabled = true;
-        }
     }
 }

Content.Client/Silicons/Borgs/BorgModuleControl.xaml

@@ -3,10 +3,10 @@
                 StyleClasses="PanelLight"
                 Margin="5 5 5 0">
     <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="5 5 0 5">
+        <TextureButton Name="RemoveButton" VerticalAlignment="Top" HorizontalAlignment="Left" Scale="0.5 0.5"/>
         <SpriteView Name="ModuleView" Margin="0 0 5 0"/>
         <BoxContainer RectClipContent="True" HorizontalExpand="True">
             <Label Name="ModuleName" HorizontalExpand="True" HorizontalAlignment="Center"/>
         </BoxContainer>
-        <TextureButton Name="RemoveButton" VerticalAlignment="Top" HorizontalAlignment="Right" Scale="0.5 0.5"/>
     </BoxContainer>
 </PanelContainer>

Content.Client/Stylesheets/Sheetlets/LabelSheetlet.cs

@@ -69,10 +69,10 @@ public override StyleRule[] GetRules(PalettedStylesheet sheet, object config)
                 .Class(StyleClass.LabelMonospaceText)
                 .Prop(Label.StylePropertyFont, robotoMonoBold11),
             E<Label>()
-                .Class(StyleClass.LabelMonospaceHeading)
+                .Class(StyleClass.LabelMonospaceSubHeading)
                 .Prop(Label.StylePropertyFont, robotoMonoBold12),
             E<Label>()
-                .Class(StyleClass.LabelMonospaceSubHeading)
+                .Class(StyleClass.LabelMonospaceHeading)
                 .Prop(Label.StylePropertyFont, robotoMonoBold14),
         ];
     }

Content.Client/Stylesheets/StyleClass.cs

@@ -41,8 +41,8 @@ public static class StyleClass
     public const string LabelKeyText = "LabelKeyText";
     public const string LabelWeak = "LabelWeak"; // replaces `LabelSecondaryColor`
     public const string LabelMonospaceText = "ConsoleText";
-    public const string LabelMonospaceHeading = "ConsoleText";
-    public const string LabelMonospaceSubHeading = "ConsoleText";
+    public const string LabelMonospaceHeading = "ConsoleHeading";
+    public const string LabelMonospaceSubHeading = "ConsoleSubHeading";
 
     public const string BackgroundPanel = "BackgroundPanel"; // replaces `AngleRect`
     public const string BackgroundPanelOpenLeft = "BackgroundPanelOpenLeft"; // replaces `BackgroundOpenLeft`

Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs

@@ -26,21 +26,33 @@ protected override void Open()
 
         _window.OnNameChange += OnNameSelected;
         _window.OnVerbChange += verb => SendMessage(new VoiceMaskChangeVerbMessage(verb));
+        _window.OnToggle += OnToggle;
+        _window.OnAccentToggle += OnAccentToggle;
     }
 
     private void OnNameSelected(string name)
     {
         SendMessage(new VoiceMaskChangeNameMessage(name));
     }
 
+    private void OnToggle()
+    {
+        SendMessage(new VoiceMaskToggleMessage());
+    }
+
+    private void OnAccentToggle()
+    {
+        SendMessage(new VoiceMaskAccentToggleMessage());
+    }
+
     protected override void UpdateState(BoundUserInterfaceState state)
     {
         if (state is not VoiceMaskBuiState cast || _window == null)
         {
             return;
         }
 
-        _window.UpdateState(cast.Name, cast.Verb);
+        _window.UpdateState(cast.Name, cast.Verb, cast.Active, cast.AccentHide);
     }
 
     protected override void Dispose(bool disposing)