Merge branch 'upstream-merge' into 'arumoon-server'

Upstream sync + Borgs walk sound fix + TG Maps: Update

See merge request Workbench-Team/space-station-14!125

Content.Client/Administration/Systems/BwoinkSystem.cs

@@ -2,13 +2,17 @@
 using Content.Shared.Administration;
 using JetBrains.Annotations;
 using Robust.Shared.Network;
+using Robust.Shared.Timing;
 
 namespace Content.Client.Administration.Systems
 {
     [UsedImplicitly]
     public sealed class BwoinkSystem : SharedBwoinkSystem
     {
+        [Dependency] private readonly IGameTiming _timing = default!;
+
         public event EventHandler<BwoinkTextMessage>? OnBwoinkTextMessageRecieved;
+        private (TimeSpan Timestamp, bool Typing) _lastTypingUpdateSent;
 
         protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySessionEventArgs eventArgs)
         {
@@ -20,6 +24,19 @@ public void Send(NetUserId channelId, string text)
             // Reuse the channel ID as the 'true sender'.
             // Server will ignore this and if someone makes it not ignore this (which is bad, allows impersonation!!!), that will help.
             RaiseNetworkEvent(new BwoinkTextMessage(channelId, channelId, text));
+            SendInputTextUpdated(channelId, false);
+        }
+
+        public void SendInputTextUpdated(NetUserId channel, bool typing)
+        {
+            if (_lastTypingUpdateSent.Typing == typing &&
+                _lastTypingUpdateSent.Timestamp + TimeSpan.FromSeconds(1) > _timing.RealTime)
+            {
+                return;
+            }
+
+            _lastTypingUpdateSent = (_timing.RealTime, typing);
+            RaiseNetworkEvent(new BwoinkClientTypingUpdated(channel, typing));
         }
     }
 }

Content.Client/Administration/UI/Bwoink/BwoinkPanel.xaml

@@ -4,6 +4,7 @@
     Orientation="Vertical"
     HorizontalExpand="True">
     <OutputPanel Name="TextOutput" VerticalExpand="true" />
+    <RichTextLabel Name="TypingIndicator" Access="Public" />
     <HistoryLineEdit Name="SenderLineEdit" />
     <RichTextLabel Name="RelayedToDiscordLabel" Access="Public" Visible="False" />
 </BoxContainer>

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

@@ -2,6 +2,7 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
 namespace Content.Client.Administration.UI.Bwoink
@@ -13,6 +14,8 @@ public sealed partial class BwoinkPanel : BoxContainer
 
         public int Unread { get; private set; } = 0;
         public DateTime LastMessage { get; private set; } = DateTime.MinValue;
+        private List<string> PeopleTyping { get; set; } = new();
+        public event Action<string>? InputTextChanged;
 
         public BwoinkPanel(Action<string> messageSender)
         {
@@ -32,6 +35,8 @@ public BwoinkPanel(Action<string> messageSender)
                     Unread = 0;
             };
             SenderLineEdit.OnTextEntered += Input_OnTextEntered;
+            SenderLineEdit.OnTextChanged += Input_OnTextChanged;
+            UpdateTypingIndicator();
         }
 
         private void Input_OnTextEntered(LineEdit.LineEditEventArgs args)
@@ -43,6 +48,11 @@ private void Input_OnTextEntered(LineEdit.LineEditEventArgs args)
             SenderLineEdit.Clear();
         }
 
+        private void Input_OnTextChanged(LineEdit.LineEditEventArgs args)
+        {
+            InputTextChanged?.Invoke(args.Text);
+        }
+
         public void ReceiveLine(SharedBwoinkSystem.BwoinkTextMessage message)
         {
             if (!Visible)
@@ -53,5 +63,54 @@ public void ReceiveLine(SharedBwoinkSystem.BwoinkTextMessage message)
             TextOutput.AddMessage(formatted);
             LastMessage = message.SentAt;
         }
+
+        private void UpdateTypingIndicator()
+        {
+            var msg = new FormattedMessage();
+            msg.PushColor(Color.LightGray);
+
+            var text = PeopleTyping.Count == 0
+                ? string.Empty
+                : Loc.GetString("bwoink-system-typing-indicator",
+                    ("players", string.Join(", ", PeopleTyping)),
+                    ("count", PeopleTyping.Count));
+
+            msg.AddText(text);
+            msg.Pop();
+
+            TypingIndicator.SetMessage(msg);
+        }
+
+        public void UpdatePlayerTyping(string name, bool typing)
+        {
+            if (typing)
+            {
+                if (PeopleTyping.Contains(name))
+                    return;
+
+                PeopleTyping.Add(name);
+                Timer.Spawn(TimeSpan.FromSeconds(10), () =>
+                {
+                    if (Disposed)
+                        return;
+
+                    PeopleTyping.Remove(name);
+                    UpdateTypingIndicator();
+                });
+            }
+            else
+            {
+                PeopleTyping.Remove(name);
+            }
+
+            UpdateTypingIndicator();
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+
+            InputTextChanged = null;
+        }
     }
 }

Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs

@@ -420,14 +420,18 @@ private void SetTypes(LogType[] types)
     public void SetPlayers(Dictionary<Guid, string> players)
     {
         var buttons = new SortedSet<AdminLogPlayerButton>(_adminLogPlayerButtonComparer);
+        var allSelected = true;
 
         foreach (var control in PlayersContainer.Children.ToArray())
         {
-            if (control is not AdminLogPlayerButton player ||
-                !players.Remove(player.Id))
-            {
+            if (control is not AdminLogPlayerButton player)
+                continue;
+
+            if (!SelectedPlayers.Contains(player.Id))
+                allSelected = false;
+
+            if (!players.Remove(player.Id))
                 continue;
-            }
 
             buttons.Add(player);
         }
@@ -437,10 +441,12 @@ public void SetPlayers(Dictionary<Guid, string> players)
             var button = new AdminLogPlayerButton(id)
             {
                 Text = name,
-                Pressed = true
+                Pressed = allSelected
             };
 
-            SelectedPlayers.Add(id);
+            if (allSelected)
+                SelectedPlayers.Add(id);
+
             button.OnPressed += PlayerButtonPressed;
 
             buttons.Add(button);

Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs

@@ -3,6 +3,7 @@
 using Content.Shared.Database;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Timing;
@@ -24,6 +25,9 @@ public NoteEdit(SharedAdminNote? note, string playerName, bool canCreate, bool c
         RobustXamlLoader.Load(this);
         PlayerName = playerName;
         Title = Loc.GetString("admin-note-editor-title-new", ("player", PlayerName));
+        IsCreating = note is null;
+        CanCreate = canCreate;
+        CanEdit = canEdit;
 
         ResetSubmitButton();
 
@@ -33,6 +37,7 @@ public NoteEdit(SharedAdminNote? note, string playerName, bool canCreate, bool c
         TypeOption.OnItemSelected += OnTypeChanged;
 
 
+        SeverityOption.AddItem(Loc.GetString("admin-note-editor-severity-select"), -1);
         SeverityOption.AddItem(Loc.GetString("admin-note-editor-severity-none"), (int) Shared.Database.NoteSeverity.None);
         SeverityOption.AddItem(Loc.GetString("admin-note-editor-severity-low"), (int) Shared.Database.NoteSeverity.Minor);
         SeverityOption.AddItem(Loc.GetString("admin-note-editor-severity-medium"), (int) Shared.Database.NoteSeverity.Medium);
@@ -42,10 +47,11 @@ public NoteEdit(SharedAdminNote? note, string playerName, bool canCreate, bool c
         PermanentCheckBox.OnPressed += OnPermanentPressed;
         SecretCheckBox.OnPressed += OnSecretPressed;
         SubmitButton.OnPressed += OnSubmitButtonPressed;
+        SubmitButton.OnMouseEntered += OnSubmitButtonMouseEntered;
+        SubmitButton.OnMouseExited += OnSubmitButtonMouseExited;
 
         if (note is null && !canCreate)
         {
-            SubmitButton.Disabled = true;
             TypeOption.Disabled = true;
             SeverityOption.Disabled = true;
         }
@@ -77,21 +83,45 @@ public NoteEdit(SharedAdminNote? note, string playerName, bool canCreate, bool c
                 UpdatePermanentCheckboxFields();
                 ExpiryLineEdit.Text = ExpiryTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
             }
-
-            if (!canEdit)
-            {
-                SubmitButton.Disabled = true;
-            }
         }
+
+        UpdateSubmitButton();
     }
 
+    private void OnSubmitButtonMouseEntered(GUIMouseHoverEventArgs args)
+    {
+        if (!SubmitButton.Disabled)
+            return;
+
+        SeverityOption.ModulateSelfOverride = Color.Red;
+    }
+
+    private void OnSubmitButtonMouseExited(GUIMouseHoverEventArgs args)
+    {
+        SeverityOption.ModulateSelfOverride = null;
+    }
+
+    private NoteSeverity? _noteSeverity = null;
+
     private string PlayerName { get; }
     private int NoteId { get; }
     private bool IsSecret { get; set; }
     private NoteType NoteType { get; set; }
-    private NoteSeverity? NoteSeverity { get; set; } = Shared.Database.NoteSeverity.None;
+
+    private NoteSeverity? NoteSeverity
+    {
+        get => _noteSeverity;
+        set
+        {
+            _noteSeverity = value;
+            UpdateSubmitButton();
+        }
+    }
     private DateTime? ExpiryTime { get; set; }
     private TimeSpan? DeleteResetOn { get; set; }
+    private bool IsCreating { get; set; }
+    private bool CanCreate { get; set; }
+    private bool CanEdit { get; set; }
 
     private void OnTypeChanged(OptionButton.ItemSelectedEventArgs args)
     {
@@ -153,7 +183,7 @@ private void OnSecretPressed(BaseButton.ButtonEventArgs _)
 
     private void OnSeverityChanged(OptionButton.ItemSelectedEventArgs args)
     {
-        NoteSeverity = (NoteSeverity) args.Id;
+        NoteSeverity = args.Id == -1 ? NoteSeverity = null : (NoteSeverity) args.Id;
         SeverityOption.SelectId(args.Id);
     }
 
@@ -192,6 +222,26 @@ protected override void FrameUpdate(FrameEventArgs args)
         }
     }
 
+    /// <summary>
+    ///     Updates whether or not the submit button is disabled.
+    /// </summary>
+    private void UpdateSubmitButton()
+    {
+        if (!CanEdit)
+        {
+            SubmitButton.Disabled = true;
+            return;
+        }
+
+        if (IsCreating && !CanCreate)
+        {
+            SubmitButton.Disabled = true;
+            return;
+        }
+
+        SubmitButton.Disabled = NoteSeverity == null;
+    }
+
     private void ResetSubmitButton()
     {
         SubmitButton.Text = Loc.GetString("admin-note-editor-submit");
@@ -236,6 +286,8 @@ protected override void Dispose(bool disposing)
         PermanentCheckBox.OnPressed -= OnPermanentPressed;
         SecretCheckBox.OnPressed -= OnSecretPressed;
         SubmitButton.OnPressed -= OnSubmitButtonPressed;
+        SubmitButton.OnMouseEntered -= OnSubmitButtonMouseEntered;
+        SubmitButton.OnMouseExited -= OnSubmitButtonMouseExited;
 
         SubmitPressed = null;
     }

Content.Client/DragDrop/DragDropSystem.cs

@@ -20,7 +20,6 @@
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
-using System.Linq;
 using System.Numerics;
 using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
 
@@ -57,7 +56,10 @@ public sealed class DragDropSystem : SharedDragDropSystem
     // mousedown event so it can be treated like a regular click
     private const float MaxMouseDownTimeForReplayingClick = 0.85f;
 
+    [ValidatePrototypeId<ShaderPrototype>]
     private const string ShaderDropTargetInRange = "SelectionOutlineInrange";
+
+    [ValidatePrototypeId<ShaderPrototype>]
     private const string ShaderDropTargetOutOfRange = "SelectionOutline";
 
     /// <summary>

Content.Client/Fax/AdminUI/AdminFaxEui.cs

@@ -1,4 +1,4 @@
-using Content.Client.Eui;
+using Content.Client.Eui;
 using Content.Shared.Eui;
 using Content.Shared.Fax;
 using JetBrains.Annotations;
@@ -15,7 +15,8 @@ public AdminFaxEui()
         _window = new AdminFaxWindow();
         _window.OnClose += () => SendMessage(new AdminFaxEuiMsg.Close());
         _window.OnFollowFax += uid => SendMessage(new AdminFaxEuiMsg.Follow(uid));
-        _window.OnMessageSend += args => SendMessage(new AdminFaxEuiMsg.Send(args.uid, args.title, args.from, args.message, args.stamp));
+        _window.OnMessageSend += args => SendMessage(new AdminFaxEuiMsg.Send(args.uid, args.title,
+                    args.stampedBy, args.message, args.stampSprite, args.stampColor));
     }
 
     public override void Opened()

Content.Client/Fax/AdminUI/AdminFaxWindow.xaml

@@ -1,4 +1,4 @@
-<DefaultWindow xmlns="https://spacestation14.io"
+<DefaultWindow xmlns="https://spacestation14.io"
                Title="{Loc admin-fax-title}"
                MinWidth="400">
     <BoxContainer Orientation="Vertical" VerticalExpand="True">
@@ -21,6 +21,8 @@
             <Control MinWidth="5" />
             <OptionButton Name="StampSelector" HorizontalExpand="True" />
         </BoxContainer>
+        <Label Text="{Loc admin-fax-stamp-color}" />
+        <ColorSelectorSliders Margin="12 0 0 0" Name="StampColorSelector" Color="#BB3232"/>
         <Control MinHeight="10" />
         <Button Name="SendButton" Text="{Loc admin-fax-send}"></Button>
     </BoxContainer>

Content.Client/Fax/AdminUI/AdminFaxWindow.xaml.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Fax;
+using Content.Shared.Fax;
 using Robust.Client.AutoGenerated;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface.Controls;
@@ -13,7 +13,7 @@ public sealed partial class AdminFaxWindow : DefaultWindow
 {
     private const string StampsRsiPath = "/Textures/Objects/Misc/bureaucracy.rsi";
 
-    public Action<(EntityUid uid, string title, string from, string message, string stamp)>? OnMessageSend;
+    public Action<(EntityUid uid, string title, string stampedBy, string message, string stampSprite, Color stampColor)>? OnMessageSend;
     public Action<EntityUid>? OnFollowFax;
 
     public AdminFaxWindow()
@@ -28,6 +28,9 @@ public AdminFaxWindow()
         FollowButton.OnPressed += FollowFax;
         SendButton.OnPressed += SendMessage;
 
+        // Don't use this, but ColorSelectorSliders requires it:
+        StampColorSelector.OnColorChanged += (Color) => {};
+
         var loc = IoCManager.Resolve<ILocalizationManager>();
         MessageEdit.Placeholder = new Rope.Leaf(loc.GetString("admin-fax-message-placeholder")); // TextEdit work only with Nodes
     }
@@ -90,6 +93,7 @@ private void SendMessage(BaseButton.ButtonEventArgs obj)
             return;
 
         var from = FromEdit.Text;
-        OnMessageSend?.Invoke((faxUid.Value, title, from, message, stamp));
+        var stampColor = StampColorSelector.Color;
+        OnMessageSend?.Invoke((faxUid.Value, title, from, message, stamp, stampColor));
     }
 }