tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Chem master / chem dispenser minor fixes (#5152)

Browse Source 
* Fix ChemMaster buffer view when there's no beaker in the ChemMaster

* Fix reagent dispenser 100 button
This commit is contained in:
20kdc
2021-11-04 03:22:48 +00:00
committed by GitHub
parent c956f2ed31
commit 42891ea3a7
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
View File

@@ -87,22 +87,23 @@ namespace Content.Client.Chemistry.UI
if (!state.HasBeaker) if (!state.HasBeaker)
{ {
ContainerInfo.Children.Add(new Label {Text = Loc.GetString("chem-master-window-no-container-loaded-text") }); ContainerInfo.Children.Add(new Label {Text = Loc.GetString("chem-master-window-no-container-loaded-text") });
return;
} }
else
ContainerInfo.Children.Add(new BoxContainer // Name of the container and its fill status (Ex: 44/100u)
{ {
Orientation = LayoutOrientation.Horizontal, ContainerInfo.Children.Add(new BoxContainer // Name of the container and its fill status (Ex: 44/100u)
Children =
{ {
new Label {Text = $"{state.ContainerName}: "}, Orientation = LayoutOrientation.Horizontal,
new Label Children =
{ {
Text = $"{state.BeakerCurrentVolume}/{state.BeakerMaxVolume}", new Label {Text = $"{state.ContainerName}: "},
StyleClasses = {StyleNano.StyleClassLabelSecondaryColor} new Label
{
Text = $"{state.BeakerCurrentVolume}/{state.BeakerMaxVolume}",
StyleClasses = {StyleNano.StyleClassLabelSecondaryColor}
}
} }
} });
}); }
foreach (var reagent in state.ContainerReagents) foreach (var reagent in state.ContainerReagents)
{ {

2
Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs
View File

@@ -42,7 +42,7 @@ namespace Content.Client.Chemistry.UI
DispenseButton25.Group = dispenseAmountGroup; DispenseButton25.Group = dispenseAmountGroup;
DispenseButton30.Group = dispenseAmountGroup; DispenseButton30.Group = dispenseAmountGroup;
DispenseButton50.Group = dispenseAmountGroup; DispenseButton50.Group = dispenseAmountGroup;
DispenseButton10.Group = dispenseAmountGroup; DispenseButton100.Group = dispenseAmountGroup;
} }
/// <summary> /// <summary>