Merge remote-tracking branch 'upstream/master'

Author: ThatGuyUSA

.github/CODEOWNERS

@@ -36,12 +36,4 @@
 /Pow3r/ @PJB3005
 /Content.Server/Power/Pow3r/ @PJB3005
 
-
-# Sloth
-/Content.*/Audio @metalgearsloth
-/Content.*/Movement @metalgearsloth
-/Content.*/NPC @metalgearsloth
-/Content.*/Shuttles @metalgearsloth
-/Content.*/Weapons @metalgearsloth
-
 /Content.Server/Discord/ @Simyon264

Content.Benchmarks/MapLoadBenchmark.cs

@@ -5,7 +5,7 @@
 using BenchmarkDotNet.Attributes;
 using Content.IntegrationTests;
 using Content.IntegrationTests.Pair;
-using Content.Server.Maps;
+using Content.Shared.Maps;
 using Robust.Shared;
 using Robust.Shared.Analyzers;
 using Robust.Shared.EntitySerialization.Systems;

Content.Client/Access/UI/AccessLevelControl.xaml

@@ -1,4 +1,4 @@
 <GridContainer xmlns="https://spacestation14.io"
-               Columns="5"
+               Columns="4"
                HorizontalAlignment="Center">
 </GridContainer>

Content.Client/Administration/Components/KillSignComponent.cs

@@ -0,0 +1,7 @@
+using Content.Shared.Administration.Systems;
+
+namespace Content.Client.Administration.Systems;
+
+public sealed class BufferingSystem : SharedBufferingSystem
+{
+}

Content.Client/Administration/Systems/BufferingSystem.cs

@@ -1,5 +1,5 @@
 using System.Numerics;
-using Content.Client.Administration.Components;
+using Content.Shared.Administration.Components;
 using Robust.Client.GameObjects;
 using Robust.Shared.Utility;
 

Content.Client/Administration/Systems/KillSignSystem.cs

@@ -15,7 +15,7 @@ public AdminLogLabel(ref SharedAdminLog log, HSeparator separator)
         OnVisibilityChanged += VisibilityChanged;
     }
 
-    public SharedAdminLog Log { get; }
+    public new SharedAdminLog Log { get; }
 
     public HSeparator Separator { get; }
 

Content.Client/Administration/UI/CustomControls/AdminLogLabel.cs

@@ -0,0 +1,7 @@
+using Content.Shared.Fluids.Components;
+using Content.Shared.Fluids.EntitySystems;
+using Robust.Shared.Map;
+
+namespace Content.Client.Fluids;
+
+public sealed class SpraySystem : SharedSpraySystem;

Content.Client/Bed/BedSystem.cs

@@ -0,0 +1,5 @@
+using Content.Shared.NameIdentifier;
+
+namespace Content.Client.NameIdentifier;
+
+public sealed class NameIdentifierSystem : SharedNameIdentifierSystem;