Up070824

.github/CODEOWNERS

@@ -55,3 +55,10 @@
 #Jezi
 #/Content.*/Medical @Jezithyr
 #/Content.*/Body @Jezithyr
+
+# Sloth
+#/Content.*/Audio @metalgearsloth
+#/Content.*/Movement @metalgearsloth
+#/Content.*/NPC @metalgearsloth
+#/Content.*/Shuttles @metalgearsloth
+#/Content.*/Weapons @metalgearsloth

.github/workflows/labeler-untriaged.yml

@@ -9,5 +9,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions-ecosystem/action-add-labels@v1
+      if: join(github.event.issue.labels) == ''
       with:
         labels: "Status: Untriaged"

.github/workflows/rsi-diff.yml

@@ -15,9 +15,12 @@ jobs:
 
       - name: Get changed files
         id: files
-        uses: Ana06/get-changed-files@v1.2
+        uses: Ana06/get-changed-files@v2.3.0
         with:
           format: 'space-delimited'
+          filter: | 
+            **.rsi
+            **.png
 
       - name: Diff changed RSIs
         id: diff

Content.Client/Actions/UI/ActionAlertTooltip.cs

@@ -1,4 +1,4 @@
-using Content.Client.Stylesheets;
+using Content.Client.Stylesheets;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
@@ -77,9 +77,12 @@ public ActionAlertTooltip(FormattedMessage name, FormattedMessage? desc, string?
                     MaxWidth = TooltipTextMaxWidth,
                     StyleClasses = {StyleNano.StyleClassTooltipActionRequirements}
                 };
-                requiresLabel.SetMessage(FormattedMessage.FromMarkup("[color=#635c5c]" +
-                                                                     requires +
-                                                                     "[/color]"));
+
+                if (!FormattedMessage.TryFromMarkup("[color=#635c5c]" + requires + "[/color]", out var markup))
+                    return;
+
+                requiresLabel.SetMessage(markup);
+
                 vbox.AddChild(requiresLabel);
             }
         }
@@ -97,8 +100,11 @@ protected override void FrameUpdate(FrameEventArgs args)
             if (timeLeft > TimeSpan.Zero)
             {
                 var duration = Cooldown.Value.End - Cooldown.Value.Start;
-                _cooldownLabel.SetMessage(FormattedMessage.FromMarkup(
-                    $"[color=#a10505]{(int) duration.TotalSeconds} sec cooldown ({(int) timeLeft.TotalSeconds + 1} sec remaining)[/color]"));
+
+                if (!FormattedMessage.TryFromMarkup($"[color=#a10505]{(int) duration.TotalSeconds} sec cooldown ({(int) timeLeft.TotalSeconds + 1} sec remaining)[/color]", out var markup))
+                    return;
+
+                _cooldownLabel.SetMessage(markup);
                 _cooldownLabel.Visible = true;
             }
             else

Content.Client/Administration/UI/AdminMenuWindow.xaml.cs

@@ -3,38 +3,57 @@
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.Administration.UI
+namespace Content.Client.Administration.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class AdminMenuWindow : DefaultWindow
 {
-    [GenerateTypedNameReferences]
-    public sealed partial class AdminMenuWindow : DefaultWindow
+    public event Action? OnDisposed;
+
+    public AdminMenuWindow()
+    {
+        MinSize = new Vector2(650, 250);
+        Title = Loc.GetString("admin-menu-title");
+        RobustXamlLoader.Load(this);
+        MasterTabContainer.SetTabTitle((int) TabIndex.Admin, Loc.GetString("admin-menu-admin-tab"));
+        MasterTabContainer.SetTabTitle((int) TabIndex.Adminbus, Loc.GetString("admin-menu-adminbus-tab"));
+        MasterTabContainer.SetTabTitle((int) TabIndex.Atmos, Loc.GetString("admin-menu-atmos-tab"));
+        MasterTabContainer.SetTabTitle((int) TabIndex.Round, Loc.GetString("admin-menu-round-tab"));
+        MasterTabContainer.SetTabTitle((int) TabIndex.Server, Loc.GetString("admin-menu-server-tab"));
+        MasterTabContainer.SetTabTitle((int) TabIndex.PanicBunker, Loc.GetString("admin-menu-panic-bunker-tab"));
+        /*
+         * TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
+         */
+        MasterTabContainer.SetTabTitle((int) TabIndex.BabyJail, Loc.GetString("admin-menu-baby-jail-tab"));
+        MasterTabContainer.SetTabTitle((int) TabIndex.Players, Loc.GetString("admin-menu-players-tab"));
+        MasterTabContainer.SetTabTitle((int) TabIndex.Objects, Loc.GetString("admin-menu-objects-tab"));
+        MasterTabContainer.OnTabChanged += OnTabChanged;
+    }
+
+    private void OnTabChanged(int tabIndex)
     {
-        public event Action? OnDisposed;
+        var tabEnum = (TabIndex)tabIndex;
+        if (tabEnum == TabIndex.Objects)
+            ObjectsTabControl.RefreshObjectList();
+    }
 
-        public AdminMenuWindow()
-        {
-            MinSize = new Vector2(650, 250);
-            Title = Loc.GetString("admin-menu-title");
-            RobustXamlLoader.Load(this);
-            MasterTabContainer.SetTabTitle(0, Loc.GetString("admin-menu-admin-tab"));
-            MasterTabContainer.SetTabTitle(1, Loc.GetString("admin-menu-adminbus-tab"));
-            MasterTabContainer.SetTabTitle(2, Loc.GetString("admin-menu-atmos-tab"));
-            MasterTabContainer.SetTabTitle(3, Loc.GetString("admin-menu-round-tab"));
-            MasterTabContainer.SetTabTitle(4, Loc.GetString("admin-menu-server-tab"));
-            MasterTabContainer.SetTabTitle(5, Loc.GetString("admin-menu-panic-bunker-tab"));
-            /*
-             * TODO: Remove baby jail code once a more mature gateway process is established. This code is only being issued as a stopgap to help with potential tiding in the immediate future.
-             */
-            MasterTabContainer.SetTabTitle(6, Loc.GetString("admin-menu-baby-jail-tab"));
-            MasterTabContainer.SetTabTitle(7, Loc.GetString("admin-menu-players-tab"));
-            MasterTabContainer.SetTabTitle(8, Loc.GetString("admin-menu-objects-tab"));
-        }
+    protected override void Dispose(bool disposing)
+    {
+        OnDisposed?.Invoke();
+        base.Dispose(disposing);
+        OnDisposed = null;
+    }
 
-        protected override void Dispose(bool disposing)
-        {
-            OnDisposed?.Invoke();
-            base.Dispose(disposing);
-            OnDisposed = null;
-        }
+    private enum TabIndex
+    {
+        Admin = 0,
+        Adminbus,
+        Atmos,
+        Round,
+        Server,
+        PanicBunker,
+        BabyJail,
+        Players,
+        Objects,
     }
 }
-

Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml

@@ -5,7 +5,7 @@
     <LineEdit Name="FilterLineEdit"
               MinSize="100 0"
               HorizontalExpand="True"
-              PlaceHolder="{Loc Filter}"/>
+              PlaceHolder="{Loc player-list-filter}"/>
     <PanelContainer Name="BackgroundPanel"
                     VerticalExpand="True"
                     HorizontalExpand="True">

Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml

@@ -1,10 +1,10 @@
 <Popup xmlns="https://spacestation14.io"
        xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
-    <PanelContainer StyleClasses="BackgroundDark">
+    <PanelContainer>
         <PanelContainer.PanelOverride>
-            <gfx:StyleBoxFlat BorderThickness="1" BorderColor="#18181B"/>
+            <gfx:StyleBoxFlat BorderThickness="2" BorderColor="#18181B" BackgroundColor="#25252a"/>
         </PanelContainer.PanelOverride>
-        <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Vertical" Margin="4 4 4 4">
             <Label Name="PlayerNameLabel"/>
             <Label Name="IdLabel"/>
             <Label Name="TypeLabel"/>

Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml

@@ -4,7 +4,7 @@
     Title="{Loc admin-player-actions-window-title}" MinSize="425 272">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Reason}" MinWidth="100" />
+            <Label Text="{Loc admin-player-actions-reason}" MinWidth="100" />
             <Control MinWidth="50" />
             <LineEdit Name="ReasonLine" MinWidth="100" HorizontalExpand="True" />
         </BoxContainer>

Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml

@@ -1,9 +1,9 @@
 <DefaultWindow
     xmlns="https://spacestation14.io"
     xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
-    Title="{Loc Teleport}" MinSize="425 230">
+    Title="{Loc admin-ui-teleport}" MinSize="425 230">
     <BoxContainer Orientation="Vertical">
         <cc:PlayerListControl Name="PlayerList" />
-        <Button Name="SubmitButton" Text="{Loc Teleport}" />
+        <Button Name="SubmitButton" Text="{Loc admin-ui-teleport}" />
     </BoxContainer>
 </DefaultWindow>

Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml

@@ -1,33 +1,33 @@
 <DefaultWindow
-    xmlns="https://spacestation14.io" Title="{Loc Load Blueprint}">
+    xmlns="https://spacestation14.io" Title="{Loc admin-ui-blueprint-load}">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Map}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-blueprint-map}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="MapOptions" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Path}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-blueprint-path}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <LineEdit Name="MapPath" MinSize="200 0" HorizontalExpand="True" Text="/Maps/" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc X}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-blueprint-x}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="XCoordinate" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Y}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-blueprint-y}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="YCoordinate" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Rotation}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-blueprint-rotation}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="RotationSpin" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
-        <Button Name="SubmitButton" Text="{Loc Load Blueprint}" />
-        <Button Name="TeleportButton" Text="{Loc Teleport to}" />
-        <Button Name="ResetButton" Text="{Loc Reset to default}"></Button>
+        <Button Name="SubmitButton" Text="{Loc admin-ui-blueprint-load}" />
+        <Button Name="TeleportButton" Text="{Loc admin-ui-blueprint-teleport}" />
+        <Button Name="ResetButton" Text="{Loc admin-ui-blueprint-reset}"></Button>
     </BoxContainer>
 </DefaultWindow>

Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml

@@ -1,11 +1,11 @@
 <DefaultWindow
-    xmlns="https://spacestation14.io" Title="{Loc Add Atmos}">
+    xmlns="https://spacestation14.io" Title="{Loc admin-ui-atmos-add}">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Grid}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-grid}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="GridOptions" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
-        <Button Name="SubmitButton" Text="{Loc Add Atmos}" />
+        <Button Name="SubmitButton" Text="{Loc admin-ui-atmos-add}" />
     </BoxContainer>
 </DefaultWindow>

Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs

@@ -35,7 +35,7 @@ protected override void EnteredTree()
             while (query.MoveNext(out var uid, out var grid))
             {
                 _data.Add((uid, grid));
-                GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
+                GridOptions.AddItem($"{uid} {(playerGrid == uid ? Loc.GetString($"admin-ui-atmos-grid-current") : "")}");
             }
 
             GridOptions.OnItemSelected += eventArgs => GridOptions.SelectId(eventArgs.Id);

Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml

@@ -1,31 +1,31 @@
 <DefaultWindow
-    xmlns="https://spacestation14.io" Title="{Loc Add Gas}">
+    xmlns="https://spacestation14.io" Title="{Loc admin-ui-atmos-add-gas}">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Grid}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-grid}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="GridOptions" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc TileX}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-tile-x}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="TileXSpin" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc TileY}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-tile-y}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="TileYSpin" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Gas}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-gas}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="GasOptions" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Amount}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-gas-amount}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="AmountSpin" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
-        <Button Name="SubmitButton" Text="{Loc Add Gas}" />
+        <Button Name="SubmitButton" Text="{Loc admin-ui-atmos-add-gas}" />
     </BoxContainer>
 </DefaultWindow>

Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs

@@ -33,7 +33,7 @@ protected override void EnteredTree()
                 _gridData.Add(entManager.GetNetEntity(uid));
                 var player = playerManager.LocalEntity;
                 var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid;
-                GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
+                GridOptions.AddItem($"{uid} {(playerGrid == uid ? Loc.GetString("admin-ui-atmos-grid-current") : "")}");
             }
 
             GridOptions.OnItemSelected += eventArgs => GridOptions.SelectId(eventArgs.Id);

Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml

@@ -6,10 +6,10 @@
     Margin="4"
     MinSize="50 50">
     <GridContainer Columns="4">
-        <cc:UICommandButton Text="{Loc Add Atmos}" Command="addatmos" WindowType="{x:Type at:AddAtmosWindow}" />
-        <cc:UICommandButton Text="{Loc Add Gas}" Command="addgas" WindowType="{x:Type at:AddGasWindow}" />
-        <cc:UICommandButton Text="{Loc Fill Gas}" Command="fillgas" WindowType="{x:Type at:FillGasWindow}" />
-        <cc:UICommandButton Text="{Loc Set Temperature}" Command="settemp"
+        <cc:UICommandButton Text="{Loc admin-ui-atmos-add}" Command="addatmos" WindowType="{x:Type at:AddAtmosWindow}" />
+        <cc:UICommandButton Text="{Loc admin-ui-atmos-add-gas}" Command="addgas" WindowType="{x:Type at:AddGasWindow}" />
+        <cc:UICommandButton Text="{Loc admin-ui-atmos-fill-gas}" Command="fillgas" WindowType="{x:Type at:FillGasWindow}" />
+        <cc:UICommandButton Text="{Loc admin-ui-atmos-set-temperature}" Command="settemp"
                              WindowType="{x:Type at:SetTemperatureWindow}" />
     </GridContainer>
 </Control>

Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml

@@ -1,21 +1,21 @@
 <DefaultWindow
-    xmlns="https://spacestation14.io" Title="{Loc Fill Gas}">
+    xmlns="https://spacestation14.io" Title="{Loc admin-ui-atmos-fill-gas}">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Grid}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-grid}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="GridOptions" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Gas}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-gas}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <OptionButton Name="GasOptions" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
         <BoxContainer Orientation="Horizontal">
-            <Label Text="{Loc Amount}" MinSize="100 0" />
+            <Label Text="{Loc admin-ui-atmos-gas-amount}" MinSize="100 0" />
             <Control MinSize="50 0" />
             <SpinBox Name="AmountSpin" MinSize="100 0" HorizontalExpand="True" />
         </BoxContainer>
-        <Button Name="SubmitButton" Text="{Loc Fill Gas}" />
+        <Button Name="SubmitButton" Text="{Loc admin-ui-atmos-fill-gas}" />
     </BoxContainer>
 </DefaultWindow>

Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs

@@ -36,7 +36,7 @@ protected override void EnteredTree()
             {
                 var player = playerManager.LocalEntity;
                 var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid;
-                GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
+                GridOptions.AddItem($"{uid} {(playerGrid == uid ? Loc.GetString($"admin-ui-atmos-grid-current") : "")}");
                 _gridData.Add(entManager.GetNetEntity(uid));
             }