rbertoche
diff --git a/‎Content.Client/Audio/ClientAdminSoundSystem.cs‎
Lines changed: 51 additions & 0 deletions b/‎Content.Client/Audio/ClientAdminSoundSystem.cs‎
Lines changed: 51 additions & 0 deletions
diff --git a/‎Content.Client/Communications/UI/CommunicationsConsoleMenu.cs‎
Lines changed: 17 additions & 8 deletions b/‎Content.Client/Communications/UI/CommunicationsConsoleMenu.cs‎
Lines changed: 17 additions & 8 deletions
diff --git a/‎Content.Client/Content.Client.csproj‎
Lines changed: 0 additions & 1 deletion b/‎Content.Client/Content.Client.csproj‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎Content.Client/Effects/EffectVisualizerSystem.cs‎
Lines changed: 17 additions & 0 deletions b/‎Content.Client/Effects/EffectVisualizerSystem.cs‎
Lines changed: 17 additions & 0 deletions
diff --git a/‎Content.Client/Effects/EffectVisualsComponent.cs‎
Lines changed: 8 additions & 0 deletions b/‎Content.Client/Effects/EffectVisualsComponent.cs‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎Content.Client/EscapeMenu/UI/Tabs/AudioTab.xaml‎
Lines changed: 1 addition & 0 deletions b/‎Content.Client/EscapeMenu/UI/Tabs/AudioTab.xaml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎Content.Client/EscapeMenu/UI/Tabs/AudioTab.xaml.cs‎
Lines changed: 11 additions & 1 deletion b/‎Content.Client/EscapeMenu/UI/Tabs/AudioTab.xaml.cs‎
Lines changed: 11 additions & 1 deletion
diff --git a/‎Content.Client/EscapeMenu/UI/Tabs/KeyRebindTab.xaml.cs‎
Lines changed: 0 additions & 1 deletion b/‎Content.Client/EscapeMenu/UI/Tabs/KeyRebindTab.xaml.cs‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎Content.Client/Items/ItemStatusMessages.cs‎
Lines changed: 1 addition & 4 deletions b/‎Content.Client/Items/ItemStatusMessages.cs‎
Lines changed: 1 addition & 4 deletions
diff --git a/‎Content.Client/Light/EmergencyLightSystem.cs‎
Lines changed: 5 additions & 2 deletions b/‎Content.Client/Light/EmergencyLightSystem.cs‎
Lines changed: 5 additions & 2 deletions
@@ -0,0 +1,51 @@
+using Content.Shared.Audio;
+using Content.Shared.CCVar;
+using Robust.Shared.Audio;
+using Robust.Shared.Configuration;
+using Robust.Shared.Player;
+
+namespace Content.Client.Audio;
+
+public sealed class ClientAdminSoundSystem : SharedAdminSoundSystem
+{
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    
+    private bool _adminAudioEnabled = true;
+    private List<IPlayingAudioStream?> _adminAudio = new(1);
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeNetworkEvent<AdminSoundEvent>(PlayAdminSound);
+        _cfg.OnValueChanged(CCVars.AdminSoundsEnabled, ToggleAdminSound, true);
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+        foreach (var stream in _adminAudio)
+        {
+            stream?.Stop();
+        }
+        _adminAudio.Clear();
+    }
+
+    private void PlayAdminSound(AdminSoundEvent soundEvent)
+    {
+        if(!_adminAudioEnabled) return;
+
+        var stream = SoundSystem.Play(Filter.Local(), soundEvent.Filename, soundEvent.AudioParams);
+        _adminAudio.Add(stream);
+    }
+
+    private void ToggleAdminSound(bool enabled)
+    {
+        _adminAudioEnabled = enabled;
+        if (_adminAudioEnabled) return;
+        foreach (var stream in _adminAudio)
+        {
+            stream?.Stop();
+        }
+        _adminAudio.Clear();
+    }
+}
@@ -95,20 +95,29 @@ public void UpdateAlertLevels(List<string>? alerts, string currentAlert)
 
             if (alerts == null)
             {
-                AlertLevelButton.AddItem(Loc.GetString($"alert-level-{currentAlert}"));
+                var name = currentAlert;
+                if (Loc.TryGetString($"alert-level-{currentAlert}", out var locName))
+                {
+                    name = locName;
+                }
+                AlertLevelButton.AddItem(name);
                 AlertLevelButton.SetItemMetadata(AlertLevelButton.ItemCount - 1, currentAlert);
             }
             else
             {
                 foreach (var alert in alerts)
                 {
-                     AlertLevelButton.AddItem(Loc.GetString($"alert-level-{alert}"));
-                     AlertLevelButton.SetItemMetadata(AlertLevelButton.ItemCount - 1, alert);
-
-                     if (alert == currentAlert)
-                     {
-                         AlertLevelButton.Select(AlertLevelButton.ItemCount - 1);
-                     }
+                    var name = alert;
+                    if (Loc.TryGetString($"alert-level-{alert}", out var locName))
+                    {
+                        name = locName;
+                    }
+                    AlertLevelButton.AddItem(name);
+                    AlertLevelButton.SetItemMetadata(AlertLevelButton.ItemCount - 1, alert);
+                    if (alert == currentAlert)
+                    {
+                        AlertLevelButton.Select(AlertLevelButton.ItemCount - 1);
+                    }
                 }
             }
         }
 
@@ -23,7 +23,6 @@
     <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
     <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
   </ItemGroup>
-
   <Import Project="..\RobustToolbox\MSBuild\XamlIL.targets" />
   <Import Project="..\RobustToolbox\MSBuild\Robust.Analyzers.targets" />
 </Project>
@@ -0,0 +1,17 @@
+using Robust.Client.Animations;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Effects;
+
+public sealed class EffectVisualizerSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<EffectVisualsComponent, AnimationCompletedEvent>(OnEffectAnimComplete);
+    }
+
+    private void OnEffectAnimComplete(EntityUid uid, EffectVisualsComponent component, AnimationCompletedEvent args)
+    {
+        QueueDel(uid);
+    }
+}
@@ -0,0 +1,8 @@
+namespace Content.Client.Effects;
+
+[RegisterComponent]
+public sealed class EffectVisualsComponent : Component
+{
+    public float Length;
+    public float Accumulator = 0f;
+}
@@ -63,6 +63,7 @@
                 </BoxContainer>
                 <Control MinSize="0 8" />
                 <CheckBox Name="LobbyMusicCheckBox" Text="{Loc 'ui-options-lobby-music'}" />
+                <CheckBox Name="AdminSoundsCheckBox" Text="{Loc 'ui-options-admin-sounds'}" />
                 <CheckBox Name="StationAmbienceCheckBox" Text="{Loc 'ui-options-station-ambience'}" />
                 <CheckBox Name="SpaceAmbienceCheckBox" Text="{Loc 'ui-options-space-ambience'}" />
             </BoxContainer>
 
@@ -22,6 +22,7 @@ public AudioTab()
             IoCManager.InjectDependencies(this);
 
             LobbyMusicCheckBox.Pressed = _cfg.GetCVar(CCVars.LobbyMusicEnabled);
+            AdminSoundsCheckBox.Pressed = _cfg.GetCVar(CCVars.AdminSoundsEnabled);
             StationAmbienceCheckBox.Pressed = _cfg.GetCVar(CCVars.StationAmbienceEnabled);
             SpaceAmbienceCheckBox.Pressed = _cfg.GetCVar(CCVars.SpaceAmbienceEnabled);
 
@@ -32,6 +33,7 @@ public AudioTab()
             AmbienceVolumeSlider.OnValueChanged += OnAmbienceVolumeSliderChanged;
             AmbienceSoundsSlider.OnValueChanged += OnAmbienceSoundsSliderChanged;
             LobbyMusicCheckBox.OnToggled += OnLobbyMusicCheckToggled;
+            AdminSoundsCheckBox.OnToggled += OnAdminSoundsCheckToggled;
             StationAmbienceCheckBox.OnToggled += OnStationAmbienceCheckToggled;
             SpaceAmbienceCheckBox.OnToggled += OnSpaceAmbienceCheckToggled;
 
@@ -77,6 +79,11 @@ private void OnLobbyMusicCheckToggled(BaseButton.ButtonEventArgs args)
             UpdateChanges();
         }
 
+        private void OnAdminSoundsCheckToggled(BaseButton.ButtonEventArgs args)
+        {
+            UpdateChanges();
+        }
+        
         private void OnStationAmbienceCheckToggled(BaseButton.ButtonEventArgs args)
         {
             UpdateChanges();
@@ -94,6 +101,7 @@ private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
             _cfg.SetCVar(CCVars.AmbienceVolume, LV100ToDB(AmbienceVolumeSlider.Value));
             _cfg.SetCVar(CCVars.MaxAmbientSources, (int)AmbienceSoundsSlider.Value);
             _cfg.SetCVar(CCVars.LobbyMusicEnabled, LobbyMusicCheckBox.Pressed);
+            _cfg.SetCVar(CCVars.AdminSoundsEnabled, AdminSoundsCheckBox.Pressed);
             _cfg.SetCVar(CCVars.StationAmbienceEnabled, StationAmbienceCheckBox.Pressed);
             _cfg.SetCVar(CCVars.SpaceAmbienceEnabled, SpaceAmbienceCheckBox.Pressed);
             _cfg.SaveToFile();
@@ -112,6 +120,7 @@ private void Reset()
             AmbienceVolumeSlider.Value = DBToLV100(_cfg.GetCVar(CCVars.AmbienceVolume));
             AmbienceSoundsSlider.Value = _cfg.GetCVar(CCVars.MaxAmbientSources);
             LobbyMusicCheckBox.Pressed = _cfg.GetCVar(CCVars.LobbyMusicEnabled);
+            AdminSoundsCheckBox.Pressed = _cfg.GetCVar(CCVars.AdminSoundsEnabled);
             StationAmbienceCheckBox.Pressed = _cfg.GetCVar(CCVars.StationAmbienceEnabled);
             SpaceAmbienceCheckBox.Pressed = _cfg.GetCVar(CCVars.SpaceAmbienceEnabled);
             UpdateChanges();
@@ -140,9 +149,10 @@ private void UpdateChanges()
                 Math.Abs(AmbienceVolumeSlider.Value - DBToLV100(_cfg.GetCVar(CCVars.AmbienceVolume))) < 0.01f;
             var isAmbientSoundsSame = (int)AmbienceSoundsSlider.Value == _cfg.GetCVar(CCVars.MaxAmbientSources);
             var isLobbySame = LobbyMusicCheckBox.Pressed == _cfg.GetCVar(CCVars.LobbyMusicEnabled);
+            var isAdminSoundsSame = AdminSoundsCheckBox.Pressed == _cfg.GetCVar(CCVars.AdminSoundsEnabled);
             var isStationAmbienceSame = StationAmbienceCheckBox.Pressed == _cfg.GetCVar(CCVars.StationAmbienceEnabled);
             var isSpaceAmbienceSame = SpaceAmbienceCheckBox.Pressed == _cfg.GetCVar(CCVars.SpaceAmbienceEnabled);
-            var isEverythingSame = isMasterVolumeSame && isMidiVolumeSame && isAmbientVolumeSame && isAmbientSoundsSame && isLobbySame && isStationAmbienceSame && isSpaceAmbienceSame;
+            var isEverythingSame = isMasterVolumeSame && isMidiVolumeSame && isAmbientVolumeSame && isAmbientSoundsSame && isLobbySame && isAdminSoundsSame && isStationAmbienceSame && isSpaceAmbienceSame;
             ApplyButton.Disabled = isEverythingSame;
             ResetButton.Disabled = isEverythingSame;
             MasterVolumeLabel.Text =
 
@@ -114,7 +114,6 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(ContentKeyFunctions.Drop);
             AddButton(ContentKeyFunctions.ExamineEntity);
             AddButton(ContentKeyFunctions.SwapHands);
-            AddButton(ContentKeyFunctions.Fart);
 
             AddHeader("ui-options-header-interaction-adv");
             AddButton(ContentKeyFunctions.SmartEquipBackpack);
 
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Robust.Client.UserInterface;
-using Robust.Shared.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Items
 {
 
@@ -13,10 +13,11 @@ namespace Content.Client.Light
 {
     public sealed class EmergencyLightSystem : SharedEmergencyLightSystem
     {
+        private const float DegreesPerSecond = 270;
         private static Animation Animation =>
             new()
             {
-                Length = TimeSpan.FromSeconds(4),
+                Length = TimeSpan.FromSeconds(360f/ DegreesPerSecond),
                 AnimationTracks =
                 {
                     new AnimationTrackComponentProperty
@@ -27,7 +28,9 @@ public sealed class EmergencyLightSystem : SharedEmergencyLightSystem
                         KeyFrames =
                         {
                             new AnimationTrackProperty.KeyFrame(Angle.Zero, 0),
-                            new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(1080), 4)
+                            new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(120), 120f/DegreesPerSecond),
+                            new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(240), 120f/DegreesPerSecond),
+                            new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(360), 120f/DegreesPerSecond)
                         }
                     }
                 }
Original file line number	Diff line number	Diff line change
`@@ -95,20 +95,29 @@ public void UpdateAlertLevels(List<string>? alerts, string currentAlert)`
`95`	`95`
`96`	`96`	`if (alerts == null)`
`97`	`97`	`{`
`98`		`- AlertLevelButton.AddItem(Loc.GetString($"alert-level-{currentAlert}"));`
	`98`	`+ var name = currentAlert;`
	`99`	`+ if (Loc.TryGetString($"alert-level-{currentAlert}", out var locName))`
	`100`	`+ {`
	`101`	`+ name = locName;`
	`102`	`+ }`
	`103`	`+ AlertLevelButton.AddItem(name);`
`99`	`104`	`AlertLevelButton.SetItemMetadata(AlertLevelButton.ItemCount - 1, currentAlert);`
`100`	`105`	`}`
`101`	`106`	`else`
`102`	`107`	`{`
`103`	`108`	`foreach (var alert in alerts)`
`104`	`109`	`{`
`105`		`- AlertLevelButton.AddItem(Loc.GetString($"alert-level-{alert}"));`
`106`		`- AlertLevelButton.SetItemMetadata(AlertLevelButton.ItemCount - 1, alert);`
`107`		`-`
`108`		`- if (alert == currentAlert)`
`109`		`- {`
`110`		`- AlertLevelButton.Select(AlertLevelButton.ItemCount - 1);`
`111`		`- }`
	`110`	`+ var name = alert;`
	`111`	`+ if (Loc.TryGetString($"alert-level-{alert}", out var locName))`
	`112`	`+ {`
	`113`	`+ name = locName;`
	`114`	`+ }`
	`115`	`+ AlertLevelButton.AddItem(name);`
	`116`	`+ AlertLevelButton.SetItemMetadata(AlertLevelButton.ItemCount - 1, alert);`
	`117`	`+ if (alert == currentAlert)`
	`118`	`+ {`
	`119`	`+ AlertLevelButton.Select(AlertLevelButton.ItemCount - 1);`
	`120`	`+ }`
`112`	`121`	`}`
`113`	`122`	`}`
`114`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using Robust.Client.UserInterface;`
`4`		`-using Robust.Shared.GameObjects;`
	`1`	`+using Robust.Client.UserInterface;`
`5`	`2`
`6`	`3`	`namespace Content.Client.Items`
`7`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,11 @@ namespace Content.Client.Light`
`13`	`13`	`{`
`14`	`14`	`public sealed class EmergencyLightSystem : SharedEmergencyLightSystem`
`15`	`15`	`{`
	`16`	`+ private const float DegreesPerSecond = 270;`
`16`	`17`	`private static Animation Animation =>`
`17`	`18`	`new()`
`18`	`19`	`{`
`19`		`- Length = TimeSpan.FromSeconds(4),`
	`20`	`+ Length = TimeSpan.FromSeconds(360f/ DegreesPerSecond),`
`20`	`21`	`AnimationTracks =`
`21`	`22`	`{`
`22`	`23`	`new AnimationTrackComponentProperty`
`@@ -27,7 +28,9 @@ public sealed class EmergencyLightSystem : SharedEmergencyLightSystem`
`27`	`28`	`KeyFrames =`
`28`	`29`	`{`
`29`	`30`	`new AnimationTrackProperty.KeyFrame(Angle.Zero, 0),`
`30`		`- new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(1080), 4)`
	`31`	`+ new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(120), 120f/DegreesPerSecond),`
	`32`	`+ new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(240), 120f/DegreesPerSecond),`
	`33`	`+ new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(360), 120f/DegreesPerSecond)`
`31`	`34`	`}`
`32`	`35`	`}`
`33`	`36`	`}`