Merge branch 'master' into DeltaV-Station_Delta-v_1013_2024-04-10

Content.Client/Administration/UI/AdminRemarks/AdminMessageEui.cs

@@ -2,6 +2,7 @@
 using Content.Shared.Administration.Notes;
 using Content.Shared.Eui;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface.Controls;
 using static Content.Shared.Administration.Notes.AdminMessageEuiMsg;
 
 namespace Content.Client.Administration.UI.AdminRemarks;
@@ -14,9 +15,8 @@ public sealed class AdminMessageEui : BaseEui
     public AdminMessageEui()
     {
         _popup = new AdminMessagePopupWindow();
-        _popup.OnAcceptPressed += () => SendMessage(new Accept());
-        _popup.OnDismissPressed += () => SendMessage(new Dismiss());
-        _popup.OnClose += () => SendMessage(new CloseEuiMessage());
+        _popup.OnAcceptPressed += () => SendMessage(new Dismiss(true));
+        _popup.OnDismissPressed += () => SendMessage(new Dismiss(false));
     }
 
     public override void HandleState(EuiStateBase state)
@@ -26,13 +26,17 @@ public override void HandleState(EuiStateBase state)
             return;
         }
 
-        _popup.SetMessage(s.Message);
-        _popup.SetDetails(s.AdminName, s.AddedOn);
-        _popup.Timer = s.Time;
+        _popup.SetState(s);
     }
 
     public override void Opened()
     {
-        _popup.OpenCentered();
+        _popup.UserInterfaceManager.WindowRoot.AddChild(_popup);
+        LayoutContainer.SetAnchorPreset(_popup, LayoutContainer.LayoutPreset.Wide);
+    }
+
+    public override void Closed()
+    {
+        _popup.Orphan();
     }
 }

Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml

@@ -0,0 +1,6 @@
+<Control xmlns="https://spacestation14.io" Margin="0 0 0 8">
+    <BoxContainer Orientation="Vertical">
+        <RichTextLabel Name="Admin" Margin="0 0 0 4" />
+        <RichTextLabel Name="Message" Margin="2 0 0 0" />
+    </BoxContainer>
+</Control>

Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml.cs

@@ -0,0 +1,23 @@
+using Content.Shared.Administration.Notes;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Administration.UI.AdminRemarks;
+
+[GenerateTypedNameReferences]
+public sealed partial class AdminMessagePopupMessage : Control
+{
+    public AdminMessagePopupMessage(AdminMessageEuiState.Message message)
+    {
+        RobustXamlLoader.Load(this);
+
+        Admin.SetMessage(FormattedMessage.FromMarkup(Loc.GetString(
+            "admin-notes-message-admin",
+            ("admin", message.AdminName),
+            ("date", message.AddedOn.ToLocalTime()))));
+
+        Message.SetMessage(message.Text);
+    }
+}

Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml

@@ -1,22 +1,36 @@
-<ui:FancyWindow xmlns="https://spacestation14.io"
-                xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
-                VerticalExpand="True" HorizontalExpand="True"
-                Title="{Loc admin-notes-message-window-title}"
-                MinSize="600 170">
-    <PanelContainer VerticalExpand="True" HorizontalExpand="True" StyleClasses="BackgroundDark">
-        <ScrollContainer HScrollEnabled="False" VerticalExpand="True" HorizontalExpand="True" Margin="4">
-            <BoxContainer Orientation="Vertical" SeparationOverride="10" VerticalAlignment="Bottom">
-                <Label Name="AdminLabel" Text="Loading..." />
-                <RichTextLabel Name="MessageLabel" />
+<Control xmlns="https://spacestation14.io"
+         xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
+    <PanelContainer MouseFilter="Stop">
+        <PanelContainer.PanelOverride>
+            <!-- semi-transparent background -->
+            <gfx:StyleBoxFlat BackgroundColor="#000000AA" />
+        </PanelContainer.PanelOverride>
+
+        <Control HorizontalAlignment="Center" VerticalAlignment="Center" MaxWidth="600">
+            <PanelContainer StyleClasses="AngleRect" />
+
+            <BoxContainer Orientation="Vertical" Margin="4">
+                <RichTextLabel Name="Description" />
+
+                <!-- Contains actual messages -->
+                <ScrollContainer HScrollEnabled="False" Margin="4" VerticalExpand="True" ReturnMeasure="True" MaxHeight="400">
+                    <BoxContainer Orientation="Vertical" Name="MessageContainer" Margin="0 2 0 0" />
+                </ScrollContainer>
+
                 <Label Name="WaitLabel" />
                 <BoxContainer Orientation="Horizontal">
                     <Button Name="DismissButton"
-                            Text="{Loc 'admin-notes-message-dismiss'}" />
+                            Text="{Loc 'admin-notes-message-dismiss'}"
+                            Disabled="True"
+                            HorizontalExpand="True"
+                            StyleClasses="OpenRight" />
                     <Button Name="AcceptButton"
                             Text="{Loc 'admin-notes-message-accept'}"
-                            Disabled="True" />
+                            Disabled="True"
+                            HorizontalExpand="True"
+                            StyleClasses="OpenLeft" />
                 </BoxContainer>
             </BoxContainer>
-        </ScrollContainer>
+        </Control>
     </PanelContainer>
-</ui:FancyWindow>
+</Control>

Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs

@@ -1,56 +1,65 @@
-using Content.Client.UserInterface.Controls;
+using Content.Client.Stylesheets;
+using Content.Shared.Administration.Notes;
 using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Timing;
+using Robust.Shared.Utility;
 
 namespace Content.Client.Administration.UI.AdminRemarks;
 
 [GenerateTypedNameReferences]
-public sealed partial class AdminMessagePopupWindow : FancyWindow
+public sealed partial class AdminMessagePopupWindow : Control
 {
     private float _timer = float.MaxValue;
-    public float Timer
-    {
-        get => _timer;
-        set
-        {
-            WaitLabel.Text = Loc.GetString("admin-notes-message-wait", ("time", MathF.Floor(value)));
-            _timer = value;
-        }
-    }
 
     public event Action? OnDismissPressed;
+
     public event Action? OnAcceptPressed;
 
     public AdminMessagePopupWindow()
     {
         RobustXamlLoader.Load(this);
 
+        Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSpace;
+
         AcceptButton.OnPressed += OnAcceptButtonPressed;
         DismissButton.OnPressed += OnDismissButtonPressed;
     }
 
-    public void SetMessage(string message)
+    public float Timer
     {
-        MessageLabel.SetMessage(message);
+        get => _timer;
+        private set
+        {
+            WaitLabel.Text = Loc.GetString("admin-notes-message-wait", ("time", MathF.Floor(value)));
+            _timer = value;
+        }
     }
 
-    public void SetDetails(string adminName, DateTime addedOn)
+    public void SetState(AdminMessageEuiState state)
     {
-        AdminLabel.Text = Loc.GetString("admin-notes-message-admin", ("admin", adminName), ("date", addedOn));
+        Timer = (float) state.Time.TotalSeconds;
+
+        MessageContainer.RemoveAllChildren();
+
+        foreach (var message in state.Messages)
+        {
+            MessageContainer.AddChild(new AdminMessagePopupMessage(message));
+        }
+
+        Description.SetMessage(FormattedMessage.FromMarkup(Loc.GetString("admin-notes-message-desc", ("count", state.Messages.Length))));
     }
 
     private void OnDismissButtonPressed(BaseButton.ButtonEventArgs obj)
     {
         OnDismissPressed?.Invoke();
-        Close();
     }
 
     private void OnAcceptButtonPressed(BaseButton.ButtonEventArgs obj)
     {
         OnAcceptPressed?.Invoke();
-        Close();
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
@@ -70,6 +79,7 @@ protected override void FrameUpdate(FrameEventArgs args)
         else
         {
             AcceptButton.Disabled = false;
+            DismissButton.Disabled = false;
         }
     }
 }

Content.Client/Alerts/ClientAlertsSystem.cs

@@ -33,7 +33,7 @@ protected override void LoadPrototypes()
 
         AlertOrder = _prototypeManager.EnumeratePrototypes<AlertOrderPrototype>().FirstOrDefault();
         if (AlertOrder == null)
-            Log.Error("alert", "no alertOrder prototype found, alerts will be in random order");
+            Log.Error("No alertOrder prototype found, alerts will be in random order");
     }
 
     public IReadOnlyDictionary<AlertKey, AlertState>? ActiveAlerts

Content.Client/Antag/AntagStatusIconSystem.cs

@@ -22,6 +22,7 @@ public override void Initialize()
         SubscribeLocalEvent<RevolutionaryComponent, GetStatusIconsEvent>(GetRevIcon);
         SubscribeLocalEvent<ZombieComponent, GetStatusIconsEvent>(GetIcon);
         SubscribeLocalEvent<HeadRevolutionaryComponent, GetStatusIconsEvent>(GetIcon);
+        SubscribeLocalEvent<InitialInfectedComponent, GetStatusIconsEvent>(GetIcon);
     }
 
     /// <summary>

Content.Client/Audio/ContentAudioSystem.cs

@@ -107,7 +107,7 @@ public void FadeIn(EntityUid? stream, AudioComponent? component = null, float du
 
         _fadingOut.Remove(stream.Value);
         var curVolume = component.Volume;
-        var change = (curVolume - MinVolume) / duration;
+        var change = (MinVolume - curVolume) / duration;
         _fadingIn.Add(stream.Value, (change, component.Volume));
         component.Volume = MinVolume;
     }
@@ -151,8 +151,8 @@ private void UpdateFades(float frameTime)
                 continue;
             }
 
-            var volume = component.Volume + change * frameTime;
-            volume = MathF.Max(target, volume);
+            var volume = component.Volume - change * frameTime;
+            volume = MathF.Min(target, volume);
             _audio.SetVolume(stream, volume, component);
 
             if (component.Volume.Equals(target))

Content.Client/Clothing/ClientClothingSystem.cs

@@ -271,7 +271,7 @@ private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot
         {
             if (!revealedLayers.Add(key))
             {
-                Logger.Warning($"Duplicate key for clothing visuals: {key}. Are multiple components attempting to modify the same layer? Equipment: {ToPrettyString(equipment)}");
+                Log.Warning($"Duplicate key for clothing visuals: {key}. Are multiple components attempting to modify the same layer? Equipment: {ToPrettyString(equipment)}");
                 continue;
             }
 
@@ -281,6 +281,9 @@ private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot
                 // note that every insertion requires reshuffling & remapping all the existing layers.
                 sprite.AddBlankLayer(index);
                 sprite.LayerMapSet(key, index);
+
+                if (layerData.Color != null)
+                    sprite.LayerSetColor(key, layerData.Color.Value);
             }
             else
                 index = sprite.LayerMapReserveBlank(key);

Content.Client/CriminalRecords/CriminalRecordsConsoleBoundUserInterface.cs

@@ -37,8 +37,8 @@ protected override void Open()
             SendMessage(new SetStationRecordFilter(type, filterValue));
         _window.OnStatusSelected += status =>
             SendMessage(new CriminalRecordChangeStatus(status, null));
-        _window.OnDialogConfirmed += (_, reason) =>
-            SendMessage(new CriminalRecordChangeStatus(SecurityStatus.Wanted, reason));
+        _window.OnDialogConfirmed += (status, reason) =>
+            SendMessage(new CriminalRecordChangeStatus(status, reason));
         _window.OnHistoryUpdated += UpdateHistory;
         _window.OnHistoryClosed += () => _historyWindow?.Close();
         _window.OnClose += Close;

Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs

@@ -219,16 +219,16 @@ private void FilterListingOfRecords(string text = "")
 
     private void SetStatus(SecurityStatus status)
     {
-        if (status == SecurityStatus.Wanted)
+        if (status == SecurityStatus.Wanted || status == SecurityStatus.Suspected)
         {
-            GetWantedReason();
+            GetReason(status);
             return;
         }
 
         OnStatusSelected?.Invoke(status);
     }
 
-    private void GetWantedReason()
+    private void GetReason(SecurityStatus status)
     {
         if (_reasonDialog != null)
         {
@@ -237,7 +237,7 @@ private void GetWantedReason()
         }
 
         var field = "reason";
-        var title = Loc.GetString("criminal-records-status-wanted");
+        var title = Loc.GetString("criminal-records-status-" + status.ToString().ToLower());
         var placeholders = _proto.Index<DatasetPrototype>(ReasonPlaceholders);
         var placeholder = Loc.GetString("criminal-records-console-reason-placeholder", ("placeholder", _random.Pick(placeholders.Values))); // just funny it doesn't actually get used
         var prompt = Loc.GetString("criminal-records-console-reason");
@@ -251,7 +251,7 @@ private void GetWantedReason()
             if (reason.Length < 1 || reason.Length > _maxLength)
                 return;
 
-            OnDialogConfirmed?.Invoke(SecurityStatus.Wanted, reason);
+            OnDialogConfirmed?.Invoke(status, reason);
         };
 
         _reasonDialog.OnClose += () => { _reasonDialog = null; };

Content.Client/DoAfter/DoAfterOverlay.cs

@@ -1,9 +1,9 @@
 using System.Numerics;
 using Content.Shared.DoAfter;
+using Content.Client.UserInterface.Systems;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
-using Robust.Shared.Graphics;
 using Robust.Client.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -18,6 +18,7 @@ public sealed class DoAfterOverlay : Overlay
     private readonly IPlayerManager _player;
     private readonly SharedTransformSystem _transform;
     private readonly MetaDataSystem _meta;
+    private readonly ProgressColorSystem _progressColor;
 
     private readonly Texture _barTexture;
     private readonly ShaderInstance _shader;
@@ -40,6 +41,7 @@ public DoAfterOverlay(IEntityManager entManager, IPrototypeManager protoManager,
         _player = player;
         _transform = _entManager.EntitySysManager.GetEntitySystem<SharedTransformSystem>();
         _meta = _entManager.EntitySysManager.GetEntitySystem<MetaDataSystem>();
+        _progressColor = _entManager.System<ProgressColorSystem>();
         var sprite = new SpriteSpecifier.Rsi(new("/Textures/Interface/Misc/progress_bar.rsi"), "icon");
         _barTexture = _entManager.EntitySysManager.GetEntitySystem<SpriteSystem>().Frame0(sprite);
 
@@ -125,7 +127,7 @@ protected override void Draw(in OverlayDrawArgs args)
                     elapsedRatio = (float) Math.Min(1, elapsed.TotalSeconds / doAfter.Args.Delay.TotalSeconds);
                     var cancelElapsed = (time - doAfter.CancelledTime.Value).TotalSeconds;
                     var flash = Math.Floor(cancelElapsed / FlashTime) % 2 == 0;
-                    color = new Color(1f, 0f, 0f, flash ? alpha : 0f);
+                    color = GetProgressColor(0, flash ? alpha : 0);
                 }
                 else
                 {
@@ -146,14 +148,8 @@ protected override void Draw(in OverlayDrawArgs args)
         handle.SetTransform(Matrix3.Identity);
     }
 
-    public static Color GetProgressColor(float progress, float alpha = 1f)
+    public Color GetProgressColor(float progress, float alpha = 1f)
     {
-        if (progress >= 1.0f)
-        {
-            return new Color(0f, 1f, 0f, alpha);
-        }
-        // lerp
-        var hue = (5f / 18f) * progress;
-        return Color.FromHsv((hue, 1f, 0.75f, alpha));
+        return _progressColor.GetProgressColor(progress).WithAlpha(alpha);
     }
 }

Content.Client/Drugs/DrugOverlaySystem.cs

@@ -38,6 +38,7 @@ private void OnPlayerAttached(EntityUid uid, SeeingRainbowsComponent component,
     private void OnPlayerDetached(EntityUid uid, SeeingRainbowsComponent component, LocalPlayerDetachedEvent args)
     {
         _overlay.Intoxication = 0;
+        _overlay.TimeTicker = 0;
         _overlayMan.RemoveOverlay(_overlay);
     }
 
@@ -52,6 +53,7 @@ private void OnShutdown(EntityUid uid, SeeingRainbowsComponent component, Compon
         if (_player.LocalEntity == uid)
         {
             _overlay.Intoxication = 0;
+            _overlay.TimeTicker = 0;
             _overlayMan.RemoveOverlay(_overlay);
         }
     }