Merge pull request space-wizards#78 from space-syndicate/upstream-sync

Upstream sync
Morb0 · Jan 23, 2022 · e895a39 · e895a39
2 parents 46c9916 + d9bc64e
commit e895a39
Show file tree

Hide file tree

Showing 270 changed files with 1,977 additions and 489 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -9,7 +9,10 @@ on:
       - '**.sln'
       - '**.git**'
       - '**.yml'
-      - 'RobustToolbox/'
+      # no docs on which one of these is supposed to work, so
+      # why not just do both
+      - 'RobustToolbox'
+      - 'RobustToolbox/**'
   pull_request:
     branches: [ master ]
     paths:
@@ -18,7 +21,8 @@ on:
       - '**.sln'
       - '**.git**'
       - '**.yml'
-      - 'RobustToolbox/'
+      - 'RobustToolbox'
+      - 'RobustToolbox/**'
 
 jobs:
   build:

diff --git a/.gitignore b/.gitignore
@@ -288,5 +288,8 @@ ehthumbs.db
 # Merge driver stuff
 Content.Tools/test/out.yml
 
-# Windows 
-desktop.ini
+# Windows
+desktop.ini
+
+# Images generated using the MapRenderer
+Resources/MapImages
diff --git a/Content.Benchmarks/DynamicTreeBenchmark.cs b/Content.Benchmarks/DynamicTreeBenchmark.cs
@@ -1,4 +1,4 @@
-using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Attributes;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 
@@ -7,7 +7,7 @@ namespace Content.Benchmarks
     [SimpleJob, MemoryDiagnoser]
     public class DynamicTreeBenchmark
     {
-        private static readonly Box2[] aabbs1 =
+        private static readonly Box2[] _aabbs1 =
         {
             ((Box2) default).Enlarged(1), //2x2 square
             ((Box2) default).Enlarged(2), //4x4 square
@@ -37,11 +37,11 @@ public class DynamicTreeBenchmark
         public void Setup()
         {
             _b2Tree = new B2DynamicTree<int>();
-            _tree = new DynamicTree<int>((in int value) => aabbs1[value], capacity: 16);
+            _tree = new DynamicTree<int>((in int value) => _aabbs1[value], capacity: 16);
 
-            for (var i = 0; i < aabbs1.Length; i++)
+            for (var i = 0; i < _aabbs1.Length; i++)
             {
-                var aabb = aabbs1[i];
+                var aabb = _aabbs1[i];
                 _b2Tree.CreateProxy(aabb, i);
                 _tree.Add(i);
             }

diff --git a/Content.Client/AI/ClientPathfindingDebugSystem.cs b/Content.Client/AI/ClientPathfindingDebugSystem.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Shared.AI;
@@ -18,7 +18,6 @@ namespace Content.Client.AI
 #if DEBUG
     public class ClientPathfindingDebugSystem : EntitySystem
     {
-        [Dependency] private readonly IOverlayManager _overlayManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IEyeManager _eyeManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;

diff --git a/Content.Client/AME/UI/AMEWindow.xaml b/Content.Client/AME/UI/AMEWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             Title="{Loc 'ame-window-title'}"
             MinSize="250 250">
     <BoxContainer Orientation="Vertical">
@@ -43,4 +43,4 @@
             <Label Name="CoreCount" Text="0" />
         </BoxContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/AME/UI/AMEWindow.xaml.cs b/Content.Client/AME/UI/AMEWindow.xaml.cs
@@ -12,7 +12,7 @@
 namespace Content.Client.AME.UI
 {
     [GenerateTypedNameReferences]
-    public partial class AMEWindow : SS14Window
+    public partial class AMEWindow : DefaultWindow
     {
         public AMEWindow(AMEControllerBoundUserInterface ui)
         {

diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml b/Content.Client/Access/UI/IdCardConsoleWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             MinSize="650 290">
     <BoxContainer Orientation="Vertical">
         <GridContainer Columns="3">
@@ -27,4 +27,4 @@
 
         </GridContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
@@ -13,7 +13,7 @@
 namespace Content.Client.Access.UI
 {
     [GenerateTypedNameReferences]
-    public partial class IdCardConsoleWindow : SS14Window
+    public partial class IdCardConsoleWindow : DefaultWindow
     {
         private readonly IdCardConsoleBoundUserInterface _owner;
 

diff --git a/Content.Client/Actions/UI/ActionMenu.cs b/Content.Client/Actions/UI/ActionMenu.cs
@@ -27,7 +27,7 @@ namespace Content.Client.Actions.UI
     /// Action selection menu, allows filtering and searching over all possible
     /// actions and populating those actions into the hotbar.
     /// </summary>
-    public class ActionMenu : SS14Window
+    public class ActionMenu : DefaultWindow
     {
         private const string ItemTag = "item";
         private const string NotItemTag = "not item";

diff --git a/Content.Client/Administration/AdminVerbSystem.cs b/Content.Client/Administration/AdminVerbSystem.cs
@@ -12,7 +12,6 @@ namespace Content.Client.Verbs
     class AdminVerbSystem : EntitySystem
     {
         [Dependency] private readonly IClientConGroupController _clientConGroupController = default!;
-        [Dependency] private readonly IViewVariablesManager _viewVariablesManager = default!;
         [Dependency] private readonly IClientConsoleHost _clientConsoleHost = default!;
 
         public override void Initialize()

diff --git a/Content.Client/Administration/UI/AdminAnnounceWindow.xaml b/Content.Client/Administration/UI/AdminAnnounceWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window
+<DefaultWindow
     xmlns="https://spacestation14.io"
     Title="{Loc 'admin-announce-title'}"
     MinWidth="500">
@@ -12,4 +12,4 @@
 
         <Button Name="AnnounceButton" Access="Public" Disabled="True" Text="{Loc 'Announce'}" HorizontalAlignment="Center"/>
     </GridContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs b/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs
@@ -10,7 +10,7 @@
 namespace Content.Client.Administration.UI
 {
     [GenerateTypedNameReferences]
-    public partial class AdminAnnounceWindow : SS14Window
+    public partial class AdminAnnounceWindow : DefaultWindow
     {
         [Dependency] private readonly ILocalizationManager _localization = default!;
 

diff --git a/Content.Client/Administration/UI/AdminMenuWindow.xaml b/Content.Client/Administration/UI/AdminMenuWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window
+<DefaultWindow
     xmlns="https://spacestation14.io"
     xmlns:adminTab="clr-namespace:Content.Client.Administration.UI.Tabs.AdminTab"
     xmlns:adminbusTab="clr-namespace:Content.Client.Administration.UI.Tabs.AdminbusTab"
@@ -13,4 +13,4 @@
         <tabs:ServerTab />
         <playerTab:PlayerTab Name="PlayerTabControl" Access="Public" />
     </TabContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs b/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
@@ -9,7 +9,7 @@
 namespace Content.Client.Administration.UI
 {
     [GenerateTypedNameReferences]
-    public partial class AdminMenuWindow : SS14Window
+    public partial class AdminMenuWindow : DefaultWindow
     {
         [Dependency] private readonly IGameHud? _gameHud = default!;
 

diff --git a/Content.Client/Administration/UI/CustomControls/UICommandButton.cs b/Content.Client/Administration/UI/CustomControls/UICommandButton.cs
@@ -7,13 +7,13 @@ namespace Content.Client.Administration.UI.CustomControls
     public class UICommandButton : CommandButton
     {
         public Type? WindowType { get; set; }
-        private SS14Window? _window;
+        private DefaultWindow? _window;
 
         protected override void Execute(ButtonEventArgs obj)
         {
             if (WindowType == null)
                 return;
-            _window = (SS14Window) IoCManager.Resolve<IDynamicTypeFactory>().CreateInstance(WindowType);
+            _window = (DefaultWindow) IoCManager.Resolve<IDynamicTypeFactory>().CreateInstance(WindowType);
             _window?.OpenCentered();
         }
     }

diff --git a/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml b/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml
@@ -1,7 +1,7 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             xmlns:logs="clr-namespace:Content.Client.Administration.UI.Logs"
             Title="{Loc admin-logs-title}"
             MinWidth="1000"
             MinHeight="400">
     <logs:AdminLogsControl Name="Logs" Access="Public"/>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml.cs b/Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml.cs
@@ -5,7 +5,7 @@
 namespace Content.Client.Administration.UI.Logs;
 
 [GenerateTypedNameReferences]
-public partial class AdminLogsWindow : SS14Window
+public partial class AdminLogsWindow : DefaultWindow
 {
     public AdminLogsWindow()
     {

diff --git a/Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml b/Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window
+<DefaultWindow
     SetSize="250 300"
     Margin="4 0"
     xmlns="https://spacestation14.io">
@@ -10,4 +10,4 @@
         <ItemList Name="ReagentList" SelectMode="Single" VerticalExpand="True"  Margin ="0 4"/>
         <Button Name="AddButton" HorizontalExpand="True" Margin ="0 4" />
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml.cs b/Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml.cs
@@ -16,7 +16,7 @@ namespace Content.Client.Administration.UI.ManageSolutions
     ///     cref="EditSolutionsWindow"/>
     /// </summary>
     [GenerateTypedNameReferences]
-    public sealed partial class AddReagentWindow : SS14Window
+    public sealed partial class AddReagentWindow : DefaultWindow
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;

diff --git a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window
+<DefaultWindow
     SetSize="300 300"
     Margin="4 0"
     xmlns="https://spacestation14.io">
@@ -20,4 +20,4 @@
         </ScrollContainer>
         <Button Name="AddButton" Text="{Loc 'admin-solutions-window-add-new-button'}" HorizontalExpand="True"  Margin="0 4"/>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs
@@ -17,7 +17,7 @@ namespace Content.Client.Administration.UI.ManageSolutions
     ///     A simple window that displays solutions and their contained reagents. Allows you to edit the reagent quantities and add new reagents.
     /// </summary>
     [GenerateTypedNameReferences]
-    public sealed partial class EditSolutionsWindow : SS14Window
+    public sealed partial class EditSolutionsWindow : DefaultWindow
     {
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
         [Dependency] private readonly IEntityManager _entityManager = default!;

diff --git a/Content.Client/Administration/UI/PermissionsEui.cs b/Content.Client/Administration/UI/PermissionsEui.cs
@@ -26,7 +26,7 @@ public sealed class PermissionsEui : BaseEui
         [Dependency] private readonly IClientAdminManager _adminManager = default!;
 
         private readonly Menu _menu;
-        private readonly List<SS14Window> _subWindows = new();
+        private readonly List<DefaultWindow> _subWindows = new();
 
         private Dictionary<int, PermissionsEuiState.AdminRankData> _ranks =
             new();
@@ -289,7 +289,7 @@ private void OnEditRankPressed(KeyValuePair<int, PermissionsEuiState.AdminRankDa
             OpenRankEditWindow(rank);
         }
 
-        private sealed class Menu : SS14Window
+        private sealed class Menu : DefaultWindow
         {
             private readonly PermissionsEui _ui;
             public readonly GridContainer AdminsList;
@@ -341,7 +341,7 @@ public Menu(PermissionsEui ui)
             protected override Vector2 ContentsMinimumSize => (600, 400);
         }
 
-        private sealed class EditAdminWindow : SS14Window
+        private sealed class EditAdminWindow : DefaultWindow
         {
             public readonly PermissionsEuiState.AdminData? SourceData;
             public readonly LineEdit? NameEdit;
@@ -522,7 +522,7 @@ public void CollectSetFlags(out AdminFlags pos, out AdminFlags neg)
             }
         }
 
-        private sealed class EditAdminRankWindow : SS14Window
+        private sealed class EditAdminRankWindow : DefaultWindow
         {
             public readonly int? SourceId;
             public readonly LineEdit NameEdit;

diff --git a/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml
@@ -1,4 +1,4 @@
-<SS14Window
+<DefaultWindow
     xmlns="https://spacestation14.io">
     <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
         <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="0.45">
@@ -12,4 +12,4 @@
             <Button Name="ConfirmButton" HorizontalExpand="True" />
         </BoxContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs
@@ -12,7 +12,7 @@
 namespace Content.Client.Administration.UI.SetOutfit
 {
     [GenerateTypedNameReferences]
-    public partial class SetOutfitMenu : SS14Window
+    public partial class SetOutfitMenu : DefaultWindow
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;

diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/AdminShuttleWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/AdminShuttleWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
             xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
             Title="{Loc 'admin-shuttle-title'}"
             MinWidth="300">
@@ -11,4 +11,4 @@
         <cc:CommandButton Command="recallshuttle" Name="_recallShuttleButton" Text="{Loc 'communicationsconsole-menu-recall-shuttle'}" HorizontalAlignment="Center"/>
     </BoxContainer>
 
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/AdminShuttleWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/AdminShuttleWindow.xaml.cs
@@ -11,7 +11,7 @@
 namespace Content.Client.Administration.UI.Tabs.AdminTab
 {
     [GenerateTypedNameReferences]
-    public partial class AdminShuttleWindow : SS14Window
+    public partial class AdminShuttleWindow : DefaultWindow
     {
         public AdminShuttleWindow()
         {

diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window
+<DefaultWindow
     xmlns="https://spacestation14.io"
     xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
     Title="{Loc Ban}" MinSize="425 325">
@@ -26,4 +26,4 @@
         <Control MinWidth="50" />
         <Button Name="SubmitButton" Text="{Loc Ban}" />
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs
@@ -13,7 +13,7 @@ namespace Content.Client.Administration.UI.Tabs.AdminTab
 {
     [GenerateTypedNameReferences]
     [UsedImplicitly]
-    public partial class BanWindow : SS14Window
+    public partial class BanWindow : DefaultWindow
     {
         public BanWindow()
         {

diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml
@@ -1,4 +1,4 @@
-<SS14Window
+<DefaultWindow
     xmlns="https://spacestation14.io"
     xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
     Title="{Loc admin-player-actions-window-title}" MinSize="425 272">
@@ -15,4 +15,4 @@
             <Button Name="SubmitRespawnButton" Text="{Loc admin-player-actions-respawn}" Disabled="True"/>
         </BoxContainer>
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml.cs
@@ -12,7 +12,7 @@ namespace Content.Client.Administration.UI.Tabs.AdminTab
 {
     [GenerateTypedNameReferences]
     [UsedImplicitly]
-    public partial class PlayerActionsWindow : SS14Window
+    public partial class PlayerActionsWindow : DefaultWindow
     {
         private PlayerInfo? _selectedPlayer;
 

diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml
@@ -1,9 +1,9 @@
-<SS14Window
+<DefaultWindow
     xmlns="https://spacestation14.io"
     xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
     Title="{Loc Teleport}" MinSize="425 230">
     <BoxContainer Orientation="Vertical">
         <cc:PlayerListControl Name="PlayerList" />
         <Button Name="SubmitButton" Text="{Loc Teleport}" />
     </BoxContainer>
-</SS14Window>
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml.cs
@@ -11,7 +11,7 @@ namespace Content.Client.Administration.UI.Tabs.AdminTab
 {
     [GenerateTypedNameReferences]
     [UsedImplicitly]
-    public partial class TeleportWindow : SS14Window
+    public partial class TeleportWindow : DefaultWindow
     {
         private PlayerInfo? _selectedPlayer;