Merge branch 'space-wizards:master' into master

Author: Spessmann

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

@@ -118,10 +118,10 @@ private List<ReagentButton> CreateReagentTransferButtons(ReagentId reagent, bool
                 ("10", ChemMasterReagentAmount.U10, StyleClass.ButtonOpenBoth),
                 ("15", ChemMasterReagentAmount.U15, StyleClass.ButtonOpenBoth),
                 ("20", ChemMasterReagentAmount.U20, StyleClass.ButtonOpenBoth),
-                ("25", ChemMasterReagentAmount.U25, StyleClass.ButtonOpenBoth),
                 ("30", ChemMasterReagentAmount.U30, StyleClass.ButtonOpenBoth),
-                ("50", ChemMasterReagentAmount.U50, StyleClass.ButtonOpenBoth),
-                ("100", ChemMasterReagentAmount.U100, StyleClass.ButtonOpenBoth),
+                ("40", ChemMasterReagentAmount.U40, StyleClass.ButtonOpenBoth),
+                ("60", ChemMasterReagentAmount.U60, StyleClass.ButtonOpenBoth),
+                ("120", ChemMasterReagentAmount.U120, StyleClass.ButtonOpenBoth),
                 (Loc.GetString("chem-master-window-buffer-all-amount"), ChemMasterReagentAmount.All, StyleClass.ButtonOpenLeft),
             };
 

Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml

@@ -15,7 +15,7 @@
                 Columns="3"
                 HorizontalAlignment="Center"
                 Margin="5"
-                ButtonList="1,5,10,15,20,25,30,50,100"
+                ButtonList="1,5,10,15,20,30,40,60,120"
                 RadioGroup="True">
             </ui:ButtonGrid>
             <Control VerticalExpand="True" />

Content.Shared/Chemistry/SharedChemMaster.cs

@@ -114,10 +114,10 @@ public enum ChemMasterReagentAmount
         U10 = 10,
         U15 = 15,
         U20 = 20,
-        U25 = 25,
         U30 = 30,
-        U50 = 50,
-        U100 = 100,
+        U40 = 40,
+        U60 = 60,
+        U120 = 120,
         All,
     }
 

Content.Shared/Chemistry/SharedReagentDispenser.cs

@@ -46,17 +46,17 @@ public ReagentDispenserSetDispenseAmountMessage(String s)
                 case "20":
                     ReagentDispenserDispenseAmount = ReagentDispenserDispenseAmount.U20;
                     break;
-                case "25":
-                    ReagentDispenserDispenseAmount = ReagentDispenserDispenseAmount.U25;
-                    break;
                 case "30":
                     ReagentDispenserDispenseAmount = ReagentDispenserDispenseAmount.U30;
                     break;
-                case "50":
-                    ReagentDispenserDispenseAmount = ReagentDispenserDispenseAmount.U50;
+                case "40":
+                    ReagentDispenserDispenseAmount = ReagentDispenserDispenseAmount.U40;
+                    break;
+                case "60":
+                    ReagentDispenserDispenseAmount = ReagentDispenserDispenseAmount.U60;
                     break;
-                case "100":
-                    ReagentDispenserDispenseAmount = ReagentDispenserDispenseAmount.U100;
+                case "120":
+                    ReagentDispenserDispenseAmount = ReagentDispenserDispenseAmount.U120;
                     break;
                 default:
                     throw new Exception($"Cannot convert the string `{s}` into a valid ReagentDispenser DispenseAmount");
@@ -102,10 +102,10 @@ public enum ReagentDispenserDispenseAmount
         U10 = 10,
         U15 = 15,
         U20 = 20,
-        U25 = 25,
         U30 = 30,
-        U50 = 50,
-        U100 = 100,
+        U40 = 40,
+        U60 = 60,
+        U120 = 120,
     }
 
     [Serializable, NetSerializable]

Resources/Changelog/Changelog.yml

@@ -1,11 +1,4 @@
 Entries:
-- author: Hitlinemoss
-  changes:
-  - message: Antagonist flavor text has been adjusted.
-    type: Tweak
-  id: 9172
-  time: '2025-10-30T01:08:06.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/41184
 - author: kontakt
   changes:
   - message: Wires will once again break randomly at roundstart.
@@ -4082,3 +4075,11 @@
   id: 9683
   time: '2026-05-05T17:33:59.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/43856
+- author: rumaks-xyz
+  changes:
+  - message: Chemical dispenser and ChemMaster transfer increments have been changed
+      to 1u, 5u, 10u, 15u, 20u, 30u, 40u, 60u, and 120u
+    type: Tweak
+  id: 9684
+  time: '2026-05-06T09:59:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/43829