Merge branch 'Vault-Overseers:master' into master

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,8 +1,8 @@
 ---
-name: Request a Feature
-about: "Template for noting future planned features. Please ask for approval in the Discord if you aren't an organization Member before posting a feature request"
+name: Request a feature
+about: "Please outline your request in Discord first if you aren't a maintainer."
 title: ''
-labels: ''
+labels: ["Type: Feature"]
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/issue_report.md

@@ -1,8 +1,8 @@
 ---
-name: Report an Issue
-about: "Any general issues you have during play or with the codebase"
+name: Report an issue
+about: "Any issues found in gameplay or the codebase"
 title: ''
-labels: ''
+labels: 'Type: Bug'
 assignees: ''
 
 ---

.github/workflows/changelog.yml

@@ -16,41 +16,40 @@ jobs:
     permissions:
       contents: write
     steps:
-      - name: Checkout Master
-        uses: actions/checkout@v3
-        with:
-          token: ${{ secrets.BOT_TOKEN }}
-          ref: "${{ vars.CHANGELOG_BRANCH }}"
+    - name: Checkout Master
+      uses: actions/checkout@v3
+      with:
+        token: ${{ secrets.BOT_TOKEN }}
+        ref: ${{ vars.CHANGELOG_BRANCH }}
 
-      - name: Setup Git
-        run: |
-          git config --global user.name "${{ vars.CHANGELOG_USER }}"
-          git config --global user.email "${{ vars.CHANGELOG_EMAIL }}"
-        shell: bash
+    - name: Setup Git
+      run: |
+        git config --global user.name "${{ vars.CHANGELOG_USER }}"
+        git config --global user.email "${{ vars.CHANGELOG_EMAIL }}"
+      shell: bash
 
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18.x
+    - name: Setup Node
+      uses: actions/setup-node@v3
+      with:
+        node-version: 18.x
 
-      - name: Install Dependencies
-        run: |
-          cd "Tools/changelogs"
-          npm install
-        shell: bash
-        continue-on-error: true
+    - name: Install Dependencies
+      run: |
+        cd "Tools/changelogs"
+        npm install
+      shell: bash
 
-      - name: Generate Changelog
-        run: |
-          cd "Tools/changelogs"
-          node changelog.js
-        shell: bash
-        continue-on-error: true
+    - name: Generate Changelog
+      run: |
+        cd "Tools/changelogs"
+        node changelog.js
+      shell: bash
 
-      - name: Commit Changelog
-        run: |
-          git add *.yml
-          git commit -m "${{ vars.CHANGELOG_MESSAGE }} (#${{ env.PR_NUMBER }})"
-          git push
-        shell: bash
-        continue-on-error: true
+    - name: Commit Changelog
+      run: |
+        git pull origin master
+        git add *.yml
+        git commit -m "${{ vars.CHANGELOG_MESSAGE }} (#${{ env.PR_NUMBER }})"
+        git push
+      shell: bash
+      continue-on-error: true

.github/workflows/discord-changelog.yml

@@ -0,0 +1,24 @@
+name: Discord Changelog
+
+on:
+  workflow_dispatch:
+  schedule:
+  - cron: '0 6 * * *'
+
+jobs:
+  publish_changelog:
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: checkout
+      uses: actions/checkout@v3
+      with:
+        ref: master
+
+    - name: Publish changelog
+      run: Tools/actions_changelogs_since_last_run.py
+      env:
+        CHANGELOG_DIR: ${{ vars.CHANGELOG_DIR }}
+        CHANGELOG_WEBHOOK: ${{ secrets.CHANGELOG_WEBHOOK }}
+        GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
+    continue-on-error: true

.gitignore

@@ -309,3 +309,7 @@ Resources/MapImages
 
 # Changelog package lock
 package-lock.json
+/Resources/Prototypes/Entities/Mobs/Player/slime.yml
+/Resources/Prototypes/Guidebook
+/Resources/Prototypes/Loadouts
+/Resources/Prototypes/Catalog

Content.Benchmarks/SpawnEquipDeleteBenchmark.cs

@@ -58,7 +58,7 @@ await _pair.Server.WaitPost(() =>
             for (var i = 0; i < N; i++)
             {
                 _entity = server.EntMan.SpawnAttachedTo(Mob, _coords);
-                _spawnSys.EquipStartingGear(_entity, _gear, null);
+                _spawnSys.EquipStartingGear(_entity, _gear);
                 server.EntMan.DeleteEntity(_entity);
             }
         });

Content.Client/Actions/ActionsSystem.cs

@@ -65,6 +65,7 @@ private void OnEntityTargetHandleState(EntityUid uid, EntityTargetActionComponen
                 return;
 
             component.Whitelist = state.Whitelist;
+            component.Blacklist = state.Blacklist;
             component.CanTargetSelf = state.CanTargetSelf;
             BaseHandleState<EntityTargetActionComponent>(uid, component, state);
         }

Content.Client/Administration/Systems/AdminSystem.cs

@@ -10,16 +10,9 @@ public sealed partial class AdminSystem : EntitySystem
     {
         public event Action<List<PlayerInfo>>? PlayerListChanged;
 
-        private Dictionary<NetUserId, PlayerInfo>? _playerList;
-        public IReadOnlyList<PlayerInfo> PlayerList
-        {
-            get
-            {
-                if (_playerList != null) return _playerList.Values.ToList();
-
-                return new List<PlayerInfo>();
-            }
-        }
+        public Dictionary<NetUserId, PlayerInfo> PlayerInfos = new();
+        public IReadOnlyList<PlayerInfo> PlayerList =>
+            PlayerInfos != null ? PlayerInfos.Values.ToList() : new List<PlayerInfo>();
 
         public override void Initialize()
         {
@@ -40,15 +33,15 @@ private void OnPlayerInfoChanged(PlayerInfoChangedEvent ev)
         {
             if(ev.PlayerInfo == null) return;
 
-            if (_playerList == null) _playerList = new();
+            if (PlayerInfos == null) PlayerInfos = new();
 
-            _playerList[ev.PlayerInfo.SessionId] = ev.PlayerInfo;
-            PlayerListChanged?.Invoke(_playerList.Values.ToList());
+            PlayerInfos[ev.PlayerInfo.SessionId] = ev.PlayerInfo;
+            PlayerListChanged?.Invoke(PlayerInfos.Values.ToList());
         }
 
         private void OnPlayerListChanged(FullPlayerListEvent msg)
         {
-            _playerList = msg.PlayersInfo.ToDictionary(x => x.SessionId, x => x);
+            PlayerInfos = msg.PlayersInfo.ToDictionary(x => x.SessionId, x => x);
             PlayerListChanged?.Invoke(msg.PlayersInfo);
         }
     }

Content.Client/Administration/Systems/BwoinkSystem.cs

@@ -1,7 +1,10 @@
 #nullable enable
+using Content.Client.UserInterface.Systems.Bwoink;
 using Content.Shared.Administration;
 using JetBrains.Annotations;
+using Robust.Client.Audio;
 using Robust.Shared.Network;
+using Robust.Shared.Player;
 using Robust.Shared.Timing;
 
 namespace Content.Client.Administration.Systems
@@ -10,6 +13,8 @@ namespace Content.Client.Administration.Systems
     public sealed class BwoinkSystem : SharedBwoinkSystem
     {
         [Dependency] private readonly IGameTiming _timing = default!;
+        [Dependency] private readonly AudioSystem _audio = default!;
+        [Dependency] private readonly AdminSystem _adminSystem = default!;
 
         public event EventHandler<BwoinkTextMessage>? OnBwoinkTextMessageRecieved;
         private (TimeSpan Timestamp, bool Typing) _lastTypingUpdateSent;
@@ -21,6 +26,10 @@ protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySes
 
         public void Send(NetUserId channelId, string text, bool playSound)
         {
+            var info = _adminSystem.PlayerInfos.GetValueOrDefault(channelId)?.Connected ?? true;
+            _audio.PlayGlobal(info ? AHelpUIController.AHelpSendSound : AHelpUIController.AHelpErrorSound,
+                Filter.Local(), false);
+
             // 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));
@@ -31,9 +40,7 @@ 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/AdminUIHelpers.cs

@@ -50,7 +50,7 @@ public static bool TryConfirm(Button button, Dictionary<Button, ConfirmationData
             button.Text = data.OriginalText;
         }, data.Cancellation.Token);
 
-        button.ModulateSelfOverride = StyleNano.ButtonColorCautionDefault;
+        button.ModulateSelfOverride = StyleNano.ButtonColorDangerDefault;
         button.Text = Loc.GetString("admin-player-actions-confirm");
         return false;
     }

Content.Client/Announcements/Systems/AnnouncerSystem.cs

@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Client.Audio;
 using Content.Shared.Announcements.Events;
 using Content.Shared.Announcements.Systems;
@@ -18,8 +19,8 @@ public sealed class AnnouncerSystem : SharedAnnouncerSystem
     [Dependency] private readonly IResourceCache _cache = default!;
     [Dependency] private readonly IAudioManager _audioManager = default!;
 
-    private IAudioSource? AnnouncerSource { get; set; }
-    private float AnnouncerVolume { get; set; }
+    public List<IAudioSource> AnnouncerSources { get; } = new();
+    public float AnnouncerVolume { get; private set; }
 
 
     public override void Initialize()
@@ -28,26 +29,42 @@ public override void Initialize()
 
         AnnouncerVolume = _config.GetCVar(CCVars.AnnouncerVolume) * 100f / ContentAudioSystem.AnnouncerMultiplier;
 
-        SubscribeNetworkEvent<AnnouncementSendEvent>(OnAnnouncementReceived);
         _config.OnValueChanged(CCVars.AnnouncerVolume, OnAnnouncerVolumeChanged);
+        _config.OnValueChanged(CCVars.AnnouncerDisableMultipleSounds, OnAnnouncerDisableMultipleSounds);
+
+        SubscribeNetworkEvent<AnnouncementSendEvent>(OnAnnouncementReceived);
     }
 
     public override void Shutdown()
     {
         base.Shutdown();
 
         _config.UnsubValueChanged(CCVars.AnnouncerVolume, OnAnnouncerVolumeChanged);
+        _config.UnsubValueChanged(CCVars.AnnouncerDisableMultipleSounds, OnAnnouncerDisableMultipleSounds);
     }
 
 
     private void OnAnnouncerVolumeChanged(float value)
     {
         AnnouncerVolume = value;
 
-        if (AnnouncerSource != null)
-            AnnouncerSource.Gain = AnnouncerVolume;
+        foreach (var source in AnnouncerSources)
+            source.Gain = AnnouncerVolume;
     }
 
+    private void OnAnnouncerDisableMultipleSounds(bool value)
+    {
+        if (!value)
+            return;
+
+        foreach (var audioSource in AnnouncerSources.ToList())
+        {
+            audioSource.Dispose();
+            AnnouncerSources.Remove(audioSource);
+        }
+    }
+
+
     private void OnAnnouncementReceived(AnnouncementSendEvent ev)
     {
         if (!ev.Recipients.Contains(_player.LocalSession!.UserId)
@@ -56,14 +73,28 @@ private void OnAnnouncementReceived(AnnouncementSendEvent ev)
             return;
 
         var source = _audioManager.CreateAudioSource(resource);
-        if (source != null)
+        if (source == null)
+            return;
+
+        source.Gain = AnnouncerVolume * SharedAudioSystem.VolumeToGain(ev.AudioParams.Volume);
+        source.Global = true;
+
+        if (_config.GetCVar(CCVars.AnnouncerDisableMultipleSounds))
+        {
+            foreach (var audioSource in AnnouncerSources.ToList())
+            {
+                audioSource.Dispose();
+                AnnouncerSources.Remove(audioSource);
+            }
+        }
+
+        foreach (var audioSource in AnnouncerSources.ToList().Where(audioSource => !audioSource.Playing))
         {
-            source.Gain = AnnouncerVolume * SharedAudioSystem.VolumeToGain(ev.AudioParams.Volume);
-            source.Global = true;
+            audioSource.Dispose();
+            AnnouncerSources.Remove(audioSource);
         }
 
-        AnnouncerSource?.Dispose();
-        AnnouncerSource = source;
-        AnnouncerSource?.StartPlaying();
+        AnnouncerSources.Add(source);
+        source.StartPlaying();
     }
 }