Merge branch 'master' into Deep_frier

Signed-off-by: Colin-Tel <[email protected]>
DeltaV-Station · Oct 3, 2023 · 68d0498 · 68d0498
2 parents 1119d39 + 20f8772
commit 68d0498
Show file tree

Hide file tree

Showing 848 changed files with 21,025 additions and 10,818 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -196,7 +196,7 @@ csharp_preserve_single_line_blocks = true
 #dotnet_naming_style.begins_with_i.word_separator =
 #dotnet_naming_style.begins_with_i.capitalization = pascal_case
 
-dotnet_diagnostic.IDE0055.severity = warning
+dotnet_diagnostic.ide0055.severity = warning
 
 dotnet_naming_rule.constants_rule.severity = warning
 dotnet_naming_rule.constants_rule.style = upper_camel_case_style
@@ -336,6 +336,7 @@ dotnet_naming_symbols.type_parameters_symbols.applicable_kinds = type_parameter
 
 # ReSharper properties
 resharper_braces_for_ifelse = required_for_multiline
+resharper_keep_existing_attribute_arrangement = true
 
 [*.{csproj,xml,yml,dll.config,msbuildproj,targets}]
 indent_size = 2
diff --git a/.github/workflows/build-map-renderer.yml b/.github/workflows/build-map-renderer.yml
@@ -13,7 +13,7 @@ jobs:
     if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}
 

diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml
@@ -13,7 +13,7 @@ jobs:
     if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}
 

diff --git a/.github/workflows/build-test-release.yml b/.github/workflows/build-test-release.yml
diff --git a/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs b/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs
@@ -1,7 +1,7 @@
+using Content.Shared.Access;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Containers.ItemSlots;
-using Robust.Client.GameObjects;
 using Robust.Shared.Prototypes;
 using static Content.Shared.Access.Components.AccessOverriderComponent;
 
@@ -23,7 +23,7 @@ protected override void Open()
         {
             base.Open();
 
-            List<string> accessLevels;
+            List<ProtoId<AccessLevelPrototype>> accessLevels;
 
             if (EntMan.TryGetComponent<AccessOverriderComponent>(Owner, out var accessOverrider))
             {
@@ -33,7 +33,7 @@ protected override void Open()
 
             else
             {
-                accessLevels = new List<string>();
+                accessLevels = new List<ProtoId<AccessLevelPrototype>>();
                 _accessOverriderSystem.Log.Error($"No AccessOverrider component found for {EntMan.ToPrettyString(Owner)}!");
             }
 

diff --git a/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs b/Content.Client/Access/UI/AccessOverriderWindow.xaml.cs
@@ -21,7 +21,7 @@ public sealed partial class AccessOverriderWindow : DefaultWindow
         private readonly Dictionary<string, Button> _accessButtons = new();
 
         public AccessOverriderWindow(AccessOverriderBoundUserInterface owner, IPrototypeManager prototypeManager,
-            List<string> accessLevels)
+            List<ProtoId<AccessLevelPrototype>> accessLevels)
         {
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
@@ -31,7 +31,7 @@ public AccessOverriderWindow(AccessOverriderBoundUserInterface owner, IPrototype
 
             foreach (var access in accessLevels)
             {
-                if (!prototypeManager.TryIndex<AccessLevelPrototype>(access, out var accessLevel))
+                if (!prototypeManager.TryIndex(access, out var accessLevel))
                 {
                     _logMill.Error($"Unable to find accesslevel for {access}");
                     continue;

diff --git a/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs b/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs
@@ -1,8 +1,8 @@
+using Content.Shared.Access;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.CrewManifest;
-using Robust.Client.GameObjects;
 using Robust.Shared.Prototypes;
 using static Content.Shared.Access.Components.IdCardConsoleComponent;
 
@@ -23,7 +23,7 @@ public IdCardConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner
         protected override void Open()
         {
             base.Open();
-            List<string> accessLevels;
+            List<ProtoId<AccessLevelPrototype>> accessLevels;
 
             if (EntMan.TryGetComponent<IdCardConsoleComponent>(Owner, out var idCard))
             {
@@ -32,7 +32,7 @@ protected override void Open()
             }
             else
             {
-                accessLevels = new List<string>();
+                accessLevels = new List<ProtoId<AccessLevelPrototype>>();
                 _idCardConsoleSystem.Log.Error($"No IdCardConsole component found for {EntMan.ToPrettyString(Owner)}!");
             }
 

diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
@@ -28,7 +28,7 @@ public sealed partial class IdCardConsoleWindow : DefaultWindow
         private string? _lastJobProto;
 
         public IdCardConsoleWindow(IdCardConsoleBoundUserInterface owner, IPrototypeManager prototypeManager,
-            List<string> accessLevels)
+            List<ProtoId<AccessLevelPrototype>> accessLevels)
         {
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);

diff --git a/Content.Client/Administration/Systems/AdminVerbSystem.cs b/Content.Client/Administration/Systems/AdminVerbSystem.cs
@@ -24,10 +24,9 @@ private void AddAdminVerbs(GetVerbsEvent<Verb> args)
             // View variables verbs
             if (_clientConGroupController.CanViewVar())
             {
-                Verb verb = new()
+                var verb = new VvVerb()
                 {
-                    Category = VerbCategory.Debug,
-                    Text = "View Variables",
+                    Text = Loc.GetString("view-variables"),
                     Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/vv.svg.192dpi.png")),
                     Act = () => _clientConsoleHost.ExecuteCommand($"vv {GetNetEntity(args.Target)}"),
                     ClientExclusive = true // opening VV window is client-side. Don't ask server to run this verb.

diff --git a/Content.Client/Administration/UI/AdminUIHelpers.cs b/Content.Client/Administration/UI/AdminUIHelpers.cs
@@ -0,0 +1,59 @@
+using System.Threading;
+using Content.Client.Stylesheets;
+using Robust.Client.UserInterface.Controls;
+using Timer = Robust.Shared.Timing.Timer;
+
+namespace Content.Client.Administration.UI;
+
+public static class AdminUIHelpers
+{
+    private static void ResetButton(Button button, ConfirmationData data)
+    {
+        data.Cancellation.Cancel();
+        button.ModulateSelfOverride = null;
+        button.Text = data.OriginalText;
+    }
+
+    public static bool RemoveConfirm(Button button, Dictionary<Button, ConfirmationData> confirmations)
+    {
+        if (confirmations.Remove(button, out var data))
+        {
+            ResetButton(button, data);
+            return true;
+        }
+
+        return false;
+    }
+
+    public static void RemoveAllConfirms(Dictionary<Button, ConfirmationData> confirmations)
+    {
+        foreach (var (button, confirmation) in confirmations)
+        {
+            ResetButton(button, confirmation);
+        }
+
+        confirmations.Clear();
+    }
+
+    public static bool TryConfirm(Button button, Dictionary<Button, ConfirmationData> confirmations)
+    {
+        if (RemoveConfirm(button, confirmations))
+            return true;
+
+        var data = new ConfirmationData(new CancellationTokenSource(), button.Text);
+        confirmations[button] = data;
+
+        Timer.Spawn(TimeSpan.FromSeconds(5), () =>
+        {
+            confirmations.Remove(button);
+            button.ModulateSelfOverride = null;
+            button.Text = data.OriginalText;
+        }, data.Cancellation.Token);
+
+        button.ModulateSelfOverride = StyleNano.ButtonColorCautionDefault;
+        button.Text = Loc.GetString("admin-player-actions-confirm");
+        return false;
+    }
+}
+
+public readonly record struct ConfirmationData(CancellationTokenSource Cancellation, string? OriginalText);
diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml
@@ -6,14 +6,15 @@
             <cc:PlayerListControl Access="Public" Name="ChannelSelector" HorizontalExpand="True" SizeFlagsStretchRatio="1" />
             <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="2">
                 <BoxContainer Access="Public" Name="BwoinkArea" VerticalExpand="True" />
-                <BoxContainer Orientation="Horizontal" HorizontalAlignment="Right">
-                    <Button Margin="0 0 10 0" Visible="True" Name="PopOut" Access="Public" Text="{Loc 'admin-logs-pop-out'}"/>
-                    <Button Visible="False" Name="Bans" Text="{Loc 'admin-player-actions-bans'}" />
-                    <Button Visible="False" Name="Notes" Text="{Loc 'admin-player-actions-notes'}" />
-                    <Button Visible="False" Name="Kick" Text="{Loc 'admin-player-actions-kick'}" />
-                    <Button Visible="False" Name="Ban" Text="{Loc 'admin-player-actions-ban'}" />
-                    <Button Visible="False" Name="Respawn" Text="{Loc 'admin-player-actions-respawn'}" />
-                    <Button Visible="False" Name="Teleport" Text="{Loc 'admin-player-actions-teleport'}" />
+                <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+                    <Button Visible="True" Name="PopOut" Access="Public" Text="{Loc 'admin-logs-pop-out'}" StyleClasses="OpenBoth" HorizontalAlignment="Left" />
+                    <Control HorizontalExpand="True" />
+                    <Button Visible="False" Name="Bans" Text="{Loc 'admin-player-actions-bans'}" StyleClasses="OpenRight" />
+                    <Button Visible="False" Name="Notes" Text="{Loc 'admin-player-actions-notes'}" StyleClasses="OpenBoth" />
+                    <Button Visible="False" Name="Kick" Text="{Loc 'admin-player-actions-kick'}" StyleClasses="OpenBoth" />
+                    <Button Visible="False" Name="Ban" Text="{Loc 'admin-player-actions-ban'}" StyleClasses="OpenBoth" />
+                    <Button Visible="False" Name="Respawn" Text="{Loc 'admin-player-actions-respawn'}" StyleClasses="OpenBoth" />
+                    <Button Visible="False" Name="Teleport" Text="{Loc 'admin-player-actions-teleport'}" StyleClasses="OpenLeft" />
                 </BoxContainer>
             </BoxContainer>
         </SplitContainer>