Merge pull request #1071 from Roudenn/upstream-sync

Upstream sync

Content.Client/Administration/Systems/BwoinkSystem.cs

@@ -19,11 +19,11 @@ protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySes
             OnBwoinkTextMessageRecieved?.Invoke(this, message);
         }
 
-        public void Send(NetUserId channelId, string text, bool playSound)
+        public void Send(NetUserId channelId, string text, bool playSound, bool adminOnly)
         {
             // 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, playSound: playSound));
+            RaiseNetworkEvent(new BwoinkTextMessage(channelId, channelId, text, playSound: playSound, adminOnly: adminOnly));
             SendInputTextUpdated(channelId, false);
         }
 

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

@@ -7,7 +7,9 @@
             <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="2">
                 <BoxContainer Access="Public" Name="BwoinkArea" VerticalExpand="True" />
                 <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-                    <CheckBox Visible="True" Name="PlaySound" Access="Public" Text="{Loc 'admin-bwoink-play-sound'}" Pressed="True" />
+                    <CheckBox Name="AdminOnly" Access="Public" Text="{Loc 'admin-ahelp-admin-only'}" ToolTip="{Loc 'admin-ahelp-admin-only-tooltip'}" />
+                    <Control HorizontalExpand="True" MinWidth="5" />
+                    <CheckBox Name="PlaySound" Access="Public" Text="{Loc 'admin-bwoink-play-sound'}" Pressed="True" />
                     <Control HorizontalExpand="True" MinWidth="5" />
                     <Button Visible="True" Name="PopOut" Access="Public" Text="{Loc 'admin-logs-pop-out'}" StyleClasses="OpenBoth" HorizontalAlignment="Left" />
                     <Control HorizontalExpand="True" />

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

@@ -45,6 +45,8 @@ public BwoinkControl()
             _adminManager.AdminStatusUpdated += UpdateButtons;
             UpdateButtons();
 
+            AdminOnly.OnToggled += args => PlaySound.Disabled = args.Pressed;
+
             ChannelSelector.OnSelectionChanged += sel =>
             {
                 _currentPlayer = sel;

Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs

@@ -133,24 +133,14 @@ private IEnumerable<GuideEntry> GetSortedEntries(List<ProtoId<GuideEntryPrototyp
             HashSet<ProtoId<GuideEntryPrototype>> entries = new(_entries.Keys);
             foreach (var entry in _entries.Values)
             {
-                if (entry.Children.Count > 0)
-                {
-                    var sortedChildren = entry.Children
-                        .Select(childId => _entries[childId])
-                        .OrderBy(childEntry => childEntry.Priority)
-                        .ThenBy(childEntry => Loc.GetString(childEntry.Name))
-                        .Select(childEntry => new ProtoId<GuideEntryPrototype>(childEntry.Id))
-                        .ToList();
-
-                    entry.Children = sortedChildren;
-                }
-
                 entries.ExceptWith(entry.Children);
             }
-
             rootEntries = entries.ToList();
         }
 
+        // Only roots need to be sorted.
+        // As defined in the SS14 Dev Wiki, children are already sorted based on their child field order within their parent's prototype definition.
+        // Roots are sorted by priority. If there is no defined priority for a root then it is by definition sorted undefined.
         return rootEntries
             .Select(rootEntryId => _entries[rootEntryId])
             .OrderBy(rootEntry => rootEntry.Priority)

Content.Client/Guidebook/GuidebookSystem.cs

@@ -150,7 +150,9 @@ private void OnGuidebookControlsTestInteractHand(EntityUid uid, GuidebookControl
         if (!TryComp<SpeechComponent>(uid, out var speech) || speech.SpeechSounds is null)
             return;
 
-        _audioSystem.PlayGlobal(speech.SpeechSounds, Filter.Local(), false, speech.AudioParams);
+        // This code is broken because SpeechSounds isn't a file name or sound specifier directly.
+        // Commenting out to avoid compile failure with https://github.com/space-wizards/RobustToolbox/pull/5540
+        // _audioSystem.PlayGlobal(speech.SpeechSounds, Filter.Local(), false, speech.AudioParams);
     }
 
     public void FakeClientActivateInWorld(EntityUid activated)

Content.Client/Light/RoofOverlay.cs

@@ -1,10 +1,12 @@
 using System.Numerics;
 using Content.Shared.Light.Components;
+using Content.Shared.Light.EntitySystems;
 using Content.Shared.Maps;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
+using Robust.Shared.Map.Enumerators;
 using Robust.Shared.Physics;
 
 namespace Content.Client.Light;
@@ -17,9 +19,9 @@ public sealed class RoofOverlay : Overlay
 
     private readonly EntityLookupSystem _lookup;
     private readonly SharedMapSystem _mapSystem;
+    private readonly SharedRoofSystem _roof = default!;
     private readonly SharedTransformSystem _xformSystem;
 
-    private readonly HashSet<Entity<OccluderComponent>> _occluders = new();
     private List<Entity<MapGridComponent>> _grids = new();
 
     public override OverlaySpace Space => OverlaySpace.BeforeLighting;
@@ -33,6 +35,7 @@ public RoofOverlay(IEntityManager entManager)
 
         _lookup = _entManager.System<EntityLookupSystem>();
         _mapSystem = _entManager.System<SharedMapSystem>();
+        _roof = _entManager.System<SharedRoofSystem>();
         _xformSystem = _entManager.System<SharedTransformSystem>();
 
         ZIndex = ContentZIndex;
@@ -86,29 +89,14 @@ protected override void Draw(in OverlayDrawArgs args)
                     worldHandle.SetTransform(matty);
 
                     var tileEnumerator = _mapSystem.GetTilesEnumerator(grid.Owner, grid, bounds);
+                    var roofEnt = (grid.Owner, grid.Comp, roof);
 
                     // Due to stencilling we essentially draw on unrooved tiles
                     while (tileEnumerator.MoveNext(out var tileRef))
                     {
-                        if ((tileRef.Tile.Flags & (byte) TileFlag.Roof) == 0x0)
+                        if (!_roof.IsRooved(roofEnt, tileRef.GridIndices))
                         {
-                            // Check if the tile is occluded in which case hide it anyway.
-                            // This is to avoid lit walls bleeding over to unlit tiles.
-                            _occluders.Clear();
-                            _lookup.GetLocalEntitiesIntersecting(grid.Owner, tileRef.GridIndices, _occluders);
-                            var found = false;
-
-                            foreach (var occluder in _occluders)
-                            {
-                                if (!occluder.Comp.Enabled)
-                                    continue;
-
-                                found = true;
-                                break;
-                            }
-
-                            if (!found)
-                                continue;
+                            continue;
                         }
 
                         var local = _lookup.GetLocalBounds(tileRef, grid.Comp.TileSize);

Content.Client/Overlays/StencilOverlay.Weather.cs

@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Shared.Light.Components;
 using Content.Shared.Weather;
 using Robust.Client.Graphics;
 using Robust.Shared.Map.Components;
@@ -34,11 +35,12 @@ private void DrawWeather(in OverlayDrawArgs args, WeatherPrototype weatherProto,
                 var matrix = _transform.GetWorldMatrix(grid, xformQuery);
                 var matty =  Matrix3x2.Multiply(matrix, invMatrix);
                 worldHandle.SetTransform(matty);
+                _entManager.TryGetComponent(grid.Owner, out RoofComponent? roofComp);
 
                 foreach (var tile in _map.GetTilesIntersecting(grid.Owner, grid, worldAABB))
                 {
                     // Ignored tiles for stencil
-                    if (_weather.CanWeatherAffect(grid.Owner, grid, tile))
+                    if (_weather.CanWeatherAffect(grid.Owner, grid, tile, roofComp))
                     {
                         continue;
                     }

Content.Client/Sprite/SpriteFadeSystem.cs

@@ -20,12 +20,21 @@ public sealed class SpriteFadeSystem : EntitySystem
 
     private readonly HashSet<FadingSpriteComponent> _comps = new();
 
+    private EntityQuery<SpriteComponent> _spriteQuery;
+    private EntityQuery<SpriteFadeComponent> _fadeQuery;
+    private EntityQuery<FadingSpriteComponent> _fadingQuery;
+
     private const float TargetAlpha = 0.4f;
     private const float ChangeRate = 1f;
 
     public override void Initialize()
     {
         base.Initialize();
+
+        _spriteQuery = GetEntityQuery<SpriteComponent>();
+        _fadeQuery = GetEntityQuery<SpriteFadeComponent>();
+        _fadingQuery = GetEntityQuery<FadingSpriteComponent>();
+
         SubscribeLocalEvent<FadingSpriteComponent, ComponentShutdown>(OnFadingShutdown);
     }
 
@@ -42,28 +51,26 @@ public override void FrameUpdate(float frameTime)
         base.FrameUpdate(frameTime);
 
         var player = _playerManager.LocalEntity;
-        var spriteQuery = GetEntityQuery<SpriteComponent>();
         var change = ChangeRate * frameTime;
 
         if (TryComp(player, out TransformComponent? playerXform) &&
             _stateManager.CurrentState is GameplayState state &&
-            spriteQuery.TryGetComponent(player, out var playerSprite))
+            _spriteQuery.TryGetComponent(player, out var playerSprite))
         {
-            var fadeQuery = GetEntityQuery<SpriteFadeComponent>();
             var mapPos = _transform.GetMapCoordinates(_playerManager.LocalEntity!.Value, xform: playerXform);
 
             // Also want to handle large entities even if they may not be clickable.
             foreach (var ent in state.GetClickableEntities(mapPos))
             {
                 if (ent == player ||
-                    !fadeQuery.HasComponent(ent) ||
-                    !spriteQuery.TryGetComponent(ent, out var sprite) ||
+                    !_fadeQuery.HasComponent(ent) ||
+                    !_spriteQuery.TryGetComponent(ent, out var sprite) ||
                     sprite.DrawDepth < playerSprite.DrawDepth)
                 {
                     continue;
                 }
 
-                if (!TryComp<FadingSpriteComponent>(ent, out var fading))
+                if (!_fadingQuery.TryComp(ent, out var fading))
                 {
                     fading = AddComp<FadingSpriteComponent>(ent);
                     fading.OriginalAlpha = sprite.Color.A;
@@ -85,7 +92,7 @@ _stateManager.CurrentState is GameplayState state &&
             if (_comps.Contains(comp))
                 continue;
 
-            if (!spriteQuery.TryGetComponent(uid, out var sprite))
+            if (!_spriteQuery.TryGetComponent(uid, out var sprite))
                 continue;
 
             var newColor = Math.Min(sprite.Color.A + change, comp.OriginalAlpha);

Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs

@@ -176,7 +176,7 @@ public void EnsureUIHelper()
         UIHelper = isAdmin ? new AdminAHelpUIHandler(ownerUserId) : new UserAHelpUIHandler(ownerUserId);
         UIHelper.DiscordRelayChanged(_discordRelayActive);
 
-        UIHelper.SendMessageAction = (userId, textMessage, playSound) => _bwoinkSystem?.Send(userId, textMessage, playSound);
+        UIHelper.SendMessageAction = (userId, textMessage, playSound, adminOnly) => _bwoinkSystem?.Send(userId, textMessage, playSound, adminOnly);
         UIHelper.InputTextChanged += (channel, text) => _bwoinkSystem?.SendInputTextUpdated(channel, text.Length > 0);
         UIHelper.OnClose += () => { SetAHelpPressed(false); };
         UIHelper.OnOpen +=  () => { SetAHelpPressed(true); };
@@ -325,7 +325,7 @@ public interface IAHelpUIHandler : IDisposable
     public void PeopleTypingUpdated(BwoinkPlayerTypingUpdated args);
     public event Action OnClose;
     public event Action OnOpen;
-    public Action<NetUserId, string, bool>? SendMessageAction { get; set; }
+    public Action<NetUserId, string, bool, bool>? SendMessageAction { get; set; }
     public event Action<NetUserId, string>? InputTextChanged;
 }
 public sealed class AdminAHelpUIHandler : IAHelpUIHandler
@@ -409,7 +409,7 @@ public void PeopleTypingUpdated(BwoinkPlayerTypingUpdated args)
 
     public event Action? OnClose;
     public event Action? OnOpen;
-    public Action<NetUserId, string, bool>? SendMessageAction { get; set; }
+    public Action<NetUserId, string, bool, bool>? SendMessageAction { get; set; }
     public event Action<NetUserId, string>? InputTextChanged;
 
     public void Open(NetUserId channelId, bool relayActive)
@@ -463,7 +463,7 @@ public BwoinkPanel EnsurePanel(NetUserId channelId)
         if (_activePanelMap.TryGetValue(channelId, out var existingPanel))
             return existingPanel;
 
-        _activePanelMap[channelId] = existingPanel = new BwoinkPanel(text => SendMessageAction?.Invoke(channelId, text, Window?.Bwoink.PlaySound.Pressed ?? true));
+        _activePanelMap[channelId] = existingPanel = new BwoinkPanel(text => SendMessageAction?.Invoke(channelId, text, Window?.Bwoink.PlaySound.Pressed ?? true, Window?.Bwoink.AdminOnly.Pressed ?? false));
         existingPanel.InputTextChanged += text => InputTextChanged?.Invoke(channelId, text);
         existingPanel.Visible = false;
         if (!Control!.BwoinkArea.Children.Contains(existingPanel))
@@ -549,7 +549,7 @@ public void PeopleTypingUpdated(BwoinkPlayerTypingUpdated args)
 
     public event Action? OnClose;
     public event Action? OnOpen;
-    public Action<NetUserId, string, bool>? SendMessageAction { get; set; }
+    public Action<NetUserId, string, bool, bool>? SendMessageAction { get; set; }
     public event Action<NetUserId, string>? InputTextChanged;
 
     public void Open(NetUserId channelId, bool relayActive)
@@ -562,7 +562,7 @@ private void EnsureInit(bool relayActive)
     {
         if (_window is { Disposed: false })
             return;
-        _chatPanel = new BwoinkPanel(text => SendMessageAction?.Invoke(_ownerId, text, true));
+        _chatPanel = new BwoinkPanel(text => SendMessageAction?.Invoke(_ownerId, text, true, false));
         _chatPanel.InputTextChanged += text => InputTextChanged?.Invoke(_ownerId, text);
         _chatPanel.RelayedToDiscordLabel.Visible = relayActive;
         _window = new DefaultWindow()

Content.Client/Weather/WeatherSystem.cs

@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Shared.Light.Components;
 using Content.Shared.Weather;
 using Robust.Client.Audio;
 using Robust.Client.GameObjects;
@@ -57,6 +58,7 @@ protected override void Run(EntityUid uid, WeatherData weather, WeatherPrototype
         // Work out tiles nearby to determine volume.
         if (TryComp<MapGridComponent>(entXform.GridUid, out var grid))
         {
+            TryComp(entXform.GridUid, out RoofComponent? roofComp);
             var gridId = entXform.GridUid.Value;
             // FloodFill to the nearest tile and use that for audio.
             var seed = _mapSystem.GetTileRef(gridId, grid, entXform.Coordinates);
@@ -71,7 +73,7 @@ protected override void Run(EntityUid uid, WeatherData weather, WeatherPrototype
                 if (!visited.Add(node.GridIndices))
                     continue;
 
-                if (!CanWeatherAffect(entXform.GridUid.Value, grid, node))
+                if (!CanWeatherAffect(entXform.GridUid.Value, grid, node, roofComp))
                 {
                     // Add neighbors
                     // TODO: Ideally we pick some deterministically random direction and use that

Content.Server/Administration/Systems/BwoinkSystem.cs

@@ -642,7 +642,7 @@ protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySes
             var personalChannel = senderSession.UserId == message.UserId;
             var senderAdmin = _adminManager.GetAdminData(senderSession);
             var senderAHelpAdmin = senderAdmin?.HasFlag(AdminFlags.Adminhelp) ?? false;
-            var authorized = personalChannel || senderAHelpAdmin;
+            var authorized = personalChannel && !message.AdminOnly || senderAHelpAdmin;
             if (!authorized)
             {
                 // Unauthorized bwoink (log?)
@@ -678,11 +678,11 @@ protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySes
                 bwoinkText = $"{senderSession.Name}";
             }
 
-            bwoinkText = $"{(message.PlaySound ? "" : "(S) ")}{bwoinkText}: {escapedText}";
+            bwoinkText = $"{(message.AdminOnly ? Loc.GetString("bwoink-message-admin-only") : !message.PlaySound ? Loc.GetString("bwoink-message-silent") : "")} {bwoinkText}: {escapedText}";
 
-            // If it's not an admin / admin chooses to keep the sound then play it.
-            var playSound = !senderAHelpAdmin || message.PlaySound;
-            var msg = new BwoinkTextMessage(message.UserId, senderSession.UserId, bwoinkText, playSound: playSound);
+            // If it's not an admin / admin chooses to keep the sound and message is not an admin only message, then play it.
+            var playSound = (!senderAHelpAdmin || message.PlaySound) && !message.AdminOnly;
+            var msg = new BwoinkTextMessage(message.UserId, senderSession.UserId, bwoinkText, playSound: playSound, adminOnly: message.AdminOnly);
 
             LogBwoink(msg);
 
@@ -702,7 +702,7 @@ protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySes
             }
 
             // Notify player
-            if (_playerManager.TryGetSessionById(message.UserId, out var session))
+            if (_playerManager.TryGetSessionById(message.UserId, out var session) && !message.AdminOnly)
             {
                 if (!admins.Contains(session.Channel))
                 {

Content.Server/Backmen/EvilTwin/EvilTwinSystem.cs

@@ -7,7 +7,6 @@
 using Content.Server.Backmen.Economy;
 using Content.Server.Backmen.Fugitive;
 using Content.Server.CartridgeLoader.Cartridges;
-using Content.Server.DetailExaminable;
 using Content.Server.Forensics;
 using Content.Server.GameTicking;
 using Content.Server.Humanoid;
@@ -40,6 +39,7 @@
 using Content.Shared.CartridgeLoader;
 using Content.Shared.CCVar;
 using Content.Shared.Clothing;
+using Content.Shared.DetailExaminable;
 using Content.Shared.Forensics.Components;
 using Content.Shared.GameTicking;
 using Content.Shared.Inventory;

Content.Server/Corvax/StationGoal/StationGoalCommand.cs

@@ -11,6 +11,7 @@ namespace Content.Server.Corvax.StationGoal
     public sealed class StationGoalCommand : IConsoleCommand
     {
         [Dependency] private readonly IEntityManager _entManager = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
         public string Command => "sendstationgoal";
         public string Description => Loc.GetString("send-station-goal-command-description");
@@ -31,15 +32,14 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             }
 
             var protoId = args[1];
-            var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
-            if (!prototypeManager.TryIndex<StationGoalPrototype>(protoId, out var proto))
+            if (!_prototypeManager.TryIndex<StationGoalPrototype>(protoId, out var proto))
             {
                 shell.WriteError($"No station goal found with ID {protoId}!");
                 return;
             }
 
-            var stationGoalPaper = IoCManager.Resolve<IEntityManager>().System<StationGoalPaperSystem>();
-            if (!stationGoalPaper.SendStationGoal(euid, protoId))
+            var stationGoalPaper = _entManager.System<StationGoalPaperSystem>();
+            if (!stationGoalPaper.SendStationGoal(euid.Value, protoId))
             {
                 shell.WriteError("Station goal was not sent");
                 return;
@@ -52,9 +52,9 @@ public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
             {
                 case 1:
                     var stations = ContentCompletionHelper.StationIds(_entManager);
-                    return CompletionResult.FromHintOptions(stations, "[StationId]");
+                    return CompletionResult.FromHintOptions(stations, Loc.GetString("send-station-goal-command-arg-station"));
                 case 2:
-                    var options = IoCManager.Resolve<IPrototypeManager>()
+                    var options = _prototypeManager
                         .EnumeratePrototypes<StationGoalPrototype>()
                         .Select(p => new CompletionOption(p.ID));