перенос файлов клиента из папки White в _White

Content.Client/Chat/UI/SpeechBubble.cs

@@ -1,7 +1,7 @@
 using System.Numerics;
+using Content.Client._White.UserInterface.Controls;
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
-using Content.Client.White.UserInterface.Controls;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;

Content.Client/Entry/EntryPoint.cs

@@ -1,3 +1,9 @@
+using Content.Client._White.JoinQueue;
+using Content.Client._White.Jukebox;
+using Content.Client._White.Reputation;
+using Content.Client._White.Sponsors;
+using Content.Client._White.Stalin;
+using Content.Client._White.TTS;
 using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
@@ -21,13 +27,7 @@ using Content.Client.Singularity;
 using Content.Client.Stylesheets;
 using Content.Client.Viewport;
 using Content.Client.Voting;
-using Content.Client.White.JoinQueue;
-using Content.Client.White.Jukebox;
-using Content.Client.White.Reputation;
-using Content.Client.White.Sponsors;
 using Content.Shared.Ame;
-using Content.Client.White.Stalin;
-using Content.Client.White.TTS;
 using Content.Shared.Gravity;
 using Content.Shared.Localizations;
 using Robust.Client;

Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs

@@ -1,19 +1,12 @@
-using System.Numerics;
-using System.Text;
-using System.Linq;
+using Content.Client._White.Medical.BodyScanner;
 using Content.Client.UserInterface.Controls;
-using Content.Client.White.Medical.BodyScanner;
 using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
 using Content.Shared.IdentityManagement;
 using Content.Shared.MedicalScanner;
 using Content.Shared.Mobs.Components;
 using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Prototypes;
 
 namespace Content.Client.HealthAnalyzer.UI
 {

Content.Client/Humanoid/MarkingPicker.xaml.cs

@@ -1,5 +1,5 @@
 using System.Linq;
-using Content.Client.White.Sponsors;
+using Content.Client._White.Sponsors;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;

Content.Client/Humanoid/SingleMarkingPicker.xaml.cs

@@ -1,5 +1,5 @@
 using System.Linq;
-using Content.Client.White.Sponsors;
+using Content.Client._White.Sponsors;
 using Content.Shared.Humanoid.Markings;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;

Content.Client/Info/LinkBanner.cs

@@ -1,15 +1,12 @@
-using Content.Client.Changelog;
-using Content.Client.UserInterface.Controls;
+using Content.Client._White.Stalin;
+using Content.Client.Changelog;
 using Content.Client.UserInterface.Systems.EscapeMenu;
 using Content.Client.UserInterface.Systems.Guidebook;
-using Content.Client.White.Stalin;
-using Content.Client.White.Stalin.StalinUi;
 using Content.Shared.CCVar;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Collections;
 using Robust.Shared.Configuration;
-using Robust.Shared.Utility;
 
 namespace Content.Client.Info
 {

Content.Client/Info/RulesAndInfoWindow.cs

@@ -1,8 +1,6 @@
 using System.Numerics;
+using Content.Client._White.Rules;
 using Content.Client.UserInterface.Systems.EscapeMenu;
-using Content.Client.White.Rules;
-using Content.Shared.White;
-using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;

Content.Client/Info/RulesManager.cs

@@ -1,6 +1,6 @@
+using Content.Client._White.Rules;
 using Content.Client.Lobby;
 using Content.Client.Gameplay;
-using Content.Client.White.Rules;
 using Content.Shared.CCVar;
 using Content.Shared.Info;
 using Robust.Client.Console;

Content.Client/IoC/ClientContentIoC.cs

@@ -1,3 +1,10 @@
+using Content.Client._White.JoinQueue;
+using Content.Client._White.Jukebox;
+using Content.Client._White.Reputation;
+using Content.Client._White.Sponsors;
+using Content.Client._White.Stalin;
+using Content.Client._White.Trail.Line.Manager;
+using Content.Client._White.TTS;
 using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
@@ -17,13 +24,6 @@ using Content.Client.Voting;
 using Content.Shared.Administration.Logs;
 using Content.Client.Guidebook;
 using Content.Client.Replay;
-using Content.Client.White.JoinQueue;
-using Content.Client.White.Jukebox;
-using Content.Client.White.Reputation;
-using Content.Client.White.Sponsors;
-using Content.Client.White.Stalin;
-using Content.Client.White.Trail.Line.Manager;
-using Content.Client.White.TTS;
 using Content.Shared.Administration.Managers;
 
 namespace Content.Client.IoC

Content.Client/Overlays/ShowSecurityIconsSystem.cs

@@ -1,4 +1,4 @@
-using Content.Client.White.EntityCrimeRecords;
+using Content.Client._White.EntityCrimeRecords;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Inventory;

Content.Client/Preferences/ClientPreferencesManager.cs

@@ -1,6 +1,6 @@
 using System.Linq;
+using Content.Client._White.Sponsors;
 using Content.Client.Administration.Managers;
-using Content.Client.White.Sponsors;
 using Content.Shared.Administration;
 using Content.Shared.Preferences;
 using Robust.Client;

Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs

@@ -1,5 +1,6 @@
 using System.Linq;
 using System.Numerics;
+using Content.Client._White.Sponsors;
 using Content.Client.Administration.Managers;
 using Content.Client.Humanoid;
 using Content.Client.Lobby.UI;
@@ -7,7 +8,6 @@ using Content.Client.Message;
 using Content.Client.Players.PlayTimeTracking;
 using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Controls;
-using Content.Client.White.Sponsors;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;

Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs

@@ -1,3 +1,4 @@
+using Content.Client._White.MeatyOre;
 using Content.Client.UserInterface.Systems.Actions;
 using Content.Client.UserInterface.Systems.Admin;
 using Content.Client.UserInterface.Systems.Bwoink;
@@ -9,7 +10,6 @@ using Content.Client.UserInterface.Systems.Gameplay;
 using Content.Client.UserInterface.Systems.Guidebook;
 using Content.Client.UserInterface.Systems.MenuBar.Widgets;
 using Content.Client.UserInterface.Systems.Sandbox;
-using Content.Client.White.MeatyOre;
 using Robust.Client.UserInterface.Controllers;
 
 namespace Content.Client.UserInterface.Systems.MenuBar;

Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs

@@ -1,8 +1,6 @@
-using Content.Client.VendingMachines.UI;
 using Content.Shared.VendingMachines;
-using Robust.Client.UserInterface.Controls;
 using System.Linq;
-using Content.Client.White.Economy.Ui;
+using Content.Client._White.Economy.Ui;
 
 namespace Content.Client.VendingMachines
 {

Content.Client/White/Radials/RadialUIController.cs

@@ -1,128 +0,0 @@
-using System.Linq;
-using Content.Client._White.UserInterface.Radial;
-using Content.Client.CombatMode;
-using Content.Client.ContextMenu.UI;
-using Content.Client.Gameplay;
-using Content.Client.Resources;
-using Content.Client.Verbs;
-using Content.Client.Verbs.UI;
-using Content.Client.White.UserInterface.Controls;
-using Content.Shared.Input;
-using Content.Shared.Verbs;
-using Content.Shared.White.Radials;
-using Robust.Client.Player;
-using Robust.Client.ResourceManagement;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controllers;
-using Robust.Client.Utility;
-using Robust.Shared.Input;
-
-namespace Content.Client.White.Radials;
-
-public sealed class RadialUIController : UIController, IOnStateEntered<GameplayState>, IOnStateExited<GameplayState>
-    {
-        [Dependency] private readonly IPlayerManager _playerManager = default!;
-        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
-        [Dependency] private readonly IEntityManager _entityManager = default!;
-        //[Dependency] private readonly ContextMenuUIController _context = default!;
-
-        [UISystemDependency] private readonly CombatModeSystem _combatMode = default!;
-        [UISystemDependency] private readonly RadialSystem _radialSystem = default!;
-
-        public EntityUid CurrentTarget;
-        public SortedSet<Radial> CurrentRadials = new();
-
-        /// <summary>
-        ///     Separate from <see cref="ContextMenuUIController.RootMenu"/>, since we can open a verb menu as a submenu
-        ///     of an entity menu element. If that happens, we need to be aware and close it properly.
-        /// </summary>
-        public RadialContainer? OpenMenu = null;
-
-        public void OnStateEntered(GameplayState state)
-        {
-            //_context.OnContextClosed += Close;
-            _radialSystem.OnRadialsResponse += HandleVerbsResponse;
-        }
-
-        public void OnStateExited(GameplayState state)
-        {
-            //_context.OnContextClosed -= Close;
-            if (_radialSystem != null)
-                _radialSystem.OnRadialsResponse -= HandleVerbsResponse;
-            Close();
-        }
-
-        /// <summary>
-        ///     Open a verb menu and fill it with verbs applicable to the given target entity.
-        /// </summary>
-        /// <param name="target">Entity to get verbs on.</param>
-        /// <param name="force">Used to force showing all verbs (mostly for admins).</param>
-        /// <param name="popup">
-        ///     If this is not null, verbs will be placed into the given popup instead.
-        /// </param>
-        public void OpenRadialMenu(EntityUid target, bool force = false)
-        {
-            if (_playerManager.LocalPlayer?.ControlledEntity is not {Valid: true} user ||
-                _combatMode.IsInCombatMode(user))
-                return;
-
-            Close();
-
-            CurrentTarget = target;
-            CurrentRadials = _radialSystem.GetRadials(target, user, Radial.RadialTypes, force);
-            OpenMenu = new RadialContainer();
-            OpenMenu.NormalSize = 50;
-            OpenMenu.FocusSize = 64;
-
-            //Feat: Disable action text, while im not fixed it
-            OpenMenu.IsAction = false;
-        }
-
-        private void FillRadial()
-        {
-            OpenMenu ??= new RadialContainer();
-
-            OpenMenu.CloseButton.Controller.OnPressed += (_) => Close();
-
-            foreach (var radial in CurrentRadials)
-            {
-                var button = OpenMenu.AddButton(radial.Text, radial.Icon ?? null);
-                button.Controller.OnPressed += (_) => { ExecuteRadial(radial); };
-            }
-
-            OpenMenu.Open(_userInterfaceManager.MousePositionScaled.Position);
-        }
-
-        public void AddServerRadials(List<Radial> radials)
-        {
-            CurrentRadials.UnionWith(radials);
-            FillRadial();
-        }
-
-        private void Close()
-        {
-            if (OpenMenu == null)
-                return;
-
-            OpenMenu.Close();
-            OpenMenu = null;
-        }
-
-        private void HandleVerbsResponse(RadialsResponseEvent msg)
-        {
-            if (OpenMenu == null || CurrentTarget != _entityManager.GetEntity(msg.Entity))
-                return;
-
-            if (msg.Radials == null)
-                return;
-            AddServerRadials(msg.Radials);
-        }
-
-        private void ExecuteRadial(Radial radial)
-        {
-            _radialSystem.ExecuteRadial(CurrentTarget, radial);
-
-            if (radial.CloseMenu ?? radial.CloseMenuDefault)
-                Close(); //_context.Close();
-        }
-    }

Content.Client/_White/Administration/InvisibilitySystem.cs

@@ -1,10 +1,9 @@
-using Content.Shared.Actions;
 using Content.Shared.Popups;
 using Content.Shared.White.Administration;
 using Robust.Client.Console;
 using Robust.Client.GameObjects;
 
-namespace Content.Client.White.Administration;
+namespace Content.Client._White.Administration;
 
 public sealed class InvisibilitySystem : SharedInvisibilitySystem
 {

Content.Client/_White/Animations/EmoteAnimationSystem.cs

@@ -1,12 +1,12 @@
-using Content.Shared.White.Animations;
 using System.Numerics;
+using Content.Shared.White.Animations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Animations;
 using Robust.Shared.GameStates;
 using static Content.Shared.White.Animations.EmoteAnimationComponent;
 
-namespace Content.Client.White.Animations;
+namespace Content.Client._White.Animations;
 
 public sealed class EmoteAnimationSystem : EntitySystem
 {

Content.Client/_White/AuthPanel/AuthPanelBoundUserInterface.cs

@@ -1,7 +1,6 @@
 using Content.Shared.White.AuthPanel;
-using Robust.Client.GameObjects;
 
-namespace Content.Client.White.AuthPanel;
+namespace Content.Client._White.AuthPanel;
 
 public sealed class AuthPanelBoundUserInterface : BoundUserInterface
 {

Content.Client/_White/AuthPanel/AuthPanelMenu.xaml.cs

@@ -2,7 +2,7 @@ using Content.Client.UserInterface.Controls;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 
-namespace Content.Client.White.AuthPanel;
+namespace Content.Client._White.AuthPanel;
 
 [GenerateTypedNameReferences]
 public sealed partial class AuthPanelMenu : FancyWindow

Content.Client/_White/CharacterExamine/CharacterInformationSystem.cs

@@ -11,7 +11,7 @@ using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
-namespace Content.Client.White.CharacterExamine;
+namespace Content.Client._White.CharacterExamine;
 
 
 public sealed class CharacterInformationSystem : EntitySystem

Content.Client/_White/CharacterExamine/CharacterInformationWindow.xaml.cs

@@ -6,7 +6,7 @@ using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.White.CharacterExamine;
+namespace Content.Client._White.CharacterExamine;
 
 [GenerateTypedNameReferences]
 public sealed partial class CharacterInformationWindow : FancyWindow

Content.Client/_White/CheZaHuetaSystem.cs

@@ -1,4 +1,4 @@
-namespace Content.Client.White;
+namespace Content.Client._White;
 
 //Система со смешным названием, чье предназначение заключается лишь в одном - отправке нетворк ивентов.
 public sealed class CheZaHuetaSystem : EntitySystem

Content.Client/_White/CheapSurgery/CheapSurgerySystem.cs

@@ -1,9 +1,8 @@
 using Content.Client._White.UserInterface.Radial;
-using Content.Client.White.UserInterface.Controls;
 using Content.Shared.White.CheapSurgery;
 using Robust.Client.GameObjects;
 
-namespace Content.Client.White.CheapSurgery;
+namespace Content.Client._White.CheapSurgery;
 
 public sealed class CheapSurgerySystem : SharedCheapSurgerySystem
 {

Content.Client/_White/CriminalRecords/UI/Controls/RecordCard.xaml

@@ -1,9 +1,9 @@
-<controls:RecordCard xmlns="https://spacestation14.io"
+<controls1:RecordCard xmlns="https://spacestation14.io"
                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                      xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                      xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
-                     xmlns:controls="clr-namespace:Content.Client.White.CriminalRecords.UI.Controls"
-                     x:Class="Content.Client.White.CriminalRecords.UI.Controls.RecordCard">
+                     xmlns:controls1="clr-namespace:Content.Client._White.CriminalRecords.UI.Controls"
+                     x:Class="Content.Client._White.CriminalRecords.UI.Controls.RecordCard">
 
     <BoxContainer Name="MainContainer" Orientation="Vertical" Margin="10 10 10 10">
         <!-- Header line -->
@@ -71,4 +71,4 @@
             </BoxContainer>
         </PanelContainer>
     </BoxContainer>
-</controls:RecordCard>
+</controls1:RecordCard>

Content.Client/_White/CriminalRecords/UI/Controls/RecordCard.xaml.cs

@@ -7,7 +7,7 @@ using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Input;
 using Robust.Shared.Utility;
 
-namespace Content.Client.White.CriminalRecords.UI.Controls;
+namespace Content.Client._White.CriminalRecords.UI.Controls;
 
 [GenerateTypedNameReferences, Virtual]
 public partial class RecordCard : Control
@@ -28,7 +28,7 @@ public partial class RecordCard : Control
         StatusOption.AddItem(Loc.GetString("criminal-status-wanted"), (int)EnumCriminalRecordType.Wanted);
         StatusOption.AddItem(Loc.GetString("criminal-status-incarcerated"), (int)EnumCriminalRecordType.Incarcerated);
 
-        Input.OnKeyBindDown += args =>
+        OnKeyBindDown += args =>
         {
             if (args.Function == EngineKeyFunctions.TextSubmit)
             {

Content.Client/_White/CriminalRecords/UI/Controls/RecordIconButton.xaml

@@ -1,8 +1,8 @@
 <!-- close.svg.192dpi -->
-<controls:RecordIconButton xmlns="https://spacestation14.io"
+<controls1:RecordIconButton xmlns="https://spacestation14.io"
                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                           xmlns:controls="clr-namespace:Content.Client.White.CriminalRecords.UI.Controls"
-                           x:Class="Content.Client.White.CriminalRecords.UI.Controls.RecordIconButton">
+                           xmlns:controls1="clr-namespace:Content.Client._White.CriminalRecords.UI.Controls"
+                           x:Class="Content.Client._White.CriminalRecords.UI.Controls.RecordIconButton">
 
     <BoxContainer Orientation="Horizontal">
         <Button
@@ -25,4 +25,4 @@
             </BoxContainer>
         </Button>
     </BoxContainer>
-</controls:RecordIconButton>
+</controls1:RecordIconButton>

Content.Client/_White/CriminalRecords/UI/Controls/RecordIconButton.xaml.cs

@@ -1,12 +1,11 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Client.Utility;
 using Robust.Shared.Utility;
 
-namespace Content.Client.White.CriminalRecords.UI.Controls;
+namespace Content.Client._White.CriminalRecords.UI.Controls;
 
 [GenerateTypedNameReferences, Virtual]
 public partial class RecordIconButton : Control

Content.Client/_White/CriminalRecords/UI/Controls/RecordItem.xaml

@@ -1,7 +1,7 @@
-<controls:RecordItem xmlns="https://spacestation14.io"
+<controls1:RecordItem xmlns="https://spacestation14.io"
                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                     xmlns:controls="clr-namespace:Content.Client.White.CriminalRecords.UI.Controls"
-                     x:Class="Content.Client.White.CriminalRecords.UI.Controls.RecordItem">
+                     xmlns:controls1="clr-namespace:Content.Client._White.CriminalRecords.UI.Controls"
+                     x:Class="Content.Client._White.CriminalRecords.UI.Controls.RecordItem">
 
     <BoxContainer MaxHeight="25" Orientation="Horizontal">
         <PanelContainer
@@ -28,4 +28,4 @@
             </BoxContainer>
         </Button>
     </BoxContainer>
-</controls:RecordItem>
+</controls1:RecordItem>

Content.Client/_White/CriminalRecords/UI/Controls/RecordItem.xaml.cs

@@ -2,7 +2,7 @@ using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.White.CriminalRecords.UI.Controls;
+namespace Content.Client._White.CriminalRecords.UI.Controls;
 
 [GenerateTypedNameReferences, Virtual]
 public partial class RecordItem : Control

Content.Client/_White/CriminalRecords/UI/CriminalRecordsBoundUserInterface.cs

@@ -1,11 +1,8 @@
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.StationRecords;
 using Content.Shared.White.CriminalRecords;
-using Robust.Client.GameObjects;
-using Robust.Shared.Input;
-using Robust.Shared.Utility;
 
-namespace Content.Client.White.CriminalRecords.UI;
+namespace Content.Client._White.CriminalRecords.UI;
 
 public sealed class CriminalRecordsBoundUserInterface : BoundUserInterface
 {

Content.Client/_White/CriminalRecords/UI/CriminalRecordsWindow.xaml

@@ -1,8 +1,8 @@
 <DefaultWindow xmlns="https://spacestation14.io"
                xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
-               xmlns:controls="clr-namespace:Content.Client.White.CriminalRecords.UI.Controls"
                xmlns:uicontrols="clr-namespace:Content.Client.UserInterface.Controls"
+               xmlns:controls1="clr-namespace:Content.Client._White.CriminalRecords.UI.Controls"
                Title="{Loc 'criminal-console-name'}"
                MinSize="625 500"
                Resizable="False">
@@ -10,7 +10,7 @@
         <BoxContainer Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Center">
             <RichTextLabel Access="Public" HorizontalAlignment="Center" Name="LoginHint" HorizontalExpand="True" VerticalExpand="True"
                            MaxWidth="400" Margin="10 0 0 0"/>
-            <controls:RecordIconButton
+            <controls1:RecordIconButton
                 Name="LogInButton"
                 Access="Public"
                 HorizontalAlignment="Center"
@@ -18,7 +18,7 @@
                 Label="{Loc 'criminal-login-in'}"
                 ToolTip="{Loc 'criminal-login-in-desc'}"
                 Margin="10 0 10 0">
-            </controls:RecordIconButton>
+            </controls1:RecordIconButton>
         </BoxContainer>
     </BoxContainer>
     <BoxContainer Access="Public" Name="NonServerContent" Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True">
@@ -30,7 +30,7 @@
                                VerticalAlignment="Center"
                                HorizontalAlignment="Left"
                                Margin="10 0 10 0"/>
-                <controls:RecordIconButton
+                <controls1:RecordIconButton
                     Name="NonLogOutButton"
                     Access="Public"
                     HorizontalAlignment="Right"
@@ -38,7 +38,7 @@
                     Label="{Loc 'criminal-login-out'}"
                     ToolTip="{Loc 'criminal-login-out-desc'}"
                     Margin="10 0 10 0">
-                </controls:RecordIconButton>
+                </controls1:RecordIconButton>
             </BoxContainer>
         </uicontrols:StripeBack>
         <TextureRect Access="Public"
@@ -59,7 +59,7 @@
                                VerticalAlignment="Center"
                                HorizontalAlignment="Left"
                                Margin="10 0 10 0"/>
-                <controls:RecordIconButton
+                <controls1:RecordIconButton
                     Name="LogOutButton"
                     Access="Public"
                     HorizontalAlignment="Right"
@@ -67,7 +67,7 @@
                     Label="{Loc 'criminal-login-out'}"
                     ToolTip="{Loc 'criminal-login-out-desc'}"
                     Margin="10 0 10 0">
-                </controls:RecordIconButton>
+                </controls1:RecordIconButton>
             </BoxContainer>
         </uicontrols:StripeBack>
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True" VerticalExpand="True">

Content.Client/_White/CriminalRecords/UI/CriminalRecordsWindow.xaml.cs

@@ -1,33 +1,25 @@
-using System.Linq;
+using Content.Client._White.CriminalRecords.UI.Controls;
 using Content.Client.Humanoid;
 using Content.Client.Inventory;
 using Content.Client.Resources;
-using Content.Client.White.CriminalRecords.UI.Controls;
-using Content.Shared.Access.Systems;
-using Content.Shared.CrewManifest;
 using Content.Shared.GameTicking;
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Preferences;
-using Content.Shared.Radio.Components;
 using Content.Shared.Roles;
 using Content.Shared.StationRecords;
 using Content.Shared.White.CriminalRecords;
 using Robust.Client.AutoGenerated;
-using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Client.Utility;
-using Robust.Shared.Console;
-using Robust.Shared.Input;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
-namespace Content.Client.White.CriminalRecords.UI;
+namespace Content.Client._White.CriminalRecords.UI;
 
 [GenerateTypedNameReferences]
 public sealed partial class CriminalRecordsWindow : DefaultWindow

Content.Client/_White/Crossbow/DrawableVisualizerSystem.cs

@@ -2,7 +2,7 @@ using Content.Shared.Weapons.Ranged.Systems;
 using Content.Shared.White.Crossbow;
 using Robust.Client.GameObjects;
 
-namespace Content.Client.White.Crossbow;
+namespace Content.Client._White.Crossbow;
 
 public sealed class DrawableSystem : VisualizerSystem<DrawableComponent>
 {

Content.Client/_White/Cult/CultHudOverlay.cs

@@ -1,10 +1,8 @@
 using System.Numerics;
-using Content.Shared.Humanoid;
 using Content.Shared.White.Cult;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Client._White.Cult;

Content.Client/_White/Cult/Items/VeilShifter/VeilVisualizerSystem.cs

@@ -24,7 +24,10 @@ public sealed class VeilVisualizerSystem : VisualizerSystem<VeilVisualsComponent
         sprite.LayerSetState(VeilVisualsLayers.Activated, activated ? StateOn : StateOff);
     }
 
-    protected override void OnAppearanceChange(EntityUid uid, VeilVisualsComponent component, ref AppearanceChangeEvent args)
+    protected override void OnAppearanceChange(
+        EntityUid uid,
+        VeilVisualsComponent component,
+        ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null
             || !AppearanceSystem.TryGetData<bool>(uid, VeilVisuals.Activated, out var activated))

Content.Client/_White/Cult/Items/VeilShifter/VeilVisualsComponent.cs

@@ -3,11 +3,9 @@
 [RegisterComponent]
 public sealed partial class VeilVisualsComponent : Component
 {
-    [DataField("stateOn")]
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("stateOn"), ViewVariables(VVAccess.ReadWrite)]
     public string? StateOn = "icon-on";
 
-    [DataField("stateOff")]
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("stateOff"), ViewVariables(VVAccess.ReadWrite)]
     public string? StateOff = "icon";
 }

Content.Client/_White/Cult/Items/VoidTorch/VoidTorchVisualizerSystem.cs

@@ -5,7 +5,10 @@ namespace Content.Client._White.Cult.Items.VoidTorch;
 
 public sealed class VoidTorchVisualizerSystem : VisualizerSystem<VoidTorchVisualsComponent>
 {
-    protected override void OnAppearanceChange(EntityUid uid, VoidTorchVisualsComponent component, ref AppearanceChangeEvent args)
+    protected override void OnAppearanceChange(
+        EntityUid uid,
+        VoidTorchVisualsComponent component,
+        ref AppearanceChangeEvent args)
     {
         base.OnAppearanceChange(uid, component, ref args);
 

Content.Client/_White/Cult/Items/VoidTorch/VoidTorchVisualsComponent.cs

@@ -3,11 +3,9 @@
 [RegisterComponent]
 public sealed partial class VoidTorchVisualsComponent : Component
 {
-    [DataField("stateOn")]
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("stateOn"), ViewVariables(VVAccess.ReadWrite)]
     public string? StateOn = "icon-on";
 
-    [DataField("stateOff")]
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("stateOff"), ViewVariables(VVAccess.ReadWrite)]
     public string? StateOff = "icon";
 }

Content.Client/_White/Cult/Narsie/NarsieLayer.cs

@@ -1,4 +1,4 @@
-namespace Content.Client._White.Cult;
+namespace Content.Client._White.Cult.Narsie;
 
 public enum NarsieLayer
 {

Content.Client/_White/Cult/Narsie/NarsieVisualizer.cs

@@ -3,7 +3,7 @@ using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 
-namespace Content.Client._White.Cult;
+namespace Content.Client._White.Cult.Narsie;
 
 public sealed class NarsieVisualizer : VisualizerSystem<NarsieComponent>
 {

Content.Client/_White/Cult/Pylon/PylonVisualsComponent.cs

@@ -1,6 +1,4 @@
-using Content.Client.Storage.Visualizers;
-
-namespace Content.Client._White.Cult.Pylon;
+namespace Content.Client._White.Cult.Pylon;
 
 [RegisterComponent]
 public sealed partial class PylonVisualsComponent : Component

Content.Client/_White/Cult/ShowCultHudSystem.cs

@@ -1,5 +1,4 @@
 using Content.Shared.White.Cult;
-using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Shared.Player;

Content.Client/_White/Cult/UI/Altar/AltarBUI.cs

@@ -1,8 +1,5 @@
 using Content.Shared.White.Cult.UI;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
 
 namespace Content.Client._White.Cult.UI.Altar;
 

Content.Client/_White/Cult/UI/Altar/AltarWindow.xaml.cs

@@ -1,9 +1,6 @@
-using Content.Client.GameTicking.Managers;
-using Content.Client.TextScreen;
+using Content.Client.TextScreen;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;

Content.Client/_White/Cult/UI/ConstructSelector/ConstructSelectorBui.cs

@@ -9,7 +9,6 @@ namespace Content.Client._White.Cult.UI.ConstructSelector;
 
 public sealed class ConstructSelectorBui : BoundUserInterface
 {
-
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IEntityManager _entityManager = default!;
     private SpriteSystem _spriteSystem = default!;
@@ -29,7 +28,8 @@ public sealed class ConstructSelectorBui : BoundUserInterface
 
         shellSelector.Closed += () =>
         {
-            if(_selected) return;
+            if (_selected)
+                return;
 
             SendMessage(new ConstructFormSelectedEvent(shellComponent.ConstructForms.First()));
         };
@@ -37,7 +37,8 @@ public sealed class ConstructSelectorBui : BoundUserInterface
         foreach (var form in shellComponent.ConstructForms)
         {
             var formPrototype = _prototypeManager.Index<EntityPrototype>(form);
-            var button = shellSelector.AddButton(formPrototype.Name, _spriteSystem.GetPrototypeIcon(formPrototype).Default);
+            var button = shellSelector.AddButton(formPrototype.Name,
+                _spriteSystem.GetPrototypeIcon(formPrototype).Default);
 
             button.Controller.OnPressed += _ =>
             {

Content.Client/_White/Cult/UI/CultistFactory/CultistFactoryBUI.cs

@@ -1,7 +1,6 @@
 using Content.Client._White.UserInterface.Radial;
 using Content.Shared.White.Cult;
 using Content.Shared.White.Cult.UI;
-using Robust.Client.GameObjects;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client._White.Cult.UI.CultistFactory;

Content.Client/_White/Cult/UI/ListViewSelector/ListViewSelectorBUI.cs

@@ -1,5 +1,4 @@
 using Content.Shared.White.Cult.UI;
-using Robust.Client.GameObjects;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client._White.Cult.UI.ListViewSelector;

Content.Client/_White/Cult/UI/ListViewSelector/ListViewSelectorWindow.xaml.cs

@@ -12,6 +12,7 @@ public partial class ListViewSelectorWindow : DefaultWindow
     public Action<string, int>? ItemSelected;
 
     private readonly IPrototypeManager _prototypeManager;
+
     public ListViewSelectorWindow(IPrototypeManager prototypeManager)
     {
         RobustXamlLoader.Load(this);
@@ -29,7 +30,7 @@ public partial class ListViewSelectorWindow : DefaultWindow
 
             if (isPrototypes)
             {
-                if(_prototypeManager.TryIndex<EntityPrototype>(item, out var itemPrototype))
+                if (_prototypeManager.TryIndex<EntityPrototype>(item, out var itemPrototype))
                 {
                     itemName = itemPrototype.Name;
                 }

Content.Client/_White/Cult/UI/NameSelector/NameSelectorBUI.cs

@@ -1,5 +1,4 @@
 using Content.Shared.White.Cult.UI;
-using Robust.Client.GameObjects;
 
 namespace Content.Client._White.Cult.UI.NameSelector;
 

Content.Client/_White/Cult/UI/SpellSelector/SpellSelectorBUI.cs

@@ -2,7 +2,6 @@
 using Content.Shared.Actions;
 using Content.Shared.White.Cult;
 using Content.Shared.White.Cult.Components;
-using Robust.Client.GameObjects;
 using Robust.Client.Utility;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;

Content.Client/_White/Cult/UI/StructureRadial/StructureCraftBoundUserInterface.cs

@@ -3,7 +3,6 @@ using Content.Client.Construction;
 using Content.Shared.Construction.Prototypes;
 using Content.Shared.Popups;
 using Content.Shared.White.Cult.Structures;
-using Robust.Client.GameObjects;
 using Robust.Client.Placement;
 using Robust.Client.Player;
 using Robust.Shared.Enums;

Content.Client/_White/Cult/UI/SummonCultistList/SummonCultistListWindowBUI.cs

@@ -1,5 +1,4 @@
 using Content.Shared.White.Cult.UI;
-using Robust.Client.GameObjects;
 
 namespace Content.Client._White.Cult.UI.SummonCultistList;
 
@@ -16,7 +15,7 @@ public sealed class SummonCultistListWindowBUI : BoundUserInterface
     {
         base.Open();
 
-        _window = new();
+        _window = new SummonCultistListWindow();
         _window.OpenCentered();
         _window.OnClose += Close;
 

Content.Client/_White/Cult/UI/TeleportRunesList/TeleportRunesListWindowBUI.cs

@@ -1,5 +1,4 @@
 using Content.Shared.White.Cult.UI;
-using Robust.Client.GameObjects;
 
 namespace Content.Client._White.Cult.UI.TeleportRunesList;
 
@@ -16,7 +15,7 @@ public sealed class TeleportRunesListWindowBUI : BoundUserInterface
     {
         base.Open();
 
-        _window = new();
+        _window = new TeleportRunesListWindow();
         _window.OpenCentered();
         _window.OnClose += Close;
 

Content.Client/_White/Cult/UI/TeleportSpell/TeleportSpellEui.cs

@@ -1,6 +1,6 @@
 using System.Linq;
-using Content.Client.Eui;
 using Content.Client._White.Cult.UI.TeleportRunesList;
+using Content.Client.Eui;
 using Content.Shared.Eui;
 using Content.Shared.White.Cult.UI;
 

Content.Client/_White/Cult/UI/Torch/TorchWindow.xaml.cs

@@ -2,7 +2,6 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Prototypes;
 
 namespace Content.Client._White.Cult.UI.Torch;
 

Content.Client/_White/Cult/UI/Torch/TorchWindowBUI.cs

@@ -1,6 +1,4 @@
-using System.Data;
-using Content.Shared.White.Cult.Items;
-using Robust.Client.GameObjects;
+using Content.Shared.White.Cult.Items;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client._White.Cult.UI.Torch;

Content.Client/_White/CustomGhostSpriteSystem/CustomGhostVisualizer.cs

@@ -3,7 +3,7 @@ using Content.Shared.Ghost;
 using Content.Shared.White.CustomGhostSystem;
 using Robust.Client.GameObjects;
 
-namespace Content.Client.White.CustomGhostSpriteSystem;
+namespace Content.Client._White.CustomGhostSpriteSystem;
 
 public sealed class CustomGhostVisualizer : VisualizerSystem<GhostComponent>
 {

Content.Client/_White/Economy/ATMVisualLayers.cs

@@ -1,4 +1,4 @@
-namespace Content.Client.White.Economy;
+namespace Content.Client._White.Economy;
 
 public enum ATMVisualLayers : byte
 {

Content.Client/_White/Economy/Ui/ATMBui.cs

@@ -1,7 +1,6 @@
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
 
-namespace Content.Client.White.Economy.Ui;
+namespace Content.Client._White.Economy.Ui;
 
 
 [UsedImplicitly]

Content.Client/_White/Economy/Ui/AtmWindow.xaml.cs

@@ -5,7 +5,7 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Timing;
 
-namespace Content.Client.White.Economy.Ui;
+namespace Content.Client._White.Economy.Ui;
 
 [GenerateTypedNameReferences]
 public sealed partial class AtmWindow : DefaultWindow
@@ -22,7 +22,7 @@ public sealed partial class AtmWindow : DefaultWindow
         WithdrawButton.OnButtonDown += args =>
         {
             if(PinLineEdit.Text.Length != 4) return;
-            OnWithdrawAttempt?.Invoke(new ATMRequestWithdrawMessage(WithdrawSlider.Value, int.Parse(PinLineEdit.Text)));
+            OnWithdrawAttempt?.Invoke(new ATMRequestWithdrawMessage(WithdrawSlider.Value, int.Parse((string) PinLineEdit.Text)));
         };
 
         PinLineEdit.OnTextChanged += _ =>
@@ -61,7 +61,7 @@ public sealed partial class AtmWindow : DefaultWindow
             WithdrawButton.Visible = true;
 
             WithdrawSlider.MaxValue = cast.AccountBalance;
-            WithdrawSlider.Value = Math.Min(WithdrawSlider.Value, cast.AccountBalance);
+            WithdrawSlider.Value = Math.Min((int) WithdrawSlider.Value, cast.AccountBalance);
             return;
         }
 

Content.Client/_White/Economy/Ui/BankUi.cs

@@ -2,10 +2,9 @@ using Content.Client.UserInterface.Fragments;
 using Content.Shared.CartridgeLoader;
 using Content.Shared.White.Economy;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 
-namespace Content.Client.White.Economy.Ui;
+namespace Content.Client._White.Economy.Ui;
 
 [UsedImplicitly]
 public sealed partial class BankUi : UIFragment

Content.Client/_White/Economy/Ui/BankUiFragment.xaml

@@ -1,6 +1,6 @@
-<ui:BankUiFragment xmlns="https://spacestation14.io"
-                   xmlns:ui="clr-namespace:Content.Client.White.Economy.Ui"
-                   xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
+<ui1:BankUiFragment xmlns="https://spacestation14.io"
+                   xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                   xmlns:ui1="clr-namespace:Content.Client._White.Economy.Ui">
 
     <PanelContainer StyleClasses="BackgroundDark"></PanelContainer>
     <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True" Margin="8">
@@ -27,4 +27,4 @@
         </controls:StripeBack>
         <RichTextLabel Name="AccountLinkResultLabel" Visible="False" />
     </BoxContainer>
-</ui:BankUiFragment>
+</ui1:BankUiFragment>

Content.Client/_White/Economy/Ui/BankUiFragment.xaml.cs

@@ -6,7 +6,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Timing;
 
-namespace Content.Client.White.Economy.Ui;
+namespace Content.Client._White.Economy.Ui;
 
 [GenerateTypedNameReferences]
 public sealed partial class BankUiFragment : BoxContainer
@@ -49,8 +49,8 @@ public sealed partial class BankUiFragment : BoxContainer
             if (PinLineEdit.Text.Length != 4 || AccountLineEdit.Text.Length != 6)
                 return;
 
-            var accountId = int.Parse(AccountLineEdit.Text);
-            var pin = int.Parse(PinLineEdit.Text);
+            var accountId = int.Parse((string) AccountLineEdit.Text);
+            var pin = int.Parse((string) PinLineEdit.Text);
             AccountLinkResultLabel.Visible = true;
             _accountLinkActive = false;
             OnLinkAttempt?.Invoke(new BankAccountLinkMessage(accountId, pin));
@@ -61,24 +61,24 @@ public sealed partial class BankUiFragment : BoxContainer
     {
         var accountLinked = state.AccountId != null;
 
-        AccountLinkMessageLabel.SetMarkup(state.AccountLinkMessage);
-        AccountLinkResultLabel.SetMarkup(state.AccountLinkResult);
+        RichTextLabelExt.SetMarkup(AccountLinkMessageLabel, state.AccountLinkMessage);
+        RichTextLabelExt.SetMarkup(AccountLinkResultLabel, state.AccountLinkResult);
 
         LinkedAccount.Visible = accountLinked;
         NoLinkedAccountLabel.Visible = !accountLinked;
 
         if (accountLinked)
         {
-            LinkedAccountNumberLabel.SetMarkup(Loc.GetString("bank-program-ui-account-number-text",
+            RichTextLabelExt.SetMarkup(LinkedAccountNumberLabel, Loc.GetString("bank-program-ui-account-number-text",
                 ("account", state.AccountId!.Value)));
-            LinkedAccountNameLabel.SetMarkup(Loc.GetString("bank-program-ui-account-owner-text",
+            RichTextLabelExt.SetMarkup(LinkedAccountNameLabel, Loc.GetString("bank-program-ui-account-owner-text",
                 ("owner", state.OwnerName)));
-            LinkedAccountBalanceLabel.SetMarkup(Loc.GetString("atm-ui-balance", ("balance", state.Balance)));
+            RichTextLabelExt.SetMarkup(LinkedAccountBalanceLabel, Loc.GetString("atm-ui-balance", ("balance", state.Balance)));
             UpdateAccountLinkUi();
             return;
         }
 
-        NoLinkedAccountLabel.SetMarkup(Loc.GetString("bank-program-ui-no-account"));
+        RichTextLabelExt.SetMarkup(NoLinkedAccountLabel, Loc.GetString("bank-program-ui-no-account"));
         UpdateAccountLinkUi();
     }
 

Content.Client/_White/Economy/Ui/EftposBui.cs

@@ -1,7 +1,6 @@
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
 
-namespace Content.Client.White.Economy.Ui;
+namespace Content.Client._White.Economy.Ui;
 
 [UsedImplicitly]
 public sealed class EftposBui : BoundUserInterface

Content.Client/_White/Economy/Ui/EftposWindow.xaml.cs

@@ -3,7 +3,7 @@ using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.White.Economy.Ui;
+namespace Content.Client._White.Economy.Ui;
 
 [GenerateTypedNameReferences]
 public sealed partial class EftposWindow : DefaultWindow
@@ -17,7 +17,7 @@ public sealed partial class EftposWindow : DefaultWindow
 
         AmountLineEdit.OnTextChanged += _ =>
         {
-            if (!int.TryParse(AmountLineEdit.Text, out var result) || result <= 0)
+            if (!int.TryParse((string?) AmountLineEdit.Text, out var result) || result <= 0)
                 AmountLineEdit.Text = string.Empty;
 
             AmountLineEdit.Text = result.ToString();
@@ -25,7 +25,7 @@ public sealed partial class EftposWindow : DefaultWindow
 
         CardButton.OnPressed += _ =>
         {
-            if (!int.TryParse(AmountLineEdit.Text, out var result) || result < 0)
+            if (!int.TryParse((string?) AmountLineEdit.Text, out var result) || result < 0)
                 result = 0;
 
             OnCardButtonPressed?.Invoke(new EftposLockMessage(result));

Content.Client/_White/Economy/Ui/VendingItem.xaml.cs

@@ -3,7 +3,7 @@ using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.White.Economy.Ui;
+namespace Content.Client._White.Economy.Ui;
 
 [GenerateTypedNameReferences]
 public sealed partial class VendingItem : Control

Content.Client/_White/Economy/Ui/VendingMenu.xaml.cs

@@ -7,7 +7,7 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.White.Economy.Ui;
+namespace Content.Client._White.Economy.Ui;
 
 [GenerateTypedNameReferences]
 public sealed partial class VendingMenu : DefaultWindow

Content.Client/_White/EntityCrimeRecords/EntityCrimeRecordsOverlay.cs

@@ -1,19 +1,16 @@
+using System.Numerics;
+using Content.Shared.Access.Components;
 using Content.Shared.Humanoid;
 using Content.Shared.Inventory;
 using Content.Shared.PDA;
+using Content.Shared.White.CriminalRecords;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-using Content.Shared.Access.Components;
-using Content.Shared.Roles;
-using System.Diagnostics.CodeAnalysis;
-using System.Numerics;
-using Content.Shared.White.CriminalRecords;
 using Robust.Shared.Map;
+using Robust.Shared.Utility;
 
-namespace Content.Client.White.EntityCrimeRecords;
+namespace Content.Client._White.EntityCrimeRecords;
 
 public sealed class EntityCrimeRecordsOverlay : Overlay
 {

Content.Client/_White/EntityCrimeRecords/ShowCrimeRecordsSystem.cs

@@ -1,16 +1,15 @@
-using Content.Shared.White.EntityCrimeRecords;
 using Content.Shared.GameTicking;
 using Content.Shared.Humanoid;
 using Content.Shared.IdentityManagement.Components;
-using Robust.Client.Player;
-using Robust.Client.Graphics;
-using Robust.Client.GameObjects;
-using Robust.Shared.Prototypes;
 using Content.Shared.Inventory;
+using Content.Shared.White.EntityCrimeRecords;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
 using Robust.Shared.Enums;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 
-namespace Content.Client.White.EntityCrimeRecords
+namespace Content.Client._White.EntityCrimeRecords
 {
     public sealed class ShowCrimeRecordsSystem : EntitySystem
     {

Content.Client/_White/EntityHealthBar/EntityHealthBarOverlay.cs

@@ -1,16 +1,16 @@
 using System.Numerics;
 using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
-using Content.Shared.FixedPoint;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
-using Robust.Shared.Utility;
 using Robust.Shared.Timing;
+using Robust.Shared.Utility;
 
-namespace Content.Client.White.EntityHealthBar;
+namespace Content.Client._White.EntityHealthBar;
 
 /// <summary>
 /// Yeah a lot of this is duplicated from doafters.

Content.Client/_White/EntityHealthBar/ShowHealthBarsSystem.cs

@@ -1,11 +1,10 @@
-using Content.Shared.White.EntityHealthBar;
 using Content.Shared.GameTicking;
-using Robust.Client.Player;
+using Content.Shared.White.EntityHealthBar;
 using Robust.Client.Graphics;
+using Robust.Client.Player;
 using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
 
-namespace Content.Client.White.EntityHealthBar
+namespace Content.Client._White.EntityHealthBar
 {
     public sealed class ShowHealthBarsSystem : EntitySystem
     {

Content.Client/_White/EntityJobInfo/EntityJobInfoOverlay.cs

@@ -1,17 +1,17 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Numerics;
+using Content.Shared.Access.Components;
 using Content.Shared.Humanoid;
 using Content.Shared.Inventory;
 using Content.Shared.PDA;
+using Content.Shared.Roles;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
-using Content.Shared.Access.Components;
-using Content.Shared.Roles;
-using System.Diagnostics.CodeAnalysis;
-using System.Numerics;
 
-namespace Content.Client.White.EntityJobInfo;
+namespace Content.Client._White.EntityJobInfo;
 
 public sealed class EntityJobInfoOverlay : Overlay
 {

Content.Client/_White/EntityJobInfo/ShowJobInfoSystem.cs

@@ -1,13 +1,12 @@
-using Content.Shared.White.EntityJobInfo;
 using Content.Shared.GameTicking;
-using Robust.Client.Player;
-using Robust.Client.Graphics;
-using Robust.Client.GameObjects;
-using Robust.Shared.Prototypes;
 using Content.Shared.Inventory;
+using Content.Shared.White.EntityJobInfo;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 
-namespace Content.Client.White.EntityJobInfo;
+namespace Content.Client._White.EntityJobInfo;
 
 public sealed class ShowJobInfoSystem : EntitySystem
 {

Content.Client/_White/GhostRecruitment/GhostRecruitmentEuiAccept.cs

@@ -1,9 +1,8 @@
 using Content.Client.Eui;
-using Content.Shared.Cloning;
 using Content.Shared.White.GhostRecruitment;
 using Robust.Client.Graphics;
 
-namespace Content.Client.White.GhostRecruitment;
+namespace Content.Client._White.GhostRecruitment;
 
 public sealed class GhostRecruitmentEuiAccept : BaseEui
 {

Content.Client/_White/GhostRecruitment/GhostRecruitmentEuiAcceptWindow.cs

@@ -1,10 +1,10 @@
-using Robust.Client.UserInterface.CustomControls;
 using System.Numerics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
 
-namespace Content.Client.White.GhostRecruitment;
+namespace Content.Client._White.GhostRecruitment;
 
 public sealed class GhostRecruitmentEuiAcceptWindow : DefaultWindow
 {

Content.Client/_White/Items/Tricorder/TricorderSystem.cs

@@ -7,7 +7,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameStates;
 using Robust.Shared.Timing;
 
-namespace Content.Client.White.Items.Tricorder;
+namespace Content.Client._White.Items.Tricorder;
 
 /// <inheritdoc/>
 public sealed class TricorderSystem : SharedTricorderSystem
@@ -70,4 +70,4 @@ public sealed class TricorderSystem : SharedTricorderSystem
                 ("mode", Robust.Shared.Localization.Loc.GetString(modeLocString))));
         }
     }
-}
+}

Content.Client/_White/JoinQueue/JoinQueueManager.cs

@@ -2,7 +2,7 @@ using Content.Shared.White.JoinQueue;
 using Robust.Client.State;
 using Robust.Shared.Network;
 
-namespace Content.Client.White.JoinQueue;
+namespace Content.Client._White.JoinQueue;
 
 public sealed class JoinQueueManager
 {

Content.Client/_White/JoinQueue/QueueGui.xaml.cs

@@ -5,8 +5,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Configuration;
 
-
-namespace Content.Client.White.JoinQueue;
+namespace Content.Client._White.JoinQueue;
 
 [GenerateTypedNameReferences]
 public sealed partial class QueueGui : Control

Content.Client/_White/JoinQueue/QueueState.cs

@@ -1,12 +1,11 @@
+using Content.Shared.White.JoinQueue;
+using Robust.Client.Audio;
 using Robust.Client.Console;
-using Robust.Client.GameObjects;
 using Robust.Client.State;
 using Robust.Client.UserInterface;
 using Robust.Shared.Player;
-using Content.Shared.White.JoinQueue;
-using Robust.Client.Audio;
 
-namespace Content.Client.White.JoinQueue;
+namespace Content.Client._White.JoinQueue;
 
 public sealed class QueueState : State
 {

Content.Client/_White/Jukebox/ClientJukeboxSongsSyncManager.cs

@@ -1,6 +1,6 @@
 using Content.Shared.White.Jukebox;
 
-namespace Content.Client.White.Jukebox;
+namespace Content.Client._White.Jukebox;
 
 public sealed class ClientJukeboxSongsSyncManager : JukeboxSongsSyncManager
 {

Content.Client/_White/Jukebox/JukeboxBUI.cs

@@ -1,9 +1,8 @@
 using Content.Shared.Popups;
 using Content.Shared.White.Jukebox;
-using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
 
-namespace Content.Client.White.Jukebox;
+namespace Content.Client._White.Jukebox;
 
 public sealed class JukeboxBUI : BoundUserInterface
 {

Content.Client/_White/Jukebox/JukeboxMenu.xaml.cs

@@ -6,7 +6,7 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Timing;
 
-namespace Content.Client.White.Jukebox;
+namespace Content.Client._White.Jukebox;
 
 [GenerateTypedNameReferences]
 public sealed partial class JukeboxMenu : DefaultWindow

Content.Client/_White/Jukebox/JukeboxSongEntry.xaml.cs

@@ -3,7 +3,7 @@ using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.White.Jukebox;
+namespace Content.Client._White.Jukebox;
 
 [GenerateTypedNameReferences]
 public sealed partial class JukeboxSongEntry : Control

Content.Client/_White/Jukebox/JukeboxSystem.cs

@@ -13,7 +13,7 @@ using Robust.Shared.Physics;
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Utility;
 
-namespace Content.Client.White.Jukebox;
+namespace Content.Client._White.Jukebox;
 
 public sealed class JukeboxSystem : EntitySystem
 {

Content.Client/_White/Jukebox/TapeCreatorBUI.cs

@@ -1,8 +1,7 @@
 using Content.Shared.Popups;
 using Content.Shared.White.Jukebox;
-using Robust.Client.GameObjects;
 
-namespace Content.Client.White.Jukebox;
+namespace Content.Client._White.Jukebox;
 
 public sealed class TapeCreatorBUI : BoundUserInterface
 {

Content.Client/_White/Jukebox/TapeCreatorMenu.xaml.cs

@@ -1,20 +1,17 @@
 using System.Text.RegularExpressions;
-using Content.Shared.CCVar;
 using Content.Shared.Popups;
 using Content.Shared.White;
 using Content.Shared.White.Jukebox;
-using JetBrains.Annotations;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Configuration;
-using Robust.Shared.Network;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
-namespace Content.Client.White.Jukebox;
+namespace Content.Client._White.Jukebox;
 
 [GenerateTypedNameReferences]
 public sealed partial class TapeCreatorMenu : DefaultWindow

Content.Client/_White/Jukebox/TapeCreatorSystem.cs

@@ -1,8 +1,8 @@
- using Content.Shared.White.Jukebox;
- using Robust.Client.GameObjects;
- using Robust.Shared.GameStates;
+using Content.Shared.White.Jukebox;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameStates;
 
- namespace Content.Client.White.Jukebox;
+namespace Content.Client._White.Jukebox;
 
 public sealed class TapeCreatorSystem : EntitySystem
 {

Content.Client/_White/MeatyOre/MeatyOreUIController.cs

@@ -1,8 +1,7 @@
-using Content.Client.Administration.Managers;
+using Content.Client._White.Sponsors;
+using Content.Client.Administration.Managers;
 using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Systems.MenuBar.Widgets;
-using Content.Client.White.Sponsors;
-using Content.Shared.Administration;
 using Content.Shared.Humanoid;
 using Content.Shared.White.MeatyOre;
 using Robust.Client.Player;
@@ -10,7 +9,7 @@ using Robust.Client.UserInterface.Controllers;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;
 
-namespace Content.Client.White.MeatyOre;
+namespace Content.Client._White.MeatyOre;
 
 public sealed class MeatyOreUIController : UIController
 {

Content.Client/_White/Medical/BodyScanner/BodyScannerConsoleBoundUserInterface.cs

@@ -1,8 +1,7 @@
-using JetBrains.Annotations;
-using Robust.Client.GameObjects;
 using Content.Shared.White.Medical.BodyScanner;
+using JetBrains.Annotations;
 
-namespace Content.Client.White.Medical.BodyScanner
+namespace Content.Client._White.Medical.BodyScanner
 {
     [UsedImplicitly]
     public sealed class BodyScannerConsoleBoundUserInterface : BoundUserInterface