Merge remote-tracking branch 'origin/master'

SS14-Classic · May 11, 2024 · a99b951 · a99b951
2 parents 6a7e047 + e28e523
commit a99b951
Show file tree

Hide file tree

Showing 286 changed files with 148,210 additions and 99,022 deletions.
diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminMessageEui.cs b/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();
     }
 }
diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml b/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>
diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml.cs b/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);
+    }
+}
diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml b/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>
diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs b/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;
         }
     }
 }
diff --git a/Content.Client/Antag/AntagStatusIconSystem.cs b/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>

diff --git a/Content.Client/DoAfter/DoAfterOverlay.cs b/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);
     }
 }
diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs
@@ -55,6 +55,7 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(ContentKeyFunctions.UseItemInHand);
             human.AddFunction(ContentKeyFunctions.AltUseItemInHand);
             human.AddFunction(ContentKeyFunctions.OpenCharacterMenu);
+            human.AddFunction(ContentKeyFunctions.OpenLanguageMenu);
             human.AddFunction(ContentKeyFunctions.ActivateItemInWorld);
             human.AddFunction(ContentKeyFunctions.ThrowItemInHand);
             human.AddFunction(ContentKeyFunctions.AltActivateItemInWorld);

diff --git a/Content.Client/Language/LanguageMenuWindow.xaml b/Content.Client/Language/LanguageMenuWindow.xaml
@@ -0,0 +1,18 @@
+<DefaultWindow xmlns="https://spacestation14.io"
+               xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
+               Title="{Loc language-menu-window-title}"
+               SetSize="300 300">
+    <BoxContainer Orientation="Vertical" SeparationOverride="4" MinWidth="150">
+        <PanelContainer Name="CurrentLanguageContainer" Access="Public" StyleClasses="PdaBorderRect">
+            <Label Name="CurrentLanguageLabel" Access="Public" Text="Current Language:" HorizontalExpand="True"></Label>
+        </PanelContainer>
+
+        <ui:HLine></ui:HLine>
+
+        <ScrollContainer HorizontalExpand="True" VerticalExpand="True" HScrollEnabled="False" VScrollEnabled="True" MinHeight="50">
+            <BoxContainer Name="OptionsList" Access="Public" HorizontalExpand="True" SeparationOverride="2" Orientation="Vertical">
+                <!-- The rest here is generated programmatically -->
+            </BoxContainer>
+        </ScrollContainer>
+    </BoxContainer>
+</DefaultWindow>