diff --git a/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserBoundUserInterface.cs b/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserBoundUserInterface.cs index 6ab682f76b..e6675df4c4 100644 --- a/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserBoundUserInterface.cs +++ b/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserBoundUserInterface.cs @@ -48,7 +48,10 @@ namespace Content.Client.GameObjects.Components.Chemistry.ReagentDispenser _window.DispenseButton1.OnPressed += _ => ButtonPressed(UiButton.SetDispenseAmount1); _window.DispenseButton5.OnPressed += _ => ButtonPressed(UiButton.SetDispenseAmount5); _window.DispenseButton10.OnPressed += _ => ButtonPressed(UiButton.SetDispenseAmount10); + _window.DispenseButton15.OnPressed += _ => ButtonPressed(UiButton.SetDispenseAmount15); + _window.DispenseButton20.OnPressed += _ => ButtonPressed(UiButton.SetDispenseAmount20); _window.DispenseButton25.OnPressed += _ => ButtonPressed(UiButton.SetDispenseAmount25); + _window.DispenseButton30.OnPressed += _ => ButtonPressed(UiButton.SetDispenseAmount30); _window.DispenseButton50.OnPressed += _ => ButtonPressed(UiButton.SetDispenseAmount50); _window.DispenseButton100.OnPressed += _ => ButtonPressed(UiButton.SetDispenseAmount100); } diff --git a/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs b/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs index d32d10f776..699df5e956 100644 --- a/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs +++ b/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs @@ -34,9 +34,18 @@ namespace Content.Client.GameObjects.Components.Chemistry.ReagentDispenser /// Sets the dispense amount to 10 when pressed. public Button DispenseButton10 { get; } + /// Sets the dispense amount to 15 when pressed. + public Button DispenseButton15 { get; } + + /// Sets the dispense amount to 20 when pressed. + public Button DispenseButton20 { get; } + /// Sets the dispense amount to 25 when pressed. public Button DispenseButton25 { get; } + /// Sets the dispense amount to 30 when pressed. + public Button DispenseButton30 { get; } + /// Sets the dispense amount to 50 when pressed. public Button DispenseButton50 { get; } @@ -79,7 +88,10 @@ namespace Content.Client.GameObjects.Components.Chemistry.ReagentDispenser (DispenseButton1 = new Button {Text = "1", Group = dispenseAmountGroup, StyleClasses = { StyleBase.ButtonOpenRight }}), (DispenseButton5 = new Button {Text = "5", Group = dispenseAmountGroup, StyleClasses = { StyleBase.ButtonOpenBoth }}), (DispenseButton10 = new Button {Text = "10", Group = dispenseAmountGroup, StyleClasses = { StyleBase.ButtonOpenBoth }}), + (DispenseButton15 = new Button {Text = "15", Group = dispenseAmountGroup, StyleClasses = { StyleBase.ButtonOpenBoth }}), + (DispenseButton20 = new Button {Text = "20", Group = dispenseAmountGroup, StyleClasses = { StyleBase.ButtonOpenBoth }}), (DispenseButton25 = new Button {Text = "25", Group = dispenseAmountGroup, StyleClasses = { StyleBase.ButtonOpenBoth }}), + (DispenseButton30 = new Button {Text = "30", Group = dispenseAmountGroup, StyleClasses = { StyleBase.ButtonOpenBoth }}), (DispenseButton50 = new Button {Text = "50", Group = dispenseAmountGroup, StyleClasses = { StyleBase.ButtonOpenBoth }}), (DispenseButton100 = new Button {Text = "100", Group = dispenseAmountGroup, StyleClasses = { StyleBase.ButtonOpenLeft }}), } @@ -215,9 +227,18 @@ namespace Content.Client.GameObjects.Components.Chemistry.ReagentDispenser case 10: DispenseButton10.Pressed = true; break; + case 15: + DispenseButton15.Pressed = true; + break; + case 20: + DispenseButton20.Pressed = true; + break; case 25: DispenseButton25.Pressed = true; break; + case 30: + DispenseButton30.Pressed = true; + break; case 50: DispenseButton50.Pressed = true; break; diff --git a/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs b/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs index 51f2bdb46d..eb62004809 100644 --- a/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs @@ -161,9 +161,18 @@ namespace Content.Server.GameObjects.Components.Chemistry case UiButton.SetDispenseAmount10: _dispenseAmount = ReagentUnit.New(10); break; + case UiButton.SetDispenseAmount15: + _dispenseAmount = ReagentUnit.New(15); + break; + case UiButton.SetDispenseAmount20: + _dispenseAmount = ReagentUnit.New(20); + break; case UiButton.SetDispenseAmount25: _dispenseAmount = ReagentUnit.New(25); break; + case UiButton.SetDispenseAmount30: + _dispenseAmount = ReagentUnit.New(30); + break; case UiButton.SetDispenseAmount50: _dispenseAmount = ReagentUnit.New(50); break; diff --git a/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/SharedReagentDispenserComponent.cs b/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/SharedReagentDispenserComponent.cs index b0d17284ec..c36e8498ff 100644 --- a/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/SharedReagentDispenserComponent.cs +++ b/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/SharedReagentDispenserComponent.cs @@ -88,7 +88,10 @@ namespace Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser SetDispenseAmount1, SetDispenseAmount5, SetDispenseAmount10, + SetDispenseAmount15, + SetDispenseAmount20, SetDispenseAmount25, + SetDispenseAmount30, SetDispenseAmount50, SetDispenseAmount100, ///