Merge branch 'map-testing' of https://github.com/PubliclyExecutedPig/…

…Delta-v into map-testing

Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs

@@ -43,6 +43,18 @@ public sealed partial class AtmosAlertsComputerWindow : FancyWindow
 
     private const float SilencingDuration = 2.5f;
 
+    // Colors
+    private Color _wallColor = new Color(64, 64, 64);
+    private Color _tileColor = new Color(28, 28, 28);
+    private Color _monitorBlipColor = Color.Cyan;
+    private Color _untrackedEntColor = Color.DimGray;
+    private Color _regionBaseColor = new Color(154, 154, 154);
+    private Color _inactiveColor = StyleNano.DisabledFore;
+    private Color _statusTextColor = StyleNano.GoodGreenFore;
+    private Color _goodColor = Color.LimeGreen;
+    private Color _warningColor = new Color(255, 182, 72);
+    private Color _dangerColor = new Color(255, 67, 67);
+
     public AtmosAlertsComputerWindow(AtmosAlertsComputerBoundUserInterface userInterface, EntityUid? owner)
     {
         RobustXamlLoader.Load(this);
@@ -55,8 +67,8 @@ public AtmosAlertsComputerWindow(AtmosAlertsComputerBoundUserInterface userInter
         NavMap.Owner = _owner;
 
         // Set nav map colors
-        NavMap.WallColor = new Color(64, 64, 64);
-        NavMap.TileColor = Color.DimGray * NavMap.WallColor;
+        NavMap.WallColor = _wallColor;
+        NavMap.TileColor = _tileColor;
 
         // Set nav map grid uid
         var stationName = Loc.GetString("atmos-alerts-window-unknown-location");
@@ -214,7 +226,7 @@ public void UpdateUI(EntityCoordinates? consoleCoords, AtmosAlertsComputerEntry[
         if (consoleCoords != null && consoleUid != null)
         {
             var texture = _spriteSystem.Frame0(new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")));
-            var blip = new NavMapBlip(consoleCoords.Value, texture, Color.Cyan, true, false);
+            var blip = new NavMapBlip(consoleCoords.Value, texture, _monitorBlipColor, true, false);
             NavMap.TrackedEntities[consoleUid.Value] = blip;
         }
 
@@ -263,7 +275,7 @@ public void UpdateUI(EntityCoordinates? consoleCoords, AtmosAlertsComputerEntry[
                 VerticalAlignment = VAlignment.Center,
             };
 
-            label.SetMarkup(Loc.GetString("atmos-alerts-window-no-active-alerts", ("color", StyleNano.GoodGreenFore.ToHexNoAlpha())));
+            label.SetMarkup(Loc.GetString("atmos-alerts-window-no-active-alerts", ("color", _statusTextColor.ToHexNoAlpha())));
 
             AlertsTable.AddChild(label);
         }
@@ -292,7 +304,7 @@ public void UpdateUI(EntityCoordinates? consoleCoords, AtmosAlertsComputerEntry[
                 if (!TryGetSensorRegionColor(regionOwner, alarmState, out var regionColor))
                     continue;
 
-                regionOverlay.Color = regionColor.Value;
+                regionOverlay.Color = regionColor;
 
                 var priority = (_trackedEntity == regionOwner) ? 999 : (int)alarmState;
                 prioritizedRegionOverlays.Add(regionOverlay, priority);
@@ -323,31 +335,28 @@ private void AddTrackedEntityToNavMap(AtmosAlertsDeviceNavMapData metaData, Atmo
         var coords = _entManager.GetCoordinates(metaData.NetCoordinates);
 
         if (_trackedEntity != null && _trackedEntity != metaData.NetEntity)
-            color *= Color.DimGray;
+            color *= _untrackedEntColor;
 
         var selectable = true;
         var blip = new NavMapBlip(coords, _spriteSystem.Frame0(texture), color, _trackedEntity == metaData.NetEntity, selectable);
 
         NavMap.TrackedEntities[metaData.NetEntity] = blip;
     }
 
-    private bool TryGetSensorRegionColor(NetEntity regionOwner, AtmosAlarmType alarmState, [NotNullWhen(true)] out Color? color)
+    private bool TryGetSensorRegionColor(NetEntity regionOwner, AtmosAlarmType alarmState, out Color color)
     {
-        color = null;
+        color = Color.White;
 
         var blip = GetBlipTexture(alarmState);
 
         if (blip == null)
             return false;
 
-        // DeltaV: fix client until upstream does
         // Color the region based on alarm state and entity tracking
-        var output = blip.Value.Item2 * new Color(154, 154, 154);
+        color = blip.Value.Item2 * _regionBaseColor;
 
         if (_trackedEntity != null && _trackedEntity != regionOwner)
-            output *= Color.DimGray;
-
-        color = output;
+            color *= _untrackedEntColor;
 
         return true;
     }
@@ -588,13 +597,13 @@ private AtmosAlarmType GetAlarmState(NetEntity netEntity)
         switch (alarmState)
         {
             case AtmosAlarmType.Invalid:
-                output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")), StyleNano.DisabledFore); break;
+                output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")), _inactiveColor); break;
             case AtmosAlarmType.Normal:
-                output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")), Color.LimeGreen); break;
+                output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")), _goodColor); break;
             case AtmosAlarmType.Warning:
-                output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_triangle.png")), new Color(255, 182, 72)); break;
+                output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_triangle.png")), _warningColor); break;
             case AtmosAlarmType.Danger:
-                output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_square.png")), new Color(255, 67, 67)); break;
+                output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_square.png")), _dangerColor); break;
         }
 
         return output;

Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml

@@ -47,8 +47,7 @@
 
             <PanelContainer Name="AlertsDivider" Visible="False" StyleClasses="LowDivider" />
 
-            <BoxContainer Name="AlertsContainer" Visible="False" Margin="0 5" Orientation="Horizontal"
-                          HorizontalExpand="True" HorizontalAlignment="Center">
+            <BoxContainer Name="AlertsContainer" Visible="False" Margin="0 5" Orientation="Vertical" HorizontalAlignment="Center">
 
             </BoxContainer>
 

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

@@ -110,18 +110,29 @@ public void Populate(HealthAnalyzerScannedUserMessage msg)
 
             // Alerts
 
-            AlertsDivider.Visible = msg.Bleeding == true;
-            AlertsContainer.Visible = msg.Bleeding == true;
+            var showAlerts = msg.Unrevivable == true || msg.Bleeding == true;
 
-            if (msg.Bleeding == true)
-            {
+            AlertsDivider.Visible = showAlerts;
+            AlertsContainer.Visible = showAlerts;
+
+            if (showAlerts)
                 AlertsContainer.DisposeAllChildren();
-                AlertsContainer.AddChild(new Label
+
+            if (msg.Unrevivable == true)
+                AlertsContainer.AddChild(new RichTextLabel
+                {
+                    Text = Loc.GetString("health-analyzer-window-entity-unrevivable-text"),
+                    Margin = new Thickness(0, 4),
+                    MaxWidth = 300
+                });
+
+            if (msg.Bleeding == true)
+                AlertsContainer.AddChild(new RichTextLabel
                 {
                     Text = Loc.GetString("health-analyzer-window-entity-bleeding-text"),
-                    FontColorOverride = Color.Red,
+                    Margin = new Thickness(0, 4),
+                    MaxWidth = 300
                 });
-            }
 
             // Damage Groups
 

Content.Client/Mapping/MappingScreen.xaml

@@ -8,7 +8,7 @@
     VerticalExpand="False"
     VerticalAlignment="Bottom"
     HorizontalAlignment="Center">
-    <controls:RecordedSplitContainer Name="ScreenContainer" HorizontalExpand="True"
+    <SplitContainer Name="ScreenContainer" HorizontalExpand="True"
                                      VerticalExpand="True" SplitWidth="0"
                                      StretchDirection="TopLeft">
         <BoxContainer Orientation="Vertical" VerticalExpand="True" Name="SpawnContainer" MinWidth="200" SetWidth="600">
@@ -82,5 +82,5 @@
                 </BoxContainer>
             </PanelContainer>
         </LayoutContainer>
-    </controls:RecordedSplitContainer>
+    </SplitContainer>
 </mapping:MappingScreen>

Content.Client/Mapping/MappingScreen.xaml.cs

@@ -197,7 +197,6 @@ private void RefreshList()
 
     public override void SetChatSize(Vector2 size)
     {
-        ScreenContainer.DesiredSplitCenter = size.X;
         ScreenContainer.ResizeMode = SplitContainer.SplitResizeMode.RespectChildrenMinSize;
     }
 

Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml

@@ -14,7 +14,7 @@
     VerticalExpand="False"
     VerticalAlignment="Bottom"
     HorizontalAlignment="Center">
-    <controls:RecordedSplitContainer Name="ScreenContainer" HorizontalExpand="True" VerticalExpand="True" SplitWidth="0" StretchDirection="TopLeft">
+    <SplitContainer Name="ScreenContainer" HorizontalExpand="True" VerticalExpand="True" SplitWidth="0" StretchDirection="TopLeft">
         <LayoutContainer Name="ViewportContainer" HorizontalExpand="True" VerticalExpand="True">
             <controls:MainViewport Name="MainViewport"/>
             <widgets:GhostGui Name="Ghost" Access="Protected" />
@@ -26,7 +26,7 @@
             </BoxContainer>
             <alerts:AlertsUI Name="Alerts" Access="Protected" />
         </LayoutContainer>
-        <PanelContainer HorizontalExpand="True" MinWidth="300">
+        <PanelContainer Name="SeparatedChatPanel" MinWidth="300">
             <PanelContainer.PanelOverride>
                 <graphics:StyleBoxFlat BackgroundColor="#2B2C3B" />
             </PanelContainer.PanelOverride>
@@ -36,5 +36,5 @@
                 <chat:ChatBox VerticalExpand="True" HorizontalExpand="True" Name="Chat" Access="Protected" MinSize="0 0"/>
             </BoxContainer>
         </PanelContainer>
-    </controls:RecordedSplitContainer>
+    </SplitContainer>
 </screens:SeparatedChatGameScreen>

Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs

@@ -40,7 +40,6 @@ private void ResizeActionContainer()
 
     public override void SetChatSize(Vector2 size)
     {
-        ScreenContainer.DesiredSplitCenter = size.X;
         ScreenContainer.ResizeMode = SplitContainer.SplitResizeMode.RespectChildrenMinSize;
     }
 }

Content.Client/Voting/UI/VoteCallMenu.xaml.cs

@@ -1,5 +1,6 @@
 using System.Linq;
 using System.Numerics;
+using Content.Client.Gameplay;
 using Content.Client.Stylesheets;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
@@ -8,6 +9,7 @@
 using JetBrains.Annotations;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
+using Robust.Client.State;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
@@ -28,6 +30,7 @@ public sealed partial class VoteCallMenu : BaseWindow
         [Dependency] private readonly IEntityManager _entityManager = default!;
         [Dependency] private readonly IEntityNetworkManager _entNetManager = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
+        [Dependency] private readonly IStateManager _state = default!;
 
         private VotingSystem _votingSystem;
 
@@ -62,14 +65,15 @@ public VoteCallMenu()
 
             Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSpace;
             CloseButton.OnPressed += _ => Close();
-            VoteNotTrustedLabel.Text = Loc.GetString("ui-vote-trusted-users-notice", ("timeReq", _cfg.GetCVar(CCVars.VotekickEligibleVoterDeathtime) / 60));
+            VoteNotTrustedLabel.Text = Loc.GetString("ui-vote-trusted-users-notice", ("timeReq", _cfg.GetCVar(CCVars.VotekickEligibleVoterDeathtime)));
 
             foreach (StandardVoteType voteType in Enum.GetValues<StandardVoteType>())
             {
                 var option = AvailableVoteOptions[voteType];
                 VoteTypeButton.AddItem(Loc.GetString(option.Name), (int)voteType);
             }
 
+            _state.OnStateChanged += OnStateChanged;
             VoteTypeButton.OnItemSelected += VoteTypeSelected;
             CreateButton.OnPressed += CreatePressed;
             FollowButton.OnPressed += FollowSelected;
@@ -101,6 +105,14 @@ protected override void FrameUpdate(FrameEventArgs args)
             UpdateVoteTimeout();
         }
 
+        private void OnStateChanged(StateChangedEventArgs obj)
+        {
+            if (obj.NewState is not GameplayState)
+                return;
+
+            Close();
+        }
+
         private void CanCallVoteChanged(bool obj)
         {
             if (!obj)

Content.Client/Voting/VotingSystem.cs

@@ -19,11 +19,6 @@ public override void Initialize()
 
     private void OnVotePlayerListResponseEvent(VotePlayerListResponseEvent msg)
     {
-        if (!_ghostSystem.IsGhost)
-        {
-            return;
-        }
-
         VotePlayerListResponse?.Invoke(msg);
     }
 

Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs

@@ -168,7 +168,7 @@ await server.WaitAssertion(() =>
         await pair.CleanReturnAsync();
     }
 
-        /// <summary>
+    /// <summary>
     /// Run the suicide command in the console
     /// Should only ghost the player but not kill them
     /// </summary>
@@ -241,6 +241,7 @@ public async Task TestSuicideByHeldItem()
         var mindSystem = entManager.System<SharedMindSystem>();
         var mobStateSystem = entManager.System<MobStateSystem>();
         var transformSystem = entManager.System<TransformSystem>();
+        var damageableSystem = entManager.System<DamageableSystem>();
 
         // We need to know the player and whether they can be hurt, killed, and whether they have a mind
         var player = playerMan.Sessions.First().AttachedEntity!.Value;
@@ -276,6 +277,8 @@ await server.WaitPost(() =>
         // and that all the damage is concentrated in the Slash category
         await server.WaitAssertion(() =>
         {
+            // Heal all damage first (possible low pressure damage taken)
+            damageableSystem.SetAllDamage(player, damageableComp, 0);
             consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide");
             var lethalDamageThreshold = mobThresholdsComp.Thresholds.Keys.Last();
 
@@ -313,6 +316,7 @@ public async Task TestSuicideByHeldItemSpreadDamage()
         var mindSystem = entManager.System<SharedMindSystem>();
         var mobStateSystem = entManager.System<MobStateSystem>();
         var transformSystem = entManager.System<TransformSystem>();
+        var damageableSystem = entManager.System<DamageableSystem>();
 
         // We need to know the player and whether they can be hurt, killed, and whether they have a mind
         var player = playerMan.Sessions.First().AttachedEntity!.Value;
@@ -348,6 +352,8 @@ await server.WaitPost(() =>
         // and that slash damage is split in half
         await server.WaitAssertion(() =>
         {
+            // Heal all damage first (possible low pressure damage taken)
+            damageableSystem.SetAllDamage(player, damageableComp, 0);
             consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide");
             var lethalDamageThreshold = mobThresholdsComp.Thresholds.Keys.Last();
 

Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs

@@ -654,7 +654,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
         {
             Text = "admin-smite-become-mouse-name",
             Category = VerbCategory.Smite,
-            Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Fun/Instruments/h_synthesizer.rsi"), "icon"),
+            Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Fun/Instruments/h_synthesizer.rsi"), "supersynth"),
             Act = () =>
             {
                 _polymorphSystem.PolymorphEntity(args.Target, "AdminInstrumentSmite");