Merge branch 'master-ru' into 'master-ru'

Upstream sync

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

.github/workflows/build-test-debug.yml

@@ -51,7 +51,7 @@ jobs:
       shell: pwsh
       run: |
         $env:DOTNET_gcServer=1
-        dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0
+        dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed
   ci-success:
     name: Build & Test Debug
     needs:

.github/workflows/build-test-release.yml

@@ -51,7 +51,7 @@ jobs:
       shell: pwsh
       run: |
         $env:DOTNET_gcServer=1
-        dotnet test --configuration Tools --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0
+        dotnet test --configuration Tools --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed
   ci-success:
     name: Build & Test Release
     needs:

Content.Client/Audio/AmbientSoundSystem.cs

@@ -50,7 +50,7 @@ protected override void QueueUpdate(EntityUid uid, AmbientSoundComponent ambienc
     /// </summary>
     private int MaxSingleSound => (int) (_maxAmbientCount / (16.0f / 6.0f));
 
-    private readonly Dictionary<AmbientSoundComponent, (IPlayingAudioStream? Stream, string Sound)> _playingSounds = new();
+    private readonly Dictionary<AmbientSoundComponent, (IPlayingAudioStream? Stream, SoundSpecifier Sound, string Path)> _playingSounds = new();
     private readonly Dictionary<string, int> _playingCount = new();
 
     public bool OverlayEnabled
@@ -104,9 +104,9 @@ private void OnShutdown(EntityUid uid, AmbientSoundComponent component, Componen
             return;
 
         sound.Stream?.Stop();
-        _playingCount[sound.Sound] -= 1;
-        if (_playingCount[sound.Sound] == 0)
-            _playingCount.Remove(sound.Sound);
+        _playingCount[sound.Path] -= 1;
+        if (_playingCount[sound.Path] == 0)
+            _playingCount.Remove(sound.Path);
     }
 
     private void SetAmbienceVolume(float value)
@@ -141,9 +141,9 @@ private int PlayingCount(string countSound)
     {
         var count = 0;
 
-        foreach (var (_, (_, sound)) in _playingSounds)
+        foreach (var (_, (_, sound, path)) in _playingSounds)
         {
-            if (sound.Equals(countSound))
+            if (path.Equals(countSound))
                 count++;
         }
 
@@ -177,7 +177,7 @@ public override void Update(float frameTime)
 
     private void ClearSounds()
     {
-        foreach (var (stream, _) in _playingSounds.Values)
+        foreach (var (stream, _, _) in _playingSounds.Values)
         {
             stream?.Stop();
         }
@@ -245,6 +245,8 @@ private void ProcessNearbyAmbience(TransformComponent playerXform)
             var entity = comp.Owner;
 
             if (comp.Enabled &&
+                // Don't keep playing sounds that have changed since.
+                sound.Sound == comp.Sound &&
                 query.TryGetComponent(entity, out var xform) &&
                 xform.MapID == playerXform.MapID &&
                 !metaQuery.GetComponent(entity).EntityPaused)
@@ -259,9 +261,9 @@ private void ProcessNearbyAmbience(TransformComponent playerXform)
 
             sound.Stream?.Stop();
             _playingSounds.Remove(comp);
-            _playingCount[sound.Sound] -= 1;
-            if (_playingCount[sound.Sound] == 0)
-                _playingCount.Remove(sound.Sound);
+            _playingCount[sound.Path] -= 1;
+            if (_playingCount[sound.Path] == 0)
+                _playingCount.Remove(sound.Path);
         }
 
         if (_playingSounds.Count >= _maxAmbientCount)
@@ -301,7 +303,7 @@ private void ProcessNearbyAmbience(TransformComponent playerXform)
                 if (stream == null)
                     continue;
 
-                _playingSounds[comp] = (stream, key);
+                _playingSounds[comp] = (stream, comp.Sound, key);
                 playingCount++;
 
                 if (_playingSounds.Count >= _maxAmbientCount)

Content.Client/Bql/BqlResultsEui.cs → Content.Client/Bql/ToolshedVisualizeEui.cs

@@ -7,13 +7,13 @@
 namespace Content.Client.Bql;
 
 [UsedImplicitly]
-public sealed class BqlResultsEui : BaseEui
+public sealed class ToolshedVisualizeEui : BaseEui
 {
-    private readonly BqlResultsWindow _window;
+    private readonly ToolshedVisualizeWindow _window;
 
-    public BqlResultsEui()
+    public ToolshedVisualizeEui()
     {
-        _window = new BqlResultsWindow(
+        _window = new ToolshedVisualizeWindow(
             IoCManager.Resolve<IClientConsoleHost>(),
             IoCManager.Resolve<ILocalizationManager>()
         );
@@ -23,7 +23,7 @@ public BqlResultsEui()
 
     public override void HandleState(EuiStateBase state)
     {
-        if (state is not BqlResultsEuiState castState)
+        if (state is not ToolshedVisualizeEuiState castState)
             return;
 
         _window.Update(castState.Entities);

Content.Client/Bql/BqlResultsWindow.xaml.cs → Content.Client/Bql/ToolshedVisualizeWindow.xaml.cs

@@ -8,12 +8,12 @@
 namespace Content.Client.Bql;
 
 [GenerateTypedNameReferences]
-internal sealed partial class BqlResultsWindow : DefaultWindow
+internal sealed partial class ToolshedVisualizeWindow : DefaultWindow
 {
     private readonly IClientConsoleHost _console;
     private readonly ILocalizationManager _loc;
 
-    public BqlResultsWindow(IClientConsoleHost console, ILocalizationManager loc)
+    public ToolshedVisualizeWindow(IClientConsoleHost console, ILocalizationManager loc)
     {
         _console = console;
         _loc = loc;

Content.Client/Content.Client.csproj

@@ -33,6 +33,9 @@
     <Compile Update="UserInterface\Systems\Inventory\Windows\StrippingWindow.xaml.cs">
       <DependentUpon>StrippingWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Update="Bql\ToolshedVisualizeWindow.xaml.cs">
+      <DependentUpon>ToolshedVisualizeWindow.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
 
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />

Content.Client/PDA/Ringer/RingerBoundUserInterface.cs

@@ -43,7 +43,7 @@ private bool TryGetRingtone(out Note[] ringtone)
                 return false;
             }
 
-            ringtone = new Note[4];
+            ringtone = new Note[_menu.RingerNoteInputs.Length];
 
             for (int i = 0; i < _menu.RingerNoteInputs.Length; i++)
             {

Content.Client/PDA/Ringer/RingtoneMenu.xaml

@@ -1,7 +1,7 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             Title="{Loc 'comp-ringer-ui-menu-title'}"
-            MinSize="256 128"
-            SetSize="256 128">
+            MinSize="320 128"
+            SetSize="320 128">
         <BoxContainer Orientation="Vertical"
                     VerticalExpand="True"
                     HorizontalExpand="True"
@@ -12,7 +12,7 @@
                         VerticalExpand="True"
                         HorizontalExpand="True"
                         HorizontalAlignment="Center"
-                        MinSize="120 0">
+                        MinSize="180 0">
                     <Label Name = "Indent_0Label"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
@@ -49,6 +49,24 @@
                             MinSize="40 0"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center" />
+                    <Label Name = "Indent_4Label"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Text="-" />
+                    <LineEdit Name ="RingerNoteFiveInput"
+                            Access="Public"
+                            MinSize="40 0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center" />
+                    <Label Name = "Indent_5Label"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Text="-" />
+                    <LineEdit Name ="RingerNoteSixInput"
+                            Access="Public"
+                            MinSize="40 0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center" />
                 </BoxContainer>
             </PanelContainer>
             <PanelContainer>

Content.Client/PDA/Ringer/RingtoneMenu.xaml.cs

@@ -10,14 +10,14 @@ namespace Content.Client.PDA.Ringer
     [GenerateTypedNameReferences]
     public sealed partial class RingtoneMenu : DefaultWindow
     {
-        public string[] PreviousNoteInputs = new[] { "A", "A", "A", "A" };
+        public string[] PreviousNoteInputs = new[] { "A", "A", "A", "A", "A", "A" };
         public LineEdit[] RingerNoteInputs = default!;
 
         public RingtoneMenu()
         {
             RobustXamlLoader.Load(this);
 
-            RingerNoteInputs = new[] { RingerNoteOneInput, RingerNoteTwoInput, RingerNoteThreeInput, RingerNoteFourInput };
+            RingerNoteInputs = new[] { RingerNoteOneInput, RingerNoteTwoInput, RingerNoteThreeInput, RingerNoteFourInput, RingerNoteFiveInput, RingerNoteSixInput };
 
             for (var i = 0; i < RingerNoteInputs.Length; ++i)
             {

Content.Client/Stylesheets/StyleNano.cs

@@ -162,6 +162,7 @@ public StyleNano(IResourceCache resCache) : base(resCache)
             var notoSansBold16 = resCache.NotoStack(variation: "Bold", size: 16);
             var notoSansBold18 = resCache.NotoStack(variation: "Bold", size: 18);
             var notoSansBold20 = resCache.NotoStack(variation: "Bold", size: 20);
+            var notoSansMono = resCache.GetFont("/EngineFonts/NotoSans/NotoSansMono-Regular.ttf", size: 12);
             var windowHeaderTex = resCache.GetTexture("/Textures/Interface/Nano/window_header.png");
             var windowHeader = new StyleBoxTexture
             {
@@ -512,6 +513,8 @@ public StyleNano(IResourceCache resCache) : base(resCache)
 
             Stylesheet = new Stylesheet(BaseRules.Concat(new[]
             {
+                Element().Class("monospace")
+                    .Prop("font", notoSansMono),
                 // Window title.
                 new StyleRule(
                     new SelectorElement(typeof(Label), new[] {DefaultWindow.StyleClassWindowTitle}, null, null),

Content.Client/Weapons/Ranged/Systems/GunSystem.cs

@@ -2,6 +2,7 @@
 using Content.Client.Items;
 using Content.Client.Weapons.Ranged.Components;
 using Content.Shared.Camera;
+using Content.Shared.CombatMode;
 using Content.Shared.Spawners.Components;
 using Content.Shared.Weapons.Ranged;
 using Content.Shared.Weapons.Ranged.Components;
@@ -126,7 +127,7 @@ public override void Update(float frameTime)
 
         var entityNull = _player.LocalPlayer?.ControlledEntity;
 
-        if (entityNull == null)
+        if (entityNull == null || !TryComp<CombatModeComponent>(entityNull, out var combat) || !combat.IsInCombatMode)
         {
             return;
         }

Content.IntegrationTests/PoolManager.cs

@@ -947,6 +947,10 @@ public PairTracker(TextWriter testOut)
         _testOut = testOut;
     }
 
+    // Convenience properties.
+    public RobustIntegrationTest.ServerIntegrationInstance Server => Pair.Server;
+    public RobustIntegrationTest.ClientIntegrationInstance Client => Pair.Client;
+
     private async Task OnDirtyDispose()
     {
         var usageTime = UsageWatch.Elapsed;
@@ -957,6 +961,10 @@ private async Task OnDirtyDispose()
         PoolManager.NoCheckReturn(Pair);
         var disposeTime = dirtyWatch.Elapsed;
         await _testOut.WriteLineAsync($"{nameof(DisposeAsync)}: Disposed pair {Pair.PairId} in {disposeTime.TotalMilliseconds} ms");
+
+        // Test pairs should only dirty dispose if they are failing. If they are not failing, this probably happened
+        // because someone forgot to clean-return the pair.
+        Assert.Warn("Test was dirty-disposed.");
     }
 
     private async Task OnCleanDispose()

Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs

@@ -1,4 +1,5 @@
 using Content.Server.Administration.Commands;
+using Content.Server.Administration.Systems;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
@@ -11,7 +12,7 @@
 namespace Content.IntegrationTests.Tests.Commands
 {
     [TestFixture]
-    [TestOf(typeof(RejuvenateCommand))]
+    [TestOf(typeof(RejuvenateSystem))]
     public sealed class RejuvenateTest
     {
         private const string Prototypes = @"
@@ -42,6 +43,7 @@ public async Task RejuvenateDeadTest()
             var prototypeManager = server.ResolveDependency<IPrototypeManager>();
             var mobStateSystem = entManager.EntitySysManager.GetEntitySystem<MobStateSystem>();
             var damSystem = entManager.EntitySysManager.GetEntitySystem<DamageableSystem>();
+            var rejuvenateSystem = entManager.EntitySysManager.GetEntitySystem<RejuvenateSystem>();
 
             await server.WaitAssertion(() =>
             {
@@ -78,7 +80,7 @@ await server.WaitAssertion(() =>
                 });
 
                 // Rejuvenate them
-                RejuvenateCommand.PerformRejuvenate(human);
+                rejuvenateSystem.PerformRejuvenate(human);
 
                 // Check that it is alive and with no damage
                 Assert.Multiple(() =>

Content.IntegrationTests/Tests/Interaction/InteractionTest.cs

@@ -233,9 +233,14 @@ await Server.WaitPost(() =>
     }
 
     [TearDown]
-    public virtual async Task Cleanup()
+    public async Task TearDownInternal()
     {
         await Server.WaitPost(() => MapMan.DeleteMap(MapId));
         await PairTracker.CleanReturnAsync();
+        await TearDown();
+    }
+
+    protected virtual async Task TearDown()
+    {
     }
 }

Content.IntegrationTests/Tests/Toolshed/AdminTest.cs

@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using System.Linq;
+using Robust.Shared.Toolshed;
+
+namespace Content.IntegrationTests.Tests.Toolshed;
+
+[TestFixture]
+public sealed class AdminTest : ToolshedTest
+{
+    [Test]
+    public async Task AllCommandsHavePermissions()
+    {
+        await Server.WaitAssertion(() =>
+        {
+            Assert.That(InvokeCommand("cmd:list where { acmd:perms isnull }", out var res));
+            var list = ((IEnumerable<CommandSpec>) res).ToList();
+            Assert.That(list, Is.Empty, "All commands must have admin permissions set up.");
+        });
+    }
+}