Revert "Upstream sync"

.editorconfig

@@ -344,9 +344,6 @@ resharper_keep_existing_attribute_arrangement = true
 resharper_wrap_chained_binary_patterns = chop_if_long
 resharper_wrap_chained_method_calls = chop_if_long
 resharper_csharp_trailing_comma_in_multiline_lists = true
-resharper_csharp_qualified_using_at_nested_scope = false
-resharper_csharp_prefer_qualified_reference = false
-resharper_csharp_allow_alias = false
 
 [*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props}]
 indent_size = 2

.github/CODEOWNERS

@@ -9,3 +9,5 @@
 # Head Spriter
 *.png @CatBackGround
 
+# Head Wiki
+*.xml @Danone453

Content.Benchmarks/MapLoadBenchmark.cs

@@ -46,7 +46,7 @@ public async Task Cleanup()
         PoolManager.Shutdown();
     }
 
-    public static readonly string[] MapsSource = { "Empty", "Satlern", "Box", "Bagel", "Dev", "CentComm", "Core", "TestTeg", "Packed", "Omega", "Reach", "Meta", "Marathon", "MeteorArena", "Fland", "Oasis", "Cog", "Convex"};
+    public static readonly string[] MapsSource = { "Empty", "Satlern", "Box", "Bagel", "Dev", "CentComm", "Core", "TestTeg", "Packed", "Omega", "Reach", "Meta", "Marathon", "MeteorArena", "Fland", "Oasis", "Cog" };
 
     [ParamsSource(nameof(MapsSource))]
     public string Map;

Content.Client/Cargo/BUI/CargoBountyConsoleBoundUserInterface.cs

@@ -39,6 +39,6 @@ protected override void UpdateState(BoundUserInterfaceState message)
         if (message is not CargoBountyConsoleState state)
             return;
 
-        _menu?.UpdateEntries(state.Bounties, state.History, state.UntilNextSkip);
+        _menu?.UpdateEntries(state.Bounties, state.UntilNextSkip);
     }
 }

Content.Client/Cargo/UI/CargoBountyMenu.xaml

@@ -11,28 +11,15 @@
             <PanelContainer.PanelOverride>
                 <gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
             </PanelContainer.PanelOverride>
-            <TabContainer Name="MasterTabContainer" VerticalExpand="True" HorizontalExpand="True">
-                <ScrollContainer HScrollEnabled="False"
-                                 HorizontalExpand="True"
-                                 VerticalExpand="True">
-                    <BoxContainer Name="BountyEntriesContainer"
-                                  Orientation="Vertical"
-                                  VerticalExpand="True"
-                                  HorizontalExpand="True" />
-                </ScrollContainer>
-                <ScrollContainer HScrollEnabled="False"
-                                 HorizontalExpand="True"
-                                 VerticalExpand="True">
-                    <Label Name="NoHistoryLabel"
-                           Text="{Loc 'bounty-console-history-empty-label'}"
-                           Visible="False"
-                           Align="Center" />
-                    <BoxContainer Name="BountyHistoryContainer"
-                                  Orientation="Vertical"
-                                  VerticalExpand="True"
-                                  HorizontalExpand="True" />
-                </ScrollContainer>
-            </TabContainer>
+            <ScrollContainer HScrollEnabled="False"
+                             HorizontalExpand="True"
+                             VerticalExpand="True">
+                <BoxContainer Name="BountyEntriesContainer"
+                              Orientation="Vertical"
+                              VerticalExpand="True"
+                              HorizontalExpand="True">
+                </BoxContainer>
+            </ScrollContainer>
         </PanelContainer>
         <!-- Footer -->
         <BoxContainer Orientation="Vertical">

Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs

@@ -15,12 +15,9 @@ public sealed partial class CargoBountyMenu : FancyWindow
     public CargoBountyMenu()
     {
         RobustXamlLoader.Load(this);
-
-        MasterTabContainer.SetTabTitle(0, Loc.GetString("bounty-console-tab-available-label"));
-        MasterTabContainer.SetTabTitle(1, Loc.GetString("bounty-console-tab-history-label"));
     }
 
-    public void UpdateEntries(List<CargoBountyData> bounties, List<CargoBountyHistoryData> history, TimeSpan untilNextSkip)
+    public void UpdateEntries(List<CargoBountyData> bounties, TimeSpan untilNextSkip)
     {
         BountyEntriesContainer.Children.Clear();
         foreach (var b in bounties)
@@ -35,21 +32,5 @@ public void UpdateEntries(List<CargoBountyData> bounties, List<CargoBountyHistor
         {
             MinHeight = 10
         });
-
-        BountyHistoryContainer.Children.Clear();
-        if (history.Count == 0)
-        {
-            NoHistoryLabel.Visible = true;
-        }
-        else
-        {
-            NoHistoryLabel.Visible = false;
-
-            // Show the history in reverse, so last entry is first in the list
-            for (var i = history.Count - 1; i >= 0; i--)
-            {
-                BountyHistoryContainer.AddChild(new BountyHistoryEntry(history[i]));
-            }
-        }
     }
 }

Content.Client/Changelog/ChangelogWindow.xaml.cs

@@ -8,18 +8,15 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared;
-using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 
 namespace Content.Client.Changelog
 {
     [GenerateTypedNameReferences]
     public sealed partial class ChangelogWindow : FancyWindow
     {
-        [Dependency] private readonly ChangelogManager _changelog = default!;
         [Dependency] private readonly IClientAdminManager _adminManager = default!;
-        [Dependency] private readonly IConfigurationManager _cfg = default!;
+        [Dependency] private readonly ChangelogManager _changelog = default!;
 
         public ChangelogWindow()
         {
@@ -70,22 +67,8 @@ private async void PopulateChangelog()
                 Tabs.SetTabTitle(i++, Loc.GetString($"changelog-tab-title-{changelog.Name}"));
             }
 
-            // Try to get the current version from the build.json file
-            var version = _cfg.GetCVar(CVars.BuildVersion);
-            var forkId = _cfg.GetCVar(CVars.BuildForkId);
-
-            var versionText = Loc.GetString("changelog-version-unknown");
-
-            // Make sure these aren't empty, like in a dev env
-            if (!string.IsNullOrEmpty(version) && !string.IsNullOrEmpty(forkId))
-            {
-                versionText = Loc.GetString("changelog-version-tag",
-                    ("fork", forkId),
-                    ("version", version[..7])); // Only show the first 7 characters
-            }
-
-            // if else statements are ugly, shut up
-            VersionLabel.Text = versionText;
+            var version = typeof(ChangelogWindow).Assembly.GetName().Version ?? new Version(1, 0);
+            VersionLabel.Text = Loc.GetString("changelog-version-tag", ("version", version.ToString()));
 
             TabsUpdated();
         }

Content.Client/CriminalRecords/CriminalRecordsConsoleBoundUserInterface.cs

@@ -39,8 +39,6 @@ protected override void Open()
             SendMessage(new CriminalRecordChangeStatus(status, null));
         _window.OnDialogConfirmed += (status, reason) =>
             SendMessage(new CriminalRecordChangeStatus(status, reason));
-        _window.OnStatusFilterPressed += (statusFilter) =>
-            SendMessage(new CriminalRecordSetStatusFilter(statusFilter));
         _window.OnHistoryUpdated += UpdateHistory;
         _window.OnHistoryClosed += () => _historyWindow?.Close();
         _window.OnClose += Close;