Merge branch 'TheDenSS14:master' into baikal-station

Content.Client/Changelog/ChangelogWindow.xaml.cs

@@ -8,15 +8,18 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared;
+using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 
 namespace Content.Client.Changelog
 {
     [GenerateTypedNameReferences]
     public sealed partial class ChangelogWindow : FancyWindow
     {
-        [Dependency] private readonly IClientAdminManager _adminManager = default!;
         [Dependency] private readonly ChangelogManager _changelog = default!;
+        [Dependency] private readonly IClientAdminManager _adminManager = default!;
+        [Dependency] private readonly IConfigurationManager _cfg = default!;
 
         public ChangelogWindow()
         {
@@ -67,8 +70,22 @@ private async void PopulateChangelog()
                 Tabs.SetTabTitle(i++, Loc.GetString($"changelog-tab-title-{changelog.Name}"));
             }
 
-            var version = typeof(ChangelogWindow).Assembly.GetName().Version ?? new Version(1, 0);
-            VersionLabel.Text = Loc.GetString("changelog-version-tag", ("version", version.ToString()));
+            // Try to get the current version from the build.json file
+            var version = _cfg.GetCVar(CVars.BuildVersion);
+            var forkId = _cfg.GetCVar(CVars.BuildForkId);
+
+            var versionText = Loc.GetString("changelog-version-unknown");
+
+            // Make sure these aren't empty, like in a dev env
+            if (!string.IsNullOrEmpty(version) && !string.IsNullOrEmpty(forkId))
+            {
+                versionText = Loc.GetString("changelog-version-tag",
+                    ("fork", forkId),
+                    ("version", version[..7])); // Only show the first 7 characters
+            }
+
+            // if else statements are ugly, shut up
+            VersionLabel.Text = versionText;
 
             TabsUpdated();
         }

Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs

@@ -30,8 +30,6 @@ protected override void Open()
             // Setup static button actions.
             _window.InputEjectButton.OnPressed += _ => SendMessage(
                 new ItemSlotButtonPressedEvent(SharedChemMaster.InputSlotName));
-            _window.OutputEjectButton.OnPressed += _ => SendMessage(
-                new ItemSlotButtonPressedEvent(SharedChemMaster.OutputSlotName));
             _window.BufferTransferButton.OnPressed += _ => SendMessage(
                 new ChemMasterSetModeMessage(ChemMasterMode.Transfer));
             _window.BufferDiscardButton.OnPressed += _ => SendMessage(
@@ -49,11 +47,9 @@ protected override void Open()
                 _window.PillTypeButtons[i].OnPressed += _ => SendMessage(new ChemMasterSetPillTypeMessage(pillType));
             }
 
-            _window.OnReagentButtonPressed += (_, button, amount) => SendMessage(new ChemMasterReagentAmountButtonMessage(button.Id, amount, button.IsBuffer));
+            _window.OnReagentButtonPressed += (_, button, amount, isOutput) => SendMessage(new ChemMasterReagentAmountButtonMessage(button.Id, amount, button.IsBuffer, isOutput));
             _window.OnSortMethodChanged += sortMethod => SendMessage(new ChemMasterSortMethodUpdated(sortMethod));
             _window.OnTransferAmountChanged += amount => SendMessage(new ChemMasterTransferringAmountUpdated(amount));
-
-
         }
 
         /// <summary>