Upstream2

Content.Client/Administration/UI/BanPanel/BanPanel.xaml

@@ -22,6 +22,7 @@
                     <LineEdit Name="HwidLine" MinWidth="100" HorizontalExpand="True" PlaceHolder="{Loc ban-panel-hwid}" ToolTip="{Loc ban-panel-ip-hwid-tooltip}" />
                 </BoxContainer>
                 <CheckBox Name="LastConnCheckbox" Margin="2" Text="{Loc ban-panel-last-conn}" Pressed="True" />
+                <CheckBox Name="EraseCheckbox" Margin="2" Text="{Loc ban-panel-erase}" Pressed="False" />
                 <BoxContainer Orientation="Horizontal" Margin="2">
                     <LineEdit Name="TimeLine" MaxWidth="150" MinWidth="70" PlaceHolder="0" />
                     <OptionButton Name="MultiplierOption" />
@@ -30,7 +31,7 @@
                 </BoxContainer>
                 <BoxContainer Orientation="Horizontal" Margin="4">
                     <OptionButton Name="TypeOption" />
-                    <Control MinWidth="30"></Control>
+                    <Control MinWidth="30" />
                     <Label Text="{Loc ban-panel-severity}" />
                     <OptionButton Name="SeverityOption" />
                 </BoxContainer>

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

@@ -1,10 +1,7 @@
-using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Net.Sockets;
-using System.Text.RegularExpressions;
 using Content.Client.Administration.UI.CustomControls;
-using Content.Client.Stylesheets;
 using Content.Shared.Administration;
 using Content.Shared.Database;
 using Content.Shared.Roles;
@@ -23,7 +20,7 @@ namespace Content.Client.Administration.UI.BanPanel;
 [GenerateTypedNameReferences]
 public sealed partial class BanPanel : DefaultWindow
 {
-    public event Action<string?, (IPAddress, int)?, bool, byte[]?, bool, uint, string, NoteSeverity, string[]?>? BanSubmitted;
+    public event Action<string?, (IPAddress, int)?, bool, byte[]?, bool, uint, string, NoteSeverity, string[]?, bool>? BanSubmitted;
     public event Action<string>? PlayerChanged;
     private string? PlayerUsername { get; set; }
     private (IPAddress, int)? IpAddress { get; set; }
@@ -441,7 +438,8 @@ private void SubmitButtonOnOnPressed(BaseButton.ButtonEventArgs obj)
         var useLastIp = IpCheckbox.Pressed && LastConnCheckbox.Pressed && IpAddress is null;
         var useLastHwid = HwidCheckbox.Pressed && LastConnCheckbox.Pressed && Hwid is null;
         var severity = (NoteSeverity) SeverityOption.SelectedId;
-        BanSubmitted?.Invoke(player, IpAddress, useLastIp, Hwid, useLastHwid, (uint) (TimeEntered * Multiplier), reason, severity, roles);
+        var erase = EraseCheckbox.Pressed;
+        BanSubmitted?.Invoke(player, IpAddress, useLastIp, Hwid, useLastHwid, (uint) (TimeEntered * Multiplier), reason, severity, roles, erase);
     }
 
     protected override void FrameUpdate(FrameEventArgs args)

Content.Client/Administration/UI/BanPanel/BanPanelEui.cs

@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Content.Client.Eui;
 using Content.Shared.Administration;
 using Content.Shared.Eui;
@@ -19,8 +14,8 @@ public BanPanelEui()
     {
         BanPanel = new BanPanel();
         BanPanel.OnClose += () => SendMessage(new CloseEuiMessage());
-        BanPanel.BanSubmitted += (player, ip, useLastIp, hwid, useLastHwid, minutes, reason, severity, roles)
-            => SendMessage(new BanPanelEuiStateMsg.CreateBanRequest(player, ip, useLastIp, hwid, useLastHwid, minutes, reason, severity, roles));
+        BanPanel.BanSubmitted += (player, ip, useLastIp, hwid, useLastHwid, minutes, reason, severity, roles, erase)
+            => SendMessage(new BanPanelEuiStateMsg.CreateBanRequest(player, ip, useLastIp, hwid, useLastHwid, minutes, reason, severity, roles, erase));
         BanPanel.PlayerChanged += player => SendMessage(new BanPanelEuiStateMsg.GetPlayerInfoRequest(player));
     }
 

Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs

@@ -19,6 +19,11 @@ public BwoinkWindow()
                 if (sel is not null)
                 {
                     Title = $"{sel.CharacterName} / {sel.Username}";
+
+                    if (sel.OverallPlaytime != null)
+                    {
+                        Title += $" | {Loc.GetString("generic-playtime-title")}: {sel.PlaytimeString}";
+                    }
                 }
             };
 

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

@@ -22,7 +22,7 @@ public sealed partial class PlayerListControl : BoxContainer
         private List<PlayerInfo> _playerList = new();
         private readonly List<PlayerInfo> _sortedPlayerList = new();
 
-        public event Action<PlayerInfo?>? OnSelectionChanged;
+        public event Action<PlayerInfo>? OnSelectionChanged;
         public IReadOnlyList<PlayerInfo> PlayerInfo => _playerList;
 
         public Func<PlayerInfo, string, string>? OverrideText;
@@ -46,9 +46,9 @@ public PlayerListControl()
             BackgroundPanel.PanelOverride = new StyleBoxFlat {BackgroundColor = new Color(32, 32, 40)};
         }
 
-        private void PlayerListItemPressed(BaseButton.ButtonEventArgs args, ListData data)
+        private void PlayerListItemPressed(BaseButton.ButtonEventArgs? args, ListData? data)
         {
-            if (data is not PlayerListData {Info: var selectedPlayer})
+            if (args == null || data is not PlayerListData {Info: var selectedPlayer})
                 return;
             if (args.Event.Function == EngineKeyFunctions.UIClick)
             {

Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs

@@ -1,10 +1,12 @@
+using System.Linq;
+using System.Numerics;
 using JetBrains.Annotations;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.Enums;
 using Robust.Shared.Map;
-using System.Linq;
-using System.Numerics;
+using Robust.Shared.Map.Components;
 
 namespace Content.Client.Administration.UI.SpawnExplosion;
 
@@ -13,7 +15,6 @@ public sealed class ExplosionDebugOverlay : Overlay
 {
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IEyeManager _eyeManager = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
 
     public Dictionary<int, List<Vector2i>>? SpaceTiles;
     public Dictionary<EntityUid, Dictionary<int, List<Vector2i>>> Tiles = new();
@@ -61,14 +62,15 @@ private void DrawScreen(OverlayDrawArgs args)
         var handle = args.ScreenHandle;
         Box2 gridBounds;
         var xformQuery = _entityManager.GetEntityQuery<TransformComponent>();
+        var xformSystem = _entityManager.System<TransformSystem>();
 
         foreach (var (gridId, tileSets) in Tiles)
         {
-            if (!_mapManager.TryGetGrid(gridId, out var grid))
+            if (!_entityManager.TryGetComponent(gridId, out MapGridComponent? grid))
                 continue;
 
-            var gridXform = xformQuery.GetComponent(grid.Owner);
-            var (_, _, matrix, invMatrix) = gridXform.GetWorldPositionRotationMatrixWithInv(xformQuery);
+            var gridXform = xformQuery.GetComponent(gridId);
+            var (_, _, matrix, invMatrix) = xformSystem.GetWorldPositionRotationMatrixWithInv(gridXform, xformQuery);
             gridBounds = invMatrix.TransformBox(args.WorldBounds).Enlarged(grid.TileSize * 2);
             DrawText(handle, gridBounds, matrix, tileSets, grid.TileSize);
         }
@@ -114,9 +116,9 @@ private void DrawText(
             }
         }
 
-        if (tileSets.ContainsKey(0))
+        if (tileSets.TryGetValue(0, out var set))
         {
-            var epicenter = tileSets[0].First();
+            var epicenter = set.First();
             var worldCenter = transform.Transform((epicenter + Vector2Helpers.Half) * tileSize);
             var screenCenter = _eyeManager.WorldToScreen(worldCenter) + new Vector2(-24, -24);
             var text = $"{Intensity[0]:F2}\nΣ={TotalIntensity:F1}\nΔ={Slope:F1}";
@@ -129,14 +131,15 @@ private void DrawWorld(in OverlayDrawArgs args)
         var handle = args.WorldHandle;
         Box2 gridBounds;
         var xformQuery = _entityManager.GetEntityQuery<TransformComponent>();
+        var xformSystem = _entityManager.System<TransformSystem>();
 
         foreach (var (gridId, tileSets) in Tiles)
         {
-            if (!_mapManager.TryGetGrid(gridId, out var grid))
+            if (!_entityManager.TryGetComponent(gridId, out MapGridComponent? grid))
                 continue;
 
-            var gridXform = xformQuery.GetComponent(grid.Owner);
-            var (_, _, worldMatrix, invWorldMatrix) = gridXform.GetWorldPositionRotationMatrixWithInv(xformQuery);
+            var gridXform = xformQuery.GetComponent(gridId);
+            var (_, _, worldMatrix, invWorldMatrix) = xformSystem.GetWorldPositionRotationMatrixWithInv(gridXform, xformQuery);
             gridBounds = invWorldMatrix.TransformBox(args.WorldBounds).Enlarged(grid.TileSize * 2);
             handle.SetTransform(worldMatrix);
             DrawTiles(handle, gridBounds, tileSets, SpaceTileSize);

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

@@ -1,14 +1,10 @@
-using System.Collections.Generic;
-using System.Linq;
 using JetBrains.Annotations;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
 using Robust.Client.Player;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Map;
+using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Map.Components;
 
 namespace Content.Client.Administration.UI.Tabs.AtmosTab
@@ -17,16 +13,29 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab
     [UsedImplicitly]
     public sealed partial class AddAtmosWindow : DefaultWindow
     {
-        private IEnumerable<MapGridComponent>? _data;
+        [Dependency] private readonly IPlayerManager _players = default!;
+        [Dependency] private readonly IEntityManager _entities = default!;
+
+        private readonly List<Entity<MapGridComponent>> _data = new();
+
+        public AddAtmosWindow()
+        {
+            RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
+        }
 
         protected override void EnteredTree()
         {
-            _data = IoCManager.Resolve<IMapManager>().GetAllGrids().Where(g => (int) g.Owner != 0);
-            foreach (var grid in _data)
+            _data.Clear();
+
+            var player = _players.LocalPlayer?.ControlledEntity;
+            var playerGrid = _entities.GetComponentOrNull<TransformComponent>(player)?.GridUid;
+            var query = IoCManager.Resolve<IEntityManager>().AllEntityQueryEnumerator<MapGridComponent>();
+
+            while (query.MoveNext(out var uid, out var grid))
             {
-                var player = IoCManager.Resolve<IPlayerManager>().LocalPlayer?.ControlledEntity;
-                var playerGrid = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<TransformComponent>(player)?.GridUid;
-                GridOptions.AddItem($"{grid.Owner} {(playerGrid == grid.Owner ? " (Current)" : "")}");
+                _data.Add((uid, grid));
+                GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
             }
 
             GridOptions.OnItemSelected += eventArgs => GridOptions.SelectId(eventArgs.Id);
@@ -35,12 +44,8 @@ protected override void EnteredTree()
 
         private void SubmitButtonOnOnPressed(BaseButton.ButtonEventArgs obj)
         {
-            if (_data == null)
-                return;
-            var dataList = _data.ToList();
-            var entManager = IoCManager.Resolve<IEntityManager>();
-            var selectedGrid = dataList[GridOptions.SelectedId].Owner;
-            IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand($"addatmos {entManager.GetNetEntity(selectedGrid)}");
+            var selectedGrid = _data[GridOptions.SelectedId].Owner;
+            IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand($"addatmos {_entities.GetNetEntity(selectedGrid)}");
         }
     }
 }

Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs

@@ -1,4 +1,3 @@
-using System.Linq;
 using Content.Client.Station;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
@@ -40,13 +39,34 @@ public ObjectsTab()
 
     private void RefreshObjectList(ObjectsTabSelection selection)
     {
-        var entities = selection switch
+        var entities = new List<EntityUid>();
+        switch (selection)
         {
-            ObjectsTabSelection.Stations => _entityManager.EntitySysManager.GetEntitySystem<StationSystem>().Stations.ToList(),
-            ObjectsTabSelection.Grids => _entityManager.EntityQuery<MapGridComponent>(true).Select(x => x.Owner).ToList(),
-            ObjectsTabSelection.Maps => _entityManager.EntityQuery<MapComponent>(true).Select(x => x.Owner).ToList(),
-            _ => throw new ArgumentOutOfRangeException(nameof(selection), selection, null),
-        };
+            case ObjectsTabSelection.Stations:
+                entities.AddRange(_entityManager.EntitySysManager.GetEntitySystem<StationSystem>().Stations);
+                break;
+            case ObjectsTabSelection.Grids:
+            {
+                var query = _entityManager.AllEntityQueryEnumerator<MapGridComponent>();
+                while (query.MoveNext(out var uid, out _))
+                {
+                    entities.Add(uid);
+                }
+
+                break;
+            }
+            case ObjectsTabSelection.Maps:
+            {
+                var query = _entityManager.AllEntityQueryEnumerator<MapComponent>();
+                while (query.MoveNext(out var uid, out _))
+                {
+                    entities.Add(uid);
+                }
+                break;
+            }
+            default:
+                throw new ArgumentOutOfRangeException(nameof(selection), selection, null);
+        }
 
         foreach (var control in _objects)
         {

Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs

@@ -11,28 +11,47 @@ public sealed partial class PanicBunkerTab : Control
 {
     [Dependency] private readonly IConsoleHost _console = default!;
 
+    private string _minAccountAge;
+    private string _minOverallHours;
+
     public PanicBunkerTab()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
 
         DisableAutomaticallyButton.ToolTip = Loc.GetString("admin-ui-panic-bunker-disable-automatically-tooltip");
 
-        MinAccountAge.OnTextEntered += args =>
+        MinAccountAge.OnTextEntered += args => SendMinAccountAge(args.Text);
+        MinAccountAge.OnFocusExit += args => SendMinAccountAge(args.Text);
+        _minAccountAge = MinAccountAge.Text;
+
+        MinOverallHours.OnTextEntered += args => SendMinOverallHours(args.Text);
+        MinOverallHours.OnFocusExit += args => SendMinOverallHours(args.Text);
+        _minOverallHours = MinOverallHours.Text;
+    }
+
+    private void SendMinAccountAge(string text)
+    {
+        if (string.IsNullOrWhiteSpace(text) ||
+            text == _minAccountAge ||
+            !int.TryParse(text, out var minutes))
         {
-            if (string.IsNullOrWhiteSpace(args.Text) || !int.TryParse(args.Text, out var minutes))
-                return;
+            return;
+        }
 
-            _console.ExecuteCommand($"panicbunker_min_account_age {minutes}");
-        };
+        _console.ExecuteCommand($"panicbunker_min_account_age {minutes}");
+    }
 
-        MinOverallHours.OnTextEntered += args =>
+    private void SendMinOverallHours(string text)
+    {
+        if (string.IsNullOrWhiteSpace(text) ||
+            text == _minOverallHours ||
+            !int.TryParse(text, out var hours))
         {
-            if (string.IsNullOrWhiteSpace(args.Text) || !int.TryParse(args.Text, out var hours))
-                return;
+            return;
+        }
 
-            _console.ExecuteCommand($"panicbunker_min_overall_hours {hours}");
-        };
+        _console.ExecuteCommand($"panicbunker_min_overall_hours {hours}");
     }
 
     public void UpdateStatus(PanicBunkerStatus status)
@@ -48,7 +67,11 @@ public void UpdateStatus(PanicBunkerStatus status)
         EnableAutomaticallyButton.Pressed = status.EnableWithoutAdmins;
         CountDeadminnedButton.Pressed = status.CountDeadminnedAdmins;
         ShowReasonButton.Pressed = status.ShowReason;
+
         MinAccountAge.Text = status.MinAccountAgeHours.ToString();
+        _minAccountAge = MinAccountAge.Text;
+
         MinOverallHours.Text = status.MinOverallHours.ToString();
+        _minOverallHours = MinOverallHours.Text;
     }
 }

Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs

@@ -121,9 +121,11 @@ private void RefreshPlayerList(IReadOnlyList<PlayerInfo> players)
                     player.Antag ? "YES" : "NO",
                     player.Sponsor ? "YES" : "NO",
                     new StyleBoxFlat(useAltColor ? _altColor : _defaultColor),
-                    player.Connected);
+                    player.Connected,
+                    player.PlaytimeString);
                 entry.PlayerEntity = player.NetEntity;
                 entry.OnPressed += args => OnEntryPressed?.Invoke(args);
+                entry.ToolTip = Loc.GetString("player-tab-entry-tooltip");
                 PlayerList.AddChild(entry);
 
                 useAltColor ^= true;
@@ -149,6 +151,7 @@ private int Compare(PlayerInfo x, PlayerInfo y)
                 Header.Character => Compare(x.CharacterName, y.CharacterName),
                 Header.Job => Compare(x.StartingJob, y.StartingJob),
                 Header.Antagonist => x.Antag.CompareTo(y.Antag),
+                Header.Playtime => TimeSpan.Compare(x.OverallPlaytime ?? default, y.OverallPlaytime ?? default),
                 _ => 1
             };
         }

Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml

@@ -29,5 +29,10 @@
                SizeFlagsStretchRatio="2"
                HorizontalExpand="True"
                ClipText="True"/>
+        <customControls:VSeparator/>
+        <Label Name="OverallPlaytimeLabel"
+               SizeFlagsStretchRatio="2"
+               HorizontalExpand="True"
+               ClipText="True"/>
     </BoxContainer>
 </ContainerButton>