Merge branch 'DeltaV-Station:master' into LAMIA

DeltaV-Station · Mar 16, 2024 · 3ede56b · 3ede56b
2 parents 9bda553 + a719ee0
commit 3ede56b
Show file tree

Hide file tree

Showing 136 changed files with 12,525 additions and 7,815 deletions.
diff --git a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml
@@ -12,7 +12,7 @@
         <BoxContainer Name="VolumeBox" Orientation="Vertical" HorizontalExpand="True" Margin="0 4"/>
 
         <!-- The temperature / heat capacity / thermal energy of the solution -->
-        <Collapsible Orientation="Vertical">
+        <Collapsible>
             <CollapsibleHeading Name="ThermalHeading" Title="{Loc 'admin-solutions-window-thermals'}" />
             <CollapsibleBody>
                 <BoxContainer Name="ThermalBox" Orientation="Vertical" HorizontalExpand="True" Margin="0 4"/>
@@ -23,7 +23,7 @@
         <ScrollContainer HorizontalExpand="True" VerticalExpand="True" Margin="0 4">
             <BoxContainer Name="ReagentList" Orientation="Vertical"/>
         </ScrollContainer>
-        
+
         <Button Name="AddButton" Text="{Loc 'admin-solutions-window-add-new-button'}" HorizontalExpand="True"  Margin="0 4"/>
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml b/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml
@@ -1,7 +1,7 @@
 <BoxContainer xmlns="https://spacestation14.io"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
          Orientation="Vertical" Margin="2 0 2 4">
-    <Collapsible Orientation="Vertical">
+    <Collapsible>
         <CollapsibleHeading Name="CAddress" />
         <!-- Upper row: toggle, direction, checks -->
         <CollapsibleBody Margin="20 0 0 0">

diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml
@@ -1,7 +1,7 @@
 <BoxContainer xmlns="https://spacestation14.io"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
          Orientation="Vertical" Margin="2 0 2 4">
-    <Collapsible Orientation="Vertical">
+    <Collapsible>
         <CollapsibleHeading Name="CAddress" />
         <CollapsibleBody Margin="20 0 0 0">
             <BoxContainer Orientation="Vertical">
@@ -26,7 +26,7 @@
                     <Button Name="CCopySettings" Text="{Loc 'air-alarm-ui-widget-copy'}" ToolTip="{Loc 'air-alarm-ui-widget-copy-tooltip'}" />
                 </BoxContainer>
                 <!-- Lower row: every single gas -->
-                <Collapsible Orientation="Vertical" Margin="2 2 2 2">
+                <Collapsible Margin="2 2 2 2">
                     <CollapsibleHeading Title="Gas filters" />
                     <CollapsibleBody Margin="20 0 0 0">
                         <GridContainer HorizontalExpand="True" Name="CGasContainer" Columns="3" />

diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml
@@ -1,5 +1,5 @@
 <BoxContainer xmlns="https://spacestation14.io" HorizontalExpand="True">
-    <Collapsible Orientation="Vertical">
+    <Collapsible>
         <CollapsibleHeading Name="SensorAddress" />
         <CollapsibleBody Margin="20 2 2 2">
             <BoxContainer Orientation="Vertical" HorizontalExpand="True">
@@ -10,7 +10,7 @@
                     <RichTextLabel Name="TemperatureLabel" />
                     <Control Name="TemperatureThresholdContainer" Margin="20 0 2 0" />
                 </BoxContainer>
-                <Collapsible Orientation="Vertical" Margin="2">
+                <Collapsible Margin="2">
                     <CollapsibleHeading Title="{Loc 'air-alarm-ui-sensor-gases'}" />
                     <CollapsibleBody Margin="20 0 0 0">
                         <BoxContainer Name="GasContainer" Orientation="Vertical" Margin="2" />

diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdControl.xaml b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdControl.xaml
@@ -1,7 +1,7 @@
 <BoxContainer xmlns="https://spacestation14.io"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
          Orientation="Vertical" Margin="0 0 0 4">
-    <Collapsible Orientation="Vertical">
+    <Collapsible>
         <CollapsibleHeading Name="CName" />
         <CollapsibleBody Margin="20 0 0 0">
             <BoxContainer Orientation="Vertical">

diff --git a/Content.Client/Bed/Cryostorage/CryostorageEntryControl.xaml b/Content.Client/Bed/Cryostorage/CryostorageEntryControl.xaml
@@ -11,7 +11,7 @@
         <PanelContainer.PanelOverride>
             <graphics:StyleBoxFlat BackgroundColor="{xNamespace:Static style:StyleNano.ButtonColorDisabled}" />
         </PanelContainer.PanelOverride>
-        <Collapsible Orientation="Vertical" Name="Collapsible">
+        <Collapsible Name="Collapsible">
             <CollapsibleHeading Name="Heading" MinHeight="35"/>
             <CollapsibleBody Name="Body">
                 <BoxContainer Name="ItemsContainer" Orientation="Vertical" HorizontalExpand="True"/>

diff --git a/Content.Client/Cargo/UI/CargoPalletMenu.xaml b/Content.Client/Cargo/UI/CargoPalletMenu.xaml
@@ -1,9 +1,9 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
-            xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-            xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                      xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
             SetSize="300 150"
-            MinSize="300 150">
-    <BoxContainer Orientation="Vertical">
+            MinSize="300 150"
+                      Title="{Loc 'cargo-pallet-console-menu-title'}">
+    <BoxContainer Orientation="Vertical" Margin="5">
         <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc 'cargo-pallet-menu-appraisal-label'}"
                    StyleClasses="LabelKeyText" />

diff --git a/Content.Client/Cargo/UI/CargoPalletMenu.xaml.cs b/Content.Client/Cargo/UI/CargoPalletMenu.xaml.cs
@@ -17,7 +17,6 @@ public CargoPalletMenu()
         RobustXamlLoader.Load(this);
         SellButton.OnPressed += OnSellPressed;
         AppraiseButton.OnPressed += OnAppraisePressed;
-        Title = Loc.GetString("cargo-pallet-console-menu-title");
     }
 
     public void SetAppraisal(int amount)

diff --git a/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml b/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml
@@ -11,7 +11,7 @@
                 <RichTextLabel Name="ReagentName" HorizontalAlignment="Center"/>
             </PanelContainer>
             <BoxContainer Name="RecipesContainer" HorizontalExpand="True">
-                <Collapsible Orientation="Vertical" HorizontalExpand="True">
+                <Collapsible HorizontalExpand="True">
                     <CollapsibleHeading Title="{Loc 'guidebook-reagent-recipes-header'}"/>
                     <CollapsibleBody>
                         <GridContainer Name="RecipesDescriptionContainer"
@@ -24,7 +24,7 @@
                 </Collapsible>
             </BoxContainer>
             <BoxContainer Name="SourcesContainer" HorizontalExpand="True">
-                <Collapsible Orientation="Vertical" HorizontalExpand="True">
+                <Collapsible HorizontalExpand="True">
                     <CollapsibleHeading Title="{Loc 'guidebook-reagent-sources-header'}"/>
                     <CollapsibleBody>
                         <GridContainer Name="SourcesDescriptionContainer"
@@ -37,7 +37,7 @@
                 </Collapsible>
             </BoxContainer>
             <BoxContainer Name="EffectsContainer" HorizontalExpand="True">
-                <Collapsible Orientation="Vertical">
+                <Collapsible>
                     <CollapsibleHeading Title="{Loc 'guidebook-reagent-effects-header'}"/>
                     <CollapsibleBody>
                         <BoxContainer Name="EffectsDescriptionContainer"

diff --git a/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml b/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml
@@ -7,7 +7,7 @@
                 <CheckBox Name="MarkingForced" Text="Force" Pressed="True" />
                 <CheckBox Name="MarkingIgnoreSpecies" Text="Ignore Species" Pressed="True" />
             </BoxContainer>
-            <Collapsible Orientation="Vertical" HorizontalExpand="True">
+            <Collapsible HorizontalExpand="True">
                 <CollapsibleHeading Title="Base layers" />
                 <CollapsibleBody HorizontalExpand="True">
                     <BoxContainer Name="BaseLayersContainer" Orientation="Vertical" HorizontalExpand="True" />

diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs
@@ -1,6 +1,7 @@
 using Content.Client.Pinpointer.UI;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Timing;
 
 namespace Content.Client.Medical.CrewMonitoring;
 
@@ -16,7 +17,7 @@ public CrewMonitoringNavMapControl() : base()
     {
         WallColor = new Color(192, 122, 196);
         TileColor = new(71, 42, 72);
-        _backgroundColor = Color.FromSrgb(TileColor.WithAlpha(_backgroundOpacity));
+        BackgroundColor = Color.FromSrgb(TileColor.WithAlpha(BackgroundOpacity));
 
         _trackedEntityLabel = new Label
         {
@@ -30,7 +31,7 @@ public CrewMonitoringNavMapControl() : base()
         {
             PanelOverride = new StyleBoxFlat
             {
-                BackgroundColor = _backgroundColor,
+                BackgroundColor = BackgroundColor,
             },
 
             Margin = new Thickness(5f, 10f),
@@ -43,9 +44,9 @@ public CrewMonitoringNavMapControl() : base()
         this.AddChild(_trackedEntityPanel);
     }
 
-    protected override void Draw(DrawingHandleScreen handle)
+    protected override void FrameUpdate(FrameEventArgs args)
     {
-        base.Draw(handle);
+        base.FrameUpdate(args);
 
         if (Focus == null)
         {

diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
@@ -23,7 +23,6 @@ namespace Content.Client.Medical.CrewMonitoring;
 [GenerateTypedNameReferences]
 public sealed partial class CrewMonitoringWindow : FancyWindow
 {
-    private List<Control> _rowsContent = new();
     private readonly IEntityManager _entManager;
     private readonly IPrototypeManager _prototypeManager;
     private readonly SpriteSystem _spriteSystem;
@@ -100,7 +99,6 @@ public void ShowSensors(List<SuitSensorStatus> sensors, EntityUid monitor, Entit
                 };
 
                 SensorsTable.AddChild(spacer);
-                _rowsContent.Add(spacer);
             }
 
             var deparmentLabel = new RichTextLabel()
@@ -113,7 +111,6 @@ public void ShowSensors(List<SuitSensorStatus> sensors, EntityUid monitor, Entit
             deparmentLabel.StyleClasses.Add(StyleNano.StyleClassTooltipActionDescription);
 
             SensorsTable.AddChild(deparmentLabel);
-            _rowsContent.Add(deparmentLabel);
 
             PopulateDepartmentList(departmentSensors);
         }
@@ -129,7 +126,6 @@ public void ShowSensors(List<SuitSensorStatus> sensors, EntityUid monitor, Entit
             };
 
             SensorsTable.AddChild(spacer);
-            _rowsContent.Add(spacer);
 
             var deparmentLabel = new RichTextLabel()
             {
@@ -141,7 +137,6 @@ public void ShowSensors(List<SuitSensorStatus> sensors, EntityUid monitor, Entit
             deparmentLabel.StyleClasses.Add(StyleNano.StyleClassTooltipActionDescription);
 
             SensorsTable.AddChild(deparmentLabel);
-            _rowsContent.Add(deparmentLabel);
 
             PopulateDepartmentList(remainingSensors);
         }
@@ -175,7 +170,6 @@ private void PopulateDepartmentList(IEnumerable<SuitSensorStatus> departmentSens
                 sensorButton.AddStyleClass(StyleNano.StyleClassButtonColorGreen);
 
             SensorsTable.AddChild(sensorButton);
-            _rowsContent.Add(sensorButton);
 
             // Primary container to hold the button UI elements
             var mainContainer = new BoxContainer()
@@ -422,7 +416,6 @@ private bool TryGetNextScrollPosition([NotNullWhen(true)] out float? nextScrollP
     private void ClearOutDatedData()
     {
         SensorsTable.RemoveAllChildren();
-        _rowsContent.Clear();
         NavMap.TrackedCoordinates.Clear();
         NavMap.TrackedEntities.Clear();
         NavMap.LocalizedNames.Clear();