Merge branch 'Fansana:master' into bell-collar-fix

Mnemotechnician · Aug 23, 2024 · 6b69782 · 6b69782
2 parents d59f698 + 2fbea60
commit 6b69782
Show file tree

Hide file tree

Showing 682 changed files with 13,409 additions and 1,161 deletions.
diff --git a/Content.Client/Actions/ActionsSystem.cs b/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);
         }

diff --git a/Content.Client/Announcements/Systems/AnnouncerSystem.cs b/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();
     }
 }
diff --git a/Content.Client/Options/UI/Tabs/AudioTab.xaml b/Content.Client/Options/UI/Tabs/AudioTab.xaml
@@ -117,6 +117,9 @@
                 <CheckBox Name="LobbyMusicCheckBox" Text="{Loc 'ui-options-lobby-music'}" />
                 <CheckBox Name="RestartSoundsCheckBox" Text="{Loc 'ui-options-restart-sounds'}" />
                 <CheckBox Name="EventMusicCheckBox" Text="{Loc 'ui-options-event-music'}" />
+                <CheckBox Name="AnnouncerDisableMultipleSoundsCheckBox"
+                    Text="{Loc 'ui-options-announcer-disable-multiple-sounds'}"
+                    ToolTip="{Loc 'ui-options-announcer-disable-multiple-sounds-tooltip'}" />
                 <CheckBox Name="AdminSoundsCheckBox" Text="{Loc 'ui-options-admin-sounds'}" />
             </BoxContainer>
         </BoxContainer>

diff --git a/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs b/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
@@ -30,97 +30,89 @@ public AudioTab()
 
             ApplyButton.OnPressed += OnApplyButtonPressed;
             ResetButton.OnPressed += OnResetButtonPressed;
-            MasterVolumeSlider.OnValueChanged += OnMasterVolumeSliderChanged;
-            MidiVolumeSlider.OnValueChanged += OnMidiVolumeSliderChanged;
-            AmbientMusicVolumeSlider.OnValueChanged += OnAmbientMusicVolumeSliderChanged;
-            AmbienceVolumeSlider.OnValueChanged += OnAmbienceVolumeSliderChanged;
-            AmbienceSoundsSlider.OnValueChanged += OnAmbienceSoundsSliderChanged;
-            LobbyVolumeSlider.OnValueChanged += OnLobbyVolumeSliderChanged;
-            InterfaceVolumeSlider.OnValueChanged += OnInterfaceVolumeSliderChanged;
-            AnnouncerVolumeSlider.OnValueChanged += OnAnnouncerVolumeSliderChanged;
-            LobbyMusicCheckBox.OnToggled += OnLobbyMusicCheckToggled;
-            RestartSoundsCheckBox.OnToggled += OnRestartSoundsCheckToggled;
-            EventMusicCheckBox.OnToggled += OnEventMusicCheckToggled;
-            AdminSoundsCheckBox.OnToggled += OnAdminSoundsCheckToggled;
+
+            AttachUpdateChangesHandler(
+                MasterVolumeSlider,
+                MidiVolumeSlider,
+                AmbientMusicVolumeSlider,
+                AmbienceVolumeSlider,
+                AmbienceSoundsSlider,
+                LobbyVolumeSlider,
+                InterfaceVolumeSlider,
+                AnnouncerVolumeSlider,
+
+                LobbyMusicCheckBox,
+                RestartSoundsCheckBox,
+                EventMusicCheckBox,
+                AnnouncerDisableMultipleSoundsCheckBox,
+                AdminSoundsCheckBox
+            );
 
             AmbienceSoundsSlider.MinValue = _cfg.GetCVar(CCVars.MinMaxAmbientSourcesConfigured);
             AmbienceSoundsSlider.MaxValue = _cfg.GetCVar(CCVars.MaxMaxAmbientSourcesConfigured);
 
             Reset();
+            return;
+
+            void AttachUpdateChangesHandler(params Control[] controls)
+            {
+                foreach (var control in controls)
+                {
+                    switch (control)
+                    {
+                        case Slider slider:
+                            slider.OnValueChanged += _ => UpdateChanges();
+                            break;
+                        case CheckBox checkBox:
+                            checkBox.OnToggled += _ => UpdateChanges();
+                            break;
+                    }
+                }
+            }
         }
 
         protected override void Dispose(bool disposing)
         {
             ApplyButton.OnPressed -= OnApplyButtonPressed;
             ResetButton.OnPressed -= OnResetButtonPressed;
-            MasterVolumeSlider.OnValueChanged -= OnMasterVolumeSliderChanged;
-            MidiVolumeSlider.OnValueChanged -= OnMidiVolumeSliderChanged;
-            AmbientMusicVolumeSlider.OnValueChanged -= OnAmbientMusicVolumeSliderChanged;
-            AmbienceVolumeSlider.OnValueChanged -= OnAmbienceVolumeSliderChanged;
-            LobbyVolumeSlider.OnValueChanged -= OnLobbyVolumeSliderChanged;
-            InterfaceVolumeSlider.OnValueChanged -= OnInterfaceVolumeSliderChanged;
-            AnnouncerVolumeSlider.OnValueChanged -= OnAnnouncerVolumeSliderChanged;
-            base.Dispose(disposing);
-        }
-
-        private void OnLobbyVolumeSliderChanged(Range obj)
-        {
-            UpdateChanges();
-        }
-
-        private void OnInterfaceVolumeSliderChanged(Range obj)
-        {
-            UpdateChanges();
-        }
-
-        private void OnAmbientMusicVolumeSliderChanged(Range obj)
-        {
-            UpdateChanges();
-        }
-
-        private void OnAmbienceVolumeSliderChanged(Range obj)
-        {
-            UpdateChanges();
-        }
-
-        private void OnAmbienceSoundsSliderChanged(Range obj)
-        {
-            UpdateChanges();
-        }
 
-        private void OnMasterVolumeSliderChanged(Range range)
-        {
-            _audio.SetMasterGain(MasterVolumeSlider.Value / 100f * ContentAudioSystem.MasterVolumeMultiplier);
-            UpdateChanges();
-        }
-
-        private void OnMidiVolumeSliderChanged(Range range)
-        {
-            UpdateChanges();
-        }
-
-        private void OnAnnouncerVolumeSliderChanged(Range range)
-        {
-            UpdateChanges();
-        }
+            DetachUpdateChangesHandler(
+                MasterVolumeSlider,
+                MidiVolumeSlider,
+                AmbientMusicVolumeSlider,
+                AmbienceVolumeSlider,
+                AmbienceSoundsSlider,
+                LobbyVolumeSlider,
+                InterfaceVolumeSlider,
+                AnnouncerVolumeSlider,
+
+                LobbyMusicCheckBox,
+                RestartSoundsCheckBox,
+                EventMusicCheckBox,
+                AnnouncerDisableMultipleSoundsCheckBox,
+                AdminSoundsCheckBox
+            );
 
-        private void OnLobbyMusicCheckToggled(BaseButton.ButtonEventArgs args)
-        {
-            UpdateChanges();
-        }
-        private void OnRestartSoundsCheckToggled(BaseButton.ButtonEventArgs args)
-        {
-            UpdateChanges();
-        }
-        private void OnEventMusicCheckToggled(BaseButton.ButtonEventArgs args)
-        {
-            UpdateChanges();
+            base.Dispose(disposing);
+            return;
+
+            void DetachUpdateChangesHandler(params Control[] controls)
+            {
+                foreach (var control in controls)
+                {
+                    switch (control)
+                    {
+                        case Slider slider:
+                            slider.OnValueChanged -= _ => UpdateChanges();
+                            break;
+                        case CheckBox checkBox:
+                            checkBox.OnToggled -= _ => UpdateChanges();
+                            break;
+                    }
+                }
+            }
         }
 
-        private void OnAdminSoundsCheckToggled(BaseButton.ButtonEventArgs args)
-        {
-            UpdateChanges();
-        }
 
         private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
         {
@@ -139,6 +131,7 @@ private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
             _cfg.SetCVar(CCVars.LobbyMusicEnabled, LobbyMusicCheckBox.Pressed);
             _cfg.SetCVar(CCVars.RestartSoundsEnabled, RestartSoundsCheckBox.Pressed);
             _cfg.SetCVar(CCVars.EventMusicEnabled, EventMusicCheckBox.Pressed);
+            _cfg.SetCVar(CCVars.AnnouncerDisableMultipleSounds, AnnouncerDisableMultipleSoundsCheckBox.Pressed);
             _cfg.SetCVar(CCVars.AdminSoundsEnabled, AdminSoundsCheckBox.Pressed);
             _cfg.SaveToFile();
             UpdateChanges();
@@ -164,6 +157,7 @@ private void Reset()
             LobbyMusicCheckBox.Pressed = _cfg.GetCVar(CCVars.LobbyMusicEnabled);
             RestartSoundsCheckBox.Pressed = _cfg.GetCVar(CCVars.RestartSoundsEnabled);
             EventMusicCheckBox.Pressed = _cfg.GetCVar(CCVars.EventMusicEnabled);
+            AnnouncerDisableMultipleSoundsCheckBox.Pressed = _cfg.GetCVar(CCVars.AnnouncerDisableMultipleSounds);
             AdminSoundsCheckBox.Pressed = _cfg.GetCVar(CCVars.AdminSoundsEnabled);
             UpdateChanges();
         }
@@ -190,10 +184,12 @@ private void UpdateChanges()
             var isLobbySame = LobbyMusicCheckBox.Pressed == _cfg.GetCVar(CCVars.LobbyMusicEnabled);
             var isRestartSoundsSame = RestartSoundsCheckBox.Pressed == _cfg.GetCVar(CCVars.RestartSoundsEnabled);
             var isEventSame = EventMusicCheckBox.Pressed == _cfg.GetCVar(CCVars.EventMusicEnabled);
+            var isAnnouncerDisableMultipleSoundsSame = AnnouncerDisableMultipleSoundsCheckBox.Pressed == _cfg.GetCVar(CCVars.AnnouncerDisableMultipleSounds);
             var isAdminSoundsSame = AdminSoundsCheckBox.Pressed == _cfg.GetCVar(CCVars.AdminSoundsEnabled);
             var isEverythingSame = isMasterVolumeSame && isMidiVolumeSame && isAmbientVolumeSame
                 && isAmbientMusicVolumeSame && isAmbientSoundsSame && isLobbySame && isRestartSoundsSame && isEventSame
-                && isAdminSoundsSame && isLobbyVolumeSame && isInterfaceVolumeSame && isAnnouncerVolumeSame;
+                && isAnnouncerDisableMultipleSoundsSame && isAdminSoundsSame && isLobbyVolumeSame
+                && isInterfaceVolumeSame && isAnnouncerVolumeSame;
             ApplyButton.Disabled = isEverythingSame;
             ResetButton.Disabled = isEverythingSame;
             MasterVolumeLabel.Text =

diff --git a/.../Nyanotrasen/Overlays/DogVisionOverlay.cs → Content.Client/Overlays/DogVisionOverlay.cs b/.../Nyanotrasen/Overlays/DogVisionOverlay.cs → Content.Client/Overlays/DogVisionOverlay.cs
@@ -2,9 +2,9 @@
 using Robust.Client.Player;
 using Robust.Shared.Enums;
 using Robust.Shared.Prototypes;
-using Content.Shared.Abilities;
+using Content.Shared.Traits.Assorted.Components;
 
-namespace Content.Client.Nyanotrasen.Overlays;
+namespace Content.Client.Overlays;
 
 public sealed partial class DogVisionOverlay : Overlay
 {
@@ -23,22 +23,27 @@ public DogVisionOverlay()
         _dogVisionShader = _prototypeManager.Index<ShaderPrototype>("DogVision").Instance().Duplicate();
     }
 
+    protected override bool BeforeDraw(in OverlayDrawArgs args)
+    {
+        if (_playerManager.LocalEntity is not { Valid: true } player
+            || !_entityManager.HasComponent<DogVisionComponent>(player))
+            return false;
+
+        return base.BeforeDraw(in args);
+    }
+
     protected override void Draw(in OverlayDrawArgs args)
     {
-        if (ScreenTexture == null)
+        if (ScreenTexture is null)
             return;
-        if (_playerManager.LocalPlayer?.ControlledEntity is not {Valid: true} player)
-            return;
-        if (!_entityManager.HasComponent<DogVisionComponent>(player))
-            return;
-
-        _dogVisionShader?.SetParameter("SCREEN_TEXTURE", ScreenTexture);
 
+        _dogVisionShader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
 
         var worldHandle = args.WorldHandle;
         var viewport = args.WorldBounds;
         worldHandle.SetTransform(Matrix3.Identity);
         worldHandle.UseShader(_dogVisionShader);
         worldHandle.DrawRect(viewport, Color.White);
+        worldHandle.UseShader(null);
     }
 }