From ec6e06b3468f19584982cd3534861480eb157111 Mon Sep 17 00:00:00 2001
From: MetalSage <metalsage.official@gmail.com>
Date: Mon, 23 Dec 2024 03:34:51 +0400
Subject: [PATCH] upstream fix

---
 .../UI/ChemMasterBoundUserInterface.cs        |  10 +-
 .../Chemistry/UI/ChemMasterWindow.xaml        |  36 +----
 .../Chemistry/UI/ChemMasterWindow.xaml.cs     |  39 +++---
 .../Components/ChemMasterComponent.cs         |   2 +-
 .../EntitySystems/ChemMasterSystem.cs         | 123 +++---------------
 .../Connection/ConnectionManager.cs           |   6 +-
 Content.Shared/Chemistry/SharedChemMaster.cs  |  39 ++----
 .../_Stories/Spaf/SharedSpafSystem.cs         |  20 +--
 .../components/chem-master-component.ftl      |   6 +-
 .../Structures/Machines/chem_master.yml       |   5 +-
 10 files changed, 79 insertions(+), 207 deletions(-)

diff --git a/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs
index d65bda2dc1..3ef7f0ae73 100644
--- a/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs
+++ b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs
@@ -36,14 +36,10 @@ protected override void Open()
                 new ItemSlotButtonPressedEvent(SharedChemMaster.InputSlotName));
             _window.OutputEjectButton.OnPressed += _ => SendMessage(
                 new ItemSlotButtonPressedEvent(SharedChemMaster.OutputSlotName));
-            _window.BufferStorageButton.OnPressed += _ => SendMessage(
-                new ChemMasterSetModeMessage(ChemMasterMode.Storage));
-            _window.BufferOutputButton.OnPressed += _ => SendMessage(
-                new ChemMasterSetModeMessage(ChemMasterMode.Output));
+            _window.BufferTransferButton.OnPressed += _ => SendMessage(
+                new ChemMasterSetModeMessage(ChemMasterMode.Transfer));
             _window.BufferDiscardButton.OnPressed += _ => SendMessage(
                 new ChemMasterSetModeMessage(ChemMasterMode.Discard));
-            _window.OutputBufferDiscardButton.OnPressed += _ => SendMessage(
-                new ChemMasterDiscardBufferMessage(SharedChemMaster.OutputBufferSolutionName));
             _window.CreatePillButton.OnPressed += _ => SendMessage(
                 new ChemMasterCreatePillsMessage(
                     (uint) _window.PillDosage.Value, (uint) _window.PillNumber.Value, _window.LabelLine));
@@ -57,7 +53,7 @@ protected override void Open()
                 _window.PillTypeButtons[i].OnPressed += _ => SendMessage(new ChemMasterSetPillTypeMessage(pillType));
             }
 
-            _window.OnReagentButtonPressed += (args, button) => SendMessage(new ChemMasterReagentAmountButtonMessage(button.Id, button.Amount, button.IsBuffer, button.Origin));
+            _window.OnReagentButtonPressed += (args, button) => SendMessage(new ChemMasterReagentAmountButtonMessage(button.Id, button.Amount, button.IsBuffer));
         }
 
         /// <summary>
diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml
index 4d08a2e17c..b1f4f5917f 100644
--- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml
+++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml
@@ -33,8 +33,7 @@
             <BoxContainer Orientation="Horizontal">
                 <Label Text="{Loc 'chem-master-window-buffer-text'}" />
                 <Control HorizontalExpand="True" />
-                <Button MinSize="80 0" Name="BufferStorageButton" Access="Public" Text="{Loc 'chem-master-window-storage-button'}" ToggleMode="True" StyleClasses="OpenRight" />
-                <Button MinSize="80 0" Name="BufferOutputButton" Access="Public" Text="{Loc 'chem-master-window-output-button'}" ToggleMode="True" StyleClasses="ButtonSquare" />
+                <Button MinSize="80 0" Name="BufferTransferButton" Access="Public" Text="{Loc 'chem-master-window-transfer-button'}" ToggleMode="True" StyleClasses="OpenRight" />
                 <Button MinSize="80 0" Name="BufferDiscardButton" Access="Public" Text="{Loc 'chem-master-window-discard-button'}" ToggleMode="True" StyleClasses="OpenLeft" />
             </BoxContainer>
 
@@ -46,7 +45,7 @@
 
                 <ScrollContainer HorizontalExpand="True" MinSize="0 200">
                     <!-- Buffer reagent list -->
-                    <BoxContainer Name="StorageBufferInfo" Orientation="Vertical" Margin="4" HorizontalExpand="True">
+                    <BoxContainer Name="BufferInfo" Orientation="Vertical" Margin="4" HorizontalExpand="True">
                         <Label Text="{Loc 'chem-master-window-buffer-empty-text'}" />
                     </BoxContainer>
                 </ScrollContainer>
@@ -61,12 +60,12 @@
                 <Button MinSize="80 0" Name="OutputEjectButton" Access="Public" Text="{Loc 'chem-master-window-eject-button'}" />
             </BoxContainer>
 
-            <PanelContainer VerticalExpand="True" MinSize="0 100">
+            <PanelContainer VerticalExpand="True" MinSize="0 200">
                 <PanelContainer.PanelOverride>
                     <gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
                 </PanelContainer.PanelOverride>
 
-                <ScrollContainer HorizontalExpand="True" MinSize="0 100">
+                <ScrollContainer HorizontalExpand="True" MinSize="0 200">
                     <!-- Initially empty, when server sends state data this will have container contents and fill volume.-->
                     <BoxContainer Name="OutputContainerInfo" Orientation="Vertical" Margin="4" HorizontalExpand="True">
                         <Label Text="{Loc 'chem-master-window-no-container-loaded-text'}" />
@@ -74,29 +73,6 @@
                 </ScrollContainer>
             </PanelContainer>
 
-             <!-- Padding -->
-            <Control MinSize="0 10" />
-
-            <!-- Output Buffer Reagent List -->
-            <BoxContainer Orientation="Horizontal">
-                <Label Text="{Loc 'chem-master-window-output-buffer-text'}" />
-                <Control HorizontalExpand="True" />
-                <Button MinSize="80 0" Name="OutputBufferDiscardButton" Access="Public" Text="{Loc 'chem-master-window-discard-button'}" ToggleMode="False" StyleClasses="OpenRight" />
-            </BoxContainer>
-
-            <PanelContainer VerticalExpand="True" MinSize="0 100">
-                <PanelContainer.PanelOverride>
-                    <gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
-                </PanelContainer.PanelOverride>
-
-                <ScrollContainer HorizontalExpand="True" MinSize="0 100">
-                    <!-- Initially empty, when server sends state data this will have container contents and fill volume.-->
-                    <BoxContainer Name="OutputBufferInfo" Orientation="Vertical" Margin="4" HorizontalExpand="True">
-                        <Label Text="{Loc 'chem-master-window-buffer-empty-text'}" />
-                    </BoxContainer>
-                </ScrollContainer>
-            </PanelContainer>
-
             <!-- Padding -->
             <Control MinSize="0 10" />
 
@@ -104,8 +80,8 @@
             <BoxContainer Orientation="Horizontal">
                 <Label Text="{Loc 'chem-master-window-packaging-text'}" />
                 <Control HorizontalExpand="True"/>
-                <!-- <Label Text="{Loc 'chem-master-window-buffer-label'}" />
-                <Label Name="BufferOutputVolume" StyleClasses="LabelSecondaryColor" /> -->
+                <Label Text="{Loc 'chem-master-window-buffer-label'}" />
+                <Label Name="BufferCurrentVolume" StyleClasses="LabelSecondaryColor" />
             </BoxContainer>
 
             <!-- Wrap the packaging info-->
diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
index 150b66cd12..20c61f10cb 100644
--- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
+++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
@@ -89,7 +89,7 @@ public ChemMasterWindow()
             Tabs.SetTabTitle(1, Loc.GetString("chem-master-window-output-tab"));
         }
 
-        private ReagentButton MakeReagentButton(string text, ChemMasterReagentAmount amount, ReagentId id, bool isBuffer, string origin, string styleClass)
+        private ReagentButton MakeReagentButton(string text, ChemMasterReagentAmount amount, ReagentId id, bool isBuffer, string styleClass)
         {
             var reagentTransferButton = new ReagentButton(text, amount, id, isBuffer, styleClass);
             reagentTransferButton.OnPressed += args
@@ -140,11 +140,9 @@ public void UpdateState(BoundUserInterfaceState state)
 
             // Ensure the Panel Info is updated, including UI elements for Buffer Volume, Output Container and so on
             UpdatePanelInfo(castState);
-
-            var output = castState.OutputContainerInfo;
-
-            //BufferOutputVolume.Text = $" {castState.BufferOutputVolume?.Int() ?? 0}u";
-
+    
+            BufferCurrentVolume.Text = $" {castState.BufferCurrentVolume?.Int() ?? 0}u";
+    
             InputEjectButton.Disabled = castState.InputContainerInfo is null;
             OutputEjectButton.Disabled = castState.OutputContainerInfo is null;
             CreateBottleButton.Disabled = castState.OutputContainerInfo?.Reagents == null;
@@ -193,21 +191,32 @@ private void UpdateDosageFields(ChemMasterBoundUserInterfaceState castState)
         /// <param name="state">State data sent by the server.</param>
         private string GenerateLabel(ChemMasterBoundUserInterfaceState state)
         {
-            if (state.BufferOutputVolume == 0)
+            if (state.BufferCurrentVolume == 0)
                 return "";
 
-            var reagent = state.BufferOutputReagents.OrderBy(r => r.Quantity).Last().Reagent;
+            var reagent = state.BufferReagents.OrderBy(r => r.Quantity).First().Reagent;
             _prototypeManager.TryIndex(reagent.Prototype, out ReagentPrototype? proto);
             return proto?.LocalizedName ?? "";
         }
 
-        private void UpdateBufferInfo(BoxContainer bufferInfo, IReadOnlyList<ReagentQuantity> bufferReagents, FixedPoint2? bufferVolume, bool isStorageBuffer, string bufferName)
+        /// <summary>
+        /// Update the container, buffer, and packaging panels.
+        /// </summary>
+        /// <param name="state">State data for the dispenser.</param>
+        private void UpdatePanelInfo(ChemMasterBoundUserInterfaceState state)
         {
-            bufferInfo.Children.Clear();
+            BufferTransferButton.Pressed = state.Mode == ChemMasterMode.Transfer;
+            BufferDiscardButton.Pressed = state.Mode == ChemMasterMode.Discard;
+
+            BuildContainerUI(InputContainerInfo, state.InputContainerInfo, true);
+            BuildContainerUI(OutputContainerInfo, state.OutputContainerInfo, false);
 
-            if (!bufferReagents.Any())
+            BufferInfo.Children.Clear();
+
+            if (!state.BufferReagents.Any())
             {
-                bufferInfo.Children.Add(new Label { Text = Loc.GetString("chem-master-window-buffer-empty-text") });
+                BufferInfo.Children.Add(new Label { Text = Loc.GetString("chem-master-window-buffer-empty-text") });
+
                 return;
             }
 
@@ -215,7 +224,7 @@ private void UpdateBufferInfo(BoxContainer bufferInfo, IReadOnlyList<ReagentQuan
             {
                 Orientation = LayoutOrientation.Horizontal
             };
-            bufferInfo.AddChild(bufferHBox);
+            BufferInfo.AddChild(bufferHBox);
 
             var bufferLabel = new Label { Text = $"{Loc.GetString("chem-master-window-buffer-label")} " };
             bufferHBox.AddChild(bufferLabel);
@@ -361,15 +370,13 @@ public sealed class ReagentButton : Button
     {
         public ChemMasterReagentAmount Amount { get; set; }
         public bool IsBuffer = true;
-        public string Origin { get; set; }
         public ReagentId Id { get; set; }
-        public ReagentButton(string text, ChemMasterReagentAmount amount, ReagentId id, bool isBuffer, string origin, string styleClass)
+        public ReagentButton(string text, ChemMasterReagentAmount amount, ReagentId id, bool isBuffer, string styleClass)
         {
             AddStyleClass(styleClass);
             Text = text;
             Amount = amount;
             Id = id;
-            Origin = origin;
             IsBuffer = isBuffer;
         }
     }
diff --git a/Content.Server/Chemistry/Components/ChemMasterComponent.cs b/Content.Server/Chemistry/Components/ChemMasterComponent.cs
index 917deb843b..9578755ba7 100644
--- a/Content.Server/Chemistry/Components/ChemMasterComponent.cs
+++ b/Content.Server/Chemistry/Components/ChemMasterComponent.cs
@@ -16,7 +16,7 @@ public sealed partial class ChemMasterComponent : Component
         public uint PillType = 0;
 
         [DataField("mode"), ViewVariables(VVAccess.ReadWrite)]
-        public ChemMasterMode Mode = ChemMasterMode.Storage;
+        public ChemMasterMode Mode = ChemMasterMode.Transfer;
 
         [DataField("pillDosageLimit", required: true), ViewVariables(VVAccess.ReadWrite)]
         public uint PillDosageLimit;
diff --git a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
index ee464f4412..c733c7215e 100644
--- a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
@@ -57,7 +57,6 @@ public override void Initialize()
             SubscribeLocalEvent<ChemMasterComponent, ChemMasterReagentAmountButtonMessage>(OnReagentButtonMessage);
             SubscribeLocalEvent<ChemMasterComponent, ChemMasterCreatePillsMessage>(OnCreatePillsMessage);
             SubscribeLocalEvent<ChemMasterComponent, ChemMasterOutputToBottleMessage>(OnOutputToBottleMessage);
-            SubscribeLocalEvent<ChemMasterComponent, ChemMasterDiscardBufferMessage>(OnDiscardBufferMessage);
         }
 
         private void SubscribeUpdateUiState<T>(Entity<ChemMasterComponent> ent, ref T ev)
@@ -68,22 +67,17 @@ private void SubscribeUpdateUiState<T>(Entity<ChemMasterComponent> ent, ref T ev
         private void UpdateUiState(Entity<ChemMasterComponent> ent, bool updateLabel = false)
         {
             var (owner, chemMaster) = ent;
-            if (!_solutionContainerSystem.TryGetSolution(owner, SharedChemMaster.StorageBufferSolutionName, out _, out var bufferStorageSolution))
-                return;
-            if (!_solutionContainerSystem.TryGetSolution(owner, SharedChemMaster.OutputBufferSolutionName, out _, out var bufferOutputSolution))
+            if (!_solutionContainerSystem.TryGetSolution(owner, SharedChemMaster.BufferSolutionName, out _, out var bufferSolution))
                 return;
             var inputContainer = _itemSlotsSystem.GetItemOrNull(owner, SharedChemMaster.InputSlotName);
             var outputContainer = _itemSlotsSystem.GetItemOrNull(owner, SharedChemMaster.OutputSlotName);
 
-            var bufferStorageReagents = bufferStorageSolution.Contents;
-            var bufferStorageVolume = bufferStorageSolution.Volume;
-
-            var bufferOutputReagents = bufferOutputSolution.Contents;
-            var bufferOutputVolume = bufferOutputSolution.Volume;
+            var bufferReagents = bufferSolution.Contents;
+            var bufferCurrentVolume = bufferSolution.Volume;
 
             var state = new ChemMasterBoundUserInterfaceState(
                 chemMaster.Mode, BuildInputContainerInfo(inputContainer), BuildOutputContainerInfo(outputContainer),
-                bufferStorageReagents, bufferOutputReagents, bufferStorageVolume, bufferOutputVolume, chemMaster.PillType, chemMaster.PillDosageLimit, updateLabel);
+                bufferReagents, bufferCurrentVolume, chemMaster.PillType, chemMaster.PillDosageLimit, updateLabel);
 
             _userInterfaceSystem.SetUiState(owner, ChemMasterUiKey.Key, state);
         }
@@ -118,14 +112,11 @@ private void OnReagentButtonMessage(Entity<ChemMasterComponent> chemMaster, ref
 
             switch (chemMaster.Comp.Mode)
             {
-                case ChemMasterMode.Storage:
-                    TransferReagents(chemMaster, message.ReagentId, message.Amount.GetFixedPoint(), message.FromBuffer, message.Origin);
-                    break;
-                case ChemMasterMode.Output:
-                    TransferReagents(chemMaster, message.ReagentId, message.Amount.GetFixedPoint(), message.FromBuffer, message.Origin);
+                case ChemMasterMode.Transfer:
+                    TransferReagents(chemMaster, message.ReagentId, message.Amount.GetFixedPoint(), message.FromBuffer);
                     break;
                 case ChemMasterMode.Discard:
-                    DiscardReagents(chemMaster, message.ReagentId, message.Amount.GetFixedPoint(), message.FromBuffer, SharedChemMaster.StorageBufferSolutionName);
+                    DiscardReagents(chemMaster, message.ReagentId, message.Amount.GetFixedPoint(), message.FromBuffer);
                     break;
                 default:
                     // Invalid mode.
@@ -135,109 +126,38 @@ private void OnReagentButtonMessage(Entity<ChemMasterComponent> chemMaster, ref
             ClickSound(chemMaster);
         }
 
-        public void OnDiscardBufferMessage(Entity<ChemMasterComponent> chemMaster, ref ChemMasterDiscardBufferMessage message)
+        private void TransferReagents(Entity<ChemMasterComponent> chemMaster, ReagentId id, FixedPoint2 amount, bool fromBuffer)
         {
-            if (!_solutionContainerSystem.TryGetSolution(chemMaster.Owner, message.BufferName, out var containerSolution, out var bufferSolution))
+            var container = _itemSlotsSystem.GetItemOrNull(chemMaster, SharedChemMaster.InputSlotName);
+            if (container is null ||
+                !_solutionContainerSystem.TryGetFitsInDispenser(container.Value, out var containerSoln, out var containerSolution) ||
+                !_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.BufferSolutionName, out _, out var bufferSolution))
             {
                 return;
             }
 
-            _solutionContainerSystem.RemoveAllSolution(containerSolution.Value);
-
-            UpdateUiState(chemMaster, updateLabel: true);
-            ClickSound(chemMaster);
-        }
-
-        // Transfer reagents from the container to one of the buffers, or between buffers depending on the mode and origin.
-        // Output buffer can't transfer back to container, only to storage buffer.
-        private void TransferReagents(Entity<ChemMasterComponent> chemMaster, ReagentId id, FixedPoint2 amount, bool fromBuffer, string origin)
-        {
-            // Input Slot to Storage Buffer
-            if (origin == SharedChemMaster.InputSlotName && chemMaster.Comp.Mode == ChemMasterMode.Storage)
+            if (fromBuffer) // Buffer to container
             {
-                var container = _itemSlotsSystem.GetItemOrNull(chemMaster, SharedChemMaster.InputSlotName);
-                if (container is null ||
-                    !_solutionContainerSystem.TryGetFitsInDispenser(container.Value, out var containerSoln, out var containerSolution) ||
-                    !_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.StorageBufferSolutionName, out var _, out var bufferSolution))
-                {
-                    return;
-                }
-
-                amount = FixedPoint2.Min(amount, containerSolution.GetReagentQuantity(id));
-                _solutionContainerSystem.RemoveReagent(containerSoln.Value, id, amount);
-                bufferSolution.AddReagent(id, amount);
-            }
-            // Storage Buffer to Input Slot
-            else if (origin == SharedChemMaster.StorageBufferSolutionName && chemMaster.Comp.Mode == ChemMasterMode.Storage)
-            {
-                var container = _itemSlotsSystem.GetItemOrNull(chemMaster, SharedChemMaster.InputSlotName);
-                if (container is null ||
-                    !_solutionContainerSystem.TryGetFitsInDispenser(container.Value, out var containerSoln, out var containerSolution) ||
-                    !_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.StorageBufferSolutionName, out var _, out var bufferSolution))
-                {
-                    return;
-                }
-
                 amount = FixedPoint2.Min(amount, containerSolution.AvailableVolume);
-                bufferSolution.RemoveReagent(id, amount);
+                amount = bufferSolution.RemoveReagent(id, amount, preserveOrder: true);
                 _solutionContainerSystem.TryAddReagent(containerSoln.Value, id, amount, out var _);
-
             }
-            // Input Slot to Output Buffer
-            else if (origin == SharedChemMaster.InputSlotName && chemMaster.Comp.Mode == ChemMasterMode.Output)
+            else // Container to buffer
             {
-                var container = _itemSlotsSystem.GetItemOrNull(chemMaster, SharedChemMaster.InputSlotName);
-                if (container is null ||
-                    !_solutionContainerSystem.TryGetFitsInDispenser(container.Value, out var containerSoln, out var containerSolution) ||
-                    !_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.OutputBufferSolutionName, out var _, out var bufferSolution))
-                {
-                    return;
-                }
-
                 amount = FixedPoint2.Min(amount, containerSolution.GetReagentQuantity(id));
                 _solutionContainerSystem.RemoveReagent(containerSoln.Value, id, amount);
                 bufferSolution.AddReagent(id, amount);
             }
-            // Storage Buffer to Output Buffer
-            else if (origin == SharedChemMaster.StorageBufferSolutionName && chemMaster.Comp.Mode == ChemMasterMode.Output)
-            {
-                if (!_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.StorageBufferSolutionName, out var _, out var storageBufferSolution) ||
-                    !_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.OutputBufferSolutionName, out var _, out var outputBufferSolution))
-                {
-                    return;
-                }
-
-                amount = FixedPoint2.Min(amount, storageBufferSolution.GetReagentQuantity(id));
-                storageBufferSolution.RemoveReagent(id, amount);
-                outputBufferSolution.AddReagent(id, amount);
-            }
-            // Output buffer to Storage Buffer
-            else if (origin == SharedChemMaster.OutputBufferSolutionName)
-            {
-                if (!_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.OutputBufferSolutionName, out var _, out var outputBufferSolution) ||
-                    !_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.StorageBufferSolutionName, out var _, out var storageBufferSolution))
-                {
-                    return;
-                }
-
-                amount = FixedPoint2.Min(amount, outputBufferSolution.GetReagentQuantity(id));
-                outputBufferSolution.RemoveReagent(id, amount, preserveOrder: true);
-                storageBufferSolution.AddReagent(id, amount);
-            }
-            else
-            {
-                return;
-            }
 
             UpdateUiState(chemMaster, updateLabel: true);
         }
 
-        private void DiscardReagents(Entity<ChemMasterComponent> chemMaster, ReagentId id, FixedPoint2 amount, bool fromBuffer, string bufferName)
+        private void DiscardReagents(Entity<ChemMasterComponent> chemMaster, ReagentId id, FixedPoint2 amount, bool fromBuffer)
         {
             if (fromBuffer)
             {
-                if (_solutionContainerSystem.TryGetSolution(chemMaster.Owner, bufferName, out _, out var bufferStorageSolution))
-                    bufferStorageSolution.RemoveReagent(id, amount, preserveOrder: true);
+                if (_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.BufferSolutionName, out _, out var bufferSolution))
+                    bufferSolution.RemoveReagent(id, amount, preserveOrder: true);
                 else
                     return;
             }
@@ -279,7 +199,7 @@ private void OnCreatePillsMessage(Entity<ChemMasterComponent> chemMaster, ref Ch
                 return;
 
             var needed = message.Dosage * message.Number;
-            if (!WithdrawFromBuffer(chemMaster, needed, user, SharedChemMaster.OutputBufferSolutionName, out var withdrawal))
+            if (!WithdrawFromBuffer(chemMaster, needed, user, out var withdrawal))
                 return;
 
             _labelSystem.Label(container, message.Label);
@@ -327,7 +247,7 @@ private void OnOutputToBottleMessage(Entity<ChemMasterComponent> chemMaster, ref
             if (message.Label.Length > SharedChemMaster.LabelMaxLength)
                 return;
 
-            if (!WithdrawFromBuffer(chemMaster, message.Dosage, user, SharedChemMaster.OutputBufferSolutionName, out var withdrawal))
+            if (!WithdrawFromBuffer(chemMaster, message.Dosage, user, out var withdrawal))
                 return;
 
             _labelSystem.Label(container, message.Label);
@@ -344,12 +264,11 @@ private void OnOutputToBottleMessage(Entity<ChemMasterComponent> chemMaster, ref
         private bool WithdrawFromBuffer(
             Entity<ChemMasterComponent> chemMaster,
             FixedPoint2 neededVolume, EntityUid? user,
-            string bufferName,
             [NotNullWhen(returnValue: true)] out Solution? outputSolution)
         {
             outputSolution = null;
 
-            if (!_solutionContainerSystem.TryGetSolution(chemMaster.Owner, bufferName, out _, out var solution))
+            if (!_solutionContainerSystem.TryGetSolution(chemMaster.Owner, SharedChemMaster.BufferSolutionName, out _, out var solution))
             {
                 return false;
             }
diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index 9658ca7a05..4bc1cf229b 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -280,14 +280,14 @@ session.Status is SessionStatus.Connected or SessionStatus.InGame
             var wasInGame = EntitySystem.TryGet<GameTicker>(out var ticker) &&
                             ticker.PlayerGameStatuses.TryGetValue(userId, out var status) &&
                             status == PlayerGameStatus.JoinedGame;
+            var adminBypass = _cfg.GetCVar(CCVars.AdminBypassMaxPlayers) && adminData != null;
+            var softPlayerCount = _plyMgr.PlayerCount;
+
             // Corvax-Queue-Start
             var isQueueEnabled = _cfg.GetCVar(CCCVars.QueueEnabled);
             if (_plyMgr.PlayerCount >= _cfg.GetCVar(CCVars.SoftMaxPlayers) && !isPrivileged && !isQueueEnabled && !wasInGame)
             // Corvax-Queue-End
 
-            var adminBypass = _cfg.GetCVar(CCVars.AdminBypassMaxPlayers) && adminData != null;
-            var softPlayerCount = _plyMgr.PlayerCount;
-
             if (!_cfg.GetCVar(CCVars.AdminsCountForMaxPlayers))
             {
                 softPlayerCount -= _adminManager.ActiveAdmins.Count();
diff --git a/Content.Shared/Chemistry/SharedChemMaster.cs b/Content.Shared/Chemistry/SharedChemMaster.cs
index 4798b923e1..762131d761 100644
--- a/Content.Shared/Chemistry/SharedChemMaster.cs
+++ b/Content.Shared/Chemistry/SharedChemMaster.cs
@@ -10,9 +10,7 @@ namespace Content.Shared.Chemistry
     public sealed class SharedChemMaster
     {
         public const uint PillTypes = 20;
-        public const string StorageBufferSolutionName = "storageBuffer";
-
-        public const string OutputBufferSolutionName = "outputBuffer";
+        public const string BufferSolutionName = "buffer";
         public const string InputSlotName = "beakerSlot";
         public const string OutputSlotName = "outputSlot";
         public const string PillSolutionName = "food";
@@ -48,14 +46,12 @@ public sealed class ChemMasterReagentAmountButtonMessage : BoundUserInterfaceMes
         public readonly ReagentId ReagentId;
         public readonly ChemMasterReagentAmount Amount;
         public readonly bool FromBuffer;
-        public readonly string Origin;
 
-        public ChemMasterReagentAmountButtonMessage(ReagentId reagentId, ChemMasterReagentAmount amount, bool fromBuffer, string origin)
+        public ChemMasterReagentAmountButtonMessage(ReagentId reagentId, ChemMasterReagentAmount amount, bool fromBuffer)
         {
             ReagentId = reagentId;
             Amount = amount;
             FromBuffer = fromBuffer;
-            Origin = origin;
         }
     }
 
@@ -87,21 +83,9 @@ public ChemMasterOutputToBottleMessage(uint dosage, string label)
         }
     }
 
-    [Serializable, NetSerializable]
-    public sealed class ChemMasterDiscardBufferMessage : BoundUserInterfaceMessage
-    {
-        public readonly string BufferName;
-
-        public ChemMasterDiscardBufferMessage(string bufferName)
-        {
-            BufferName = bufferName;
-        }
-    }
-
     public enum ChemMasterMode
     {
-        Storage,
-        Output,
+        Transfer,
         Discard,
     }
 
@@ -172,15 +156,11 @@ public sealed class ChemMasterBoundUserInterfaceState : BoundUserInterfaceState
         /// <summary>
         /// A list of the reagents and their amounts within the buffer, if applicable.
         /// </summary>
-        public readonly IReadOnlyList<ReagentQuantity> BufferStorageReagents;
-
-        public readonly IReadOnlyList<ReagentQuantity> BufferOutputReagents;
+        public readonly IReadOnlyList<ReagentQuantity> BufferReagents;
 
         public readonly ChemMasterMode Mode;
 
-        public readonly FixedPoint2? BufferStorageVolume;
-
-        public readonly FixedPoint2? BufferOutputVolume;
+        public readonly FixedPoint2? BufferCurrentVolume;
         public readonly uint SelectedPillType;
 
         public readonly uint PillDosageLimit;
@@ -189,17 +169,14 @@ public sealed class ChemMasterBoundUserInterfaceState : BoundUserInterfaceState
 
         public ChemMasterBoundUserInterfaceState(
             ChemMasterMode mode, ContainerInfo? inputContainerInfo, ContainerInfo? outputContainerInfo,
-            IReadOnlyList<ReagentQuantity> bufferStorageReagents, IReadOnlyList<ReagentQuantity> bufferOutputReagents,
-            FixedPoint2 bufferStorageVolume, FixedPoint2 bufferOutputVolume,
+            IReadOnlyList<ReagentQuantity> bufferReagents, FixedPoint2 bufferCurrentVolume,
             uint selectedPillType, uint pillDosageLimit, bool updateLabel)
         {
             InputContainerInfo = inputContainerInfo;
             OutputContainerInfo = outputContainerInfo;
-            BufferStorageReagents = bufferStorageReagents;
-            BufferOutputReagents = bufferOutputReagents;
+            BufferReagents = bufferReagents;
             Mode = mode;
-            BufferStorageVolume = bufferStorageVolume;
-            BufferOutputVolume = bufferOutputVolume;
+            BufferCurrentVolume = bufferCurrentVolume;
             SelectedPillType = selectedPillType;
             PillDosageLimit = pillDosageLimit;
             UpdateLabel = updateLabel;
diff --git a/Content.Shared/_Stories/Spaf/SharedSpafSystem.cs b/Content.Shared/_Stories/Spaf/SharedSpafSystem.cs
index 0450fceeed..b5829e779f 100644
--- a/Content.Shared/_Stories/Spaf/SharedSpafSystem.cs
+++ b/Content.Shared/_Stories/Spaf/SharedSpafSystem.cs
@@ -1,16 +1,16 @@
 using Content.Shared.Actions;
-using Content.Shared.DoAfter;
-using Content.Shared.Popups;
-using Robust.Shared.Containers;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Nutrition.EntitySystems;
-using Content.Shared.Fluids;
-using Robust.Shared.Prototypes;
-using Content.Shared.Stealth;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Devour;
 using Content.Shared.Devour.Components;
+using Content.Shared.DoAfter;
+using Content.Shared.Fluids;
 using Content.Shared.Mobs;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Popups;
+using Content.Shared.Stealth;
+using Robust.Shared.Containers;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared._Stories.Spaf;
 
@@ -45,7 +45,7 @@ public bool TryModifyHunger(EntityUid uid, float amount, HungerComponent? compon
         if (!Resolve(uid, ref component))
             return false;
 
-        if (component.CurrentHunger - amount < 0)
+        if (_hunger.GetHunger(component) - amount < 0)
         {
             _popup.PopupEntity(Loc.GetString("need-more-food"), uid, uid);
             return false;
@@ -137,7 +137,7 @@ private void OnFood(EntityUid uid, HungerComponent component, FoodPopupEvent arg
         if (args.Handled)
             return;
 
-        _popup.PopupEntity("" + component.CurrentHunger, uid, uid);
+        _popup.PopupEntity("" + _hunger.GetHunger(component), uid, uid);
 
         args.Handled = true;
     }
diff --git a/Resources/Locale/ru-RU/chemistry/components/chem-master-component.ftl b/Resources/Locale/ru-RU/chemistry/components/chem-master-component.ftl
index 1a69070490..4286b414d4 100644
--- a/Resources/Locale/ru-RU/chemistry/components/chem-master-component.ftl
+++ b/Resources/Locale/ru-RU/chemistry/components/chem-master-component.ftl
@@ -14,14 +14,12 @@ chem-master-window-output-tab = Выход
 chem-master-window-container-label = Контейнер
 chem-master-window-eject-button = Извлечь
 chem-master-window-no-container-loaded-text = Контейнер не загружен.
-chem-master-window-buffer-text = Буфер хранения
-chem-master-window-output-buffer-text = Буфер вывода
+chem-master-window-buffer-text = Буфер
 chem-master-window-buffer-label = буфер:
 chem-master-window-buffer-all-amount = Всё
 chem-master-window-buffer-empty-text = Буфер пуст.
 chem-master-window-buffer-low-text = Недостаточно раствора в буфере
-chem-master-window-storage-button = Хранение
-chem-master-window-output-button = Вывод
+chem-master-window-transfer-button = Перенести
 chem-master-window-discard-button = Уничтожить
 chem-master-window-packaging-text = Упаковка
 chem-master-current-text-label = Метка:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
index 3d3e8efdb2..d78ed1182c 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
@@ -85,10 +85,9 @@
           - PillCanister
   - type: SolutionContainerManager
     solutions:
-      storageBuffer: {}
-      outputBuffer: {}
+      buffer: {}
   - type: DumpableSolution
-    solution: storageBuffer
+    solution: buffer
     unlimited: true
   - type: GuideHelp
     guides: