The great Einsteins Engineing

Content.Client/Audio/ContentAudioSystem.cs

@@ -29,7 +29,7 @@ public sealed partial class ContentAudioSystem : SharedContentAudioSystem
     public const float AmbientMusicMultiplier = 3f;
     public const float LobbyMultiplier = 3f;
     public const float InterfaceMultiplier = 2f;
-    public const float AnnouncerMultiplier = 3f;
+    public const float AnnouncerMultiplier = 3f; // Impstation Random Announcer System
 
     public override void Initialize()
     {

Content.Client/Options/UI/Tabs/AudioTab.xaml

@@ -13,7 +13,7 @@
                 <ui:OptionSlider Name="SliderVolumeAmbience" Title="{Loc 'ui-options-ambience-volume'}" />
                 <ui:OptionSlider Name="SliderVolumeLobby" Title="{Loc 'ui-options-lobby-volume'}" />
                 <ui:OptionSlider Name="SliderVolumeInterface" Title="{Loc 'ui-options-interface-volume'}" />
-                <ui:OptionSlider Name="SliderVolumeAnnouncer" Title="{Loc 'ui-options-announcer-volume'}" />
+                <ui:OptionSlider Name="SliderVolumeAnnouncer" Title="{Loc 'ui-options-announcer-volume'}" /> <!--Impstation Random Announcer System port-->
                 <ui:OptionSlider Name="SliderMaxAmbienceSounds" Title="{Loc 'ui-options-ambience-max-sounds'}"
                                  Margin="0 0 0 8" />
                 <CheckBox Name="LobbyMusicCheckBox" Text="{Loc 'ui-options-lobby-music'}" />

Content.Client/Options/UI/Tabs/AudioTab.xaml.cs

@@ -51,10 +51,10 @@ public AudioTab()
             SliderVolumeInterface,
             scale: ContentAudioSystem.InterfaceMultiplier);
 
-        Control.AddOptionPercentSlider(
+        Control.AddOptionPercentSlider( //Impstation Random Announcer System port start
             CCVars.AnnouncerVolume,
             SliderVolumeAnnouncer,
-            scale: ContentAudioSystem.AnnouncerMultiplier);
+            scale: ContentAudioSystem.AnnouncerMultiplier); //Impstation Random Announcer System port end
 
         Control.AddOptionSlider(
             CCVars.MaxAmbientSources,
@@ -65,7 +65,7 @@ public AudioTab()
         Control.AddOptionCheckBox(CCVars.LobbyMusicEnabled, LobbyMusicCheckBox);
         Control.AddOptionCheckBox(CCVars.RestartSoundsEnabled, RestartSoundsCheckBox);
         Control.AddOptionCheckBox(CCVars.EventMusicEnabled, EventMusicCheckBox);
-        Control.AddOptionCheckBox(CCVars.AnnouncerDisableMultipleSounds, AnnouncerDisableMultipleSoundsCheckBox);
+        Control.AddOptionCheckBox(CCVars.AnnouncerDisableMultipleSounds, AnnouncerDisableMultipleSoundsCheckBox); //Impstation Random Announcer System
         Control.AddOptionCheckBox(CCVars.AdminSoundsEnabled, AdminSoundsCheckBox);
 
         Control.Initialize();

Content.Client/Announcements/Systems/AnnouncerSystem.cs → Content.Client/_EE/Announcements/Systems/AnnouncerSystem.cs

@@ -1,7 +1,7 @@
 using System.Linq;
 using Content.Client.Audio;
-using Content.Shared.Announcements.Events;
-using Content.Shared.Announcements.Systems;
+using Content.Shared._EE.Announcements.Events;
+using Content.Shared._EE.Announcements.Systems;
 using Content.Shared.CCVar;
 using Robust.Client.Audio;
 using Robust.Client.Player;
@@ -10,7 +10,7 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 
-namespace Content.Client.Announcements.Systems;
+namespace Content.Client._EE.Announcements.Systems;
 
 public sealed class AnnouncerSystem : SharedAnnouncerSystem
 {

Content.IntegrationTests/Tests/Announcers/AnnouncerAudioTest.cs → Content.IntegrationTests/Tests/_EE/Announcers/AnnouncerAudioTest.cs

@@ -1,16 +1,16 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 using Content.Server.StationEvents;
-using Content.Shared.Announcements.Prototypes;
+using Content.Shared._EE.Announcements.Prototypes;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC.Exceptions;
 using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
 using Serilog;
 
-namespace Content.IntegrationTests.Tests.Announcers;
+namespace Content.IntegrationTests.Tests._EE.Announcers;
 
 /// <summary>
 ///     Checks if every station event using the announcerSystem has a valid audio file associated with it

Content.IntegrationTests/Tests/Announcers/AnnouncerFallbackTest.cs → Content.IntegrationTests/Tests/_EE/Announcers/AnnouncerFallbackTest.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Shared.Announcements.Prototypes;
+using Content.Shared._EE.Announcements.Prototypes;
 using Robust.Shared.Prototypes;
 
-namespace Content.IntegrationTests.Tests.Announcers;
+namespace Content.IntegrationTests.Tests._EE.Announcers;
 
 /// <summary>
 ///     Checks if every announcer has a fallback announcement

Content.IntegrationTests/Tests/Announcers/AnnouncerLocalizationTest.cs → Content.IntegrationTests/Tests/_EE/Announcers/AnnouncerLocalizationTest.cs

@@ -1,13 +1,13 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 using Content.Server.StationEvents;
-using Content.Shared.Announcements.Prototypes;
+using Content.Shared._EE.Announcements.Prototypes;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
 
-namespace Content.IntegrationTests.Tests.Announcers;
+namespace Content.IntegrationTests.Tests._EE.Announcers;
 
 /// <summary>
 ///     Checks if every station event wanting the announcerSystem to send messages has a localization string

Content.Server/Administration/UI/AdminAnnounceEui.cs

@@ -5,7 +5,7 @@
 using Content.Server.EUI;
 using Content.Shared.Administration;
 using Content.Shared.Eui;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 using Robust.Shared.Player;
 
 namespace Content.Server.Administration.UI
@@ -14,13 +14,13 @@ public sealed class AdminAnnounceEui : BaseEui
     {
         [Dependency] private readonly IAdminManager _adminManager = default!;
         [Dependency] private readonly IChatManager _chatManager = default!;
-        private readonly AnnouncerSystem _announcer;
+        private readonly AnnouncerSystem _announcer; // Impstation Random Announcer System
         private readonly ChatSystem _chatSystem;
 
         public AdminAnnounceEui()
         {
             IoCManager.InjectDependencies(this);
-            _announcer = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<AnnouncerSystem>();
+            _announcer = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<AnnouncerSystem>(); // Impstation Random Announcer System
             _chatSystem = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ChatSystem>();
         }
 
@@ -54,7 +54,7 @@ public override void HandleMessage(EuiMessageBase msg)
                             break;
                         // TODO: Per-station announcement support
                         case AdminAnnounceType.Station:
-                            _announcer.SendAnnouncement(_announcer.GetAnnouncementId("Announce"), Filter.Broadcast(),
+                            _announcer.SendAnnouncement(_announcer.GetAnnouncementId("Announce"), Filter.Broadcast(), // Impstation Random Announcer System
                                 doAnnounce.Announcement, doAnnounce.Announcer, Color.Gold);
                             break;
                     }

Content.Server/AlertLevel/AlertLevelSystem.cs

@@ -6,7 +6,7 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 
 namespace Content.Server.AlertLevel;
 
@@ -17,7 +17,7 @@ public sealed class AlertLevelSystem : EntitySystem
     [Dependency] private readonly ChatSystem _chatSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly StationSystem _stationSystem = default!;
-    [Dependency] private readonly AnnouncerSystem _announcer = default!;
+    [Dependency] private readonly AnnouncerSystem _announcer = default!; // Impstation Random Announcer System
 
     // Until stations are a prototype, this is how it's going to have to be.
     public const string DefaultAlertLevelSet = "stationAlerts";
@@ -179,4 +179,4 @@ public sealed class AlertLevelChangedEvent(EntityUid station, string alertLevel)
 {
     public EntityUid Station { get; } = station;
     public string AlertLevel { get; } = alertLevel;
-}
+} // Impstation Random Announcer System Port end

Content.Server/Announcements/AnnounceCommand.cs

@@ -1,8 +1,8 @@
 using System.Linq;
 using Content.Server.Administration;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 using Content.Shared.Administration;
-using Content.Shared.Announcements.Prototypes;
+using Content.Shared._EE.Announcements.Prototypes;
 using Robust.Shared.Console;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;

Content.Server/Chat/Systems/AnnounceOnSpawnSystem.cs

@@ -1,5 +1,5 @@
 using Content.Server.Chat;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 using Robust.Shared.Player;
 
 namespace Content.Server.Chat.Systems;

Content.Server/Communications/CommsHackerSystem.cs

@@ -9,7 +9,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 using Robust.Shared.Player;
 
 namespace Content.Server.Communications;

Content.Server/Communications/CommunicationsConsoleSystem.cs

@@ -21,7 +21,7 @@
 using Content.Shared.Popups;
 using Robust.Server.GameObjects;
 using Robust.Shared.Configuration;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 using Robust.Shared.Player;
 using Content.Server.Station.Components;
 

Content.Server/Dragon/DragonRiftSystem.cs

@@ -14,7 +14,7 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Utility;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 
 namespace Content.Server.Dragon;
 

Content.Server/GameTicking/GameTicker.RoundFlow.cs

@@ -21,7 +21,7 @@
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 
 namespace Content.Server.GameTicking
 {

Content.Server/GameTicking/Rules/ZombieRuleSystem.cs

@@ -18,7 +18,7 @@
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
 using System.Globalization;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 
 namespace Content.Server.GameTicking.Rules;
 

Content.Server/Nuke/NukeCodePaperSystem.cs

@@ -7,7 +7,7 @@
 using Content.Shared.Paper;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 using Robust.Shared.Player;
 
 namespace Content.Server.Nuke

Content.Server/Nuke/NukeSystem.cs

@@ -22,7 +22,7 @@
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 
 namespace Content.Server.Nuke;
 

Content.Server/NukeOps/WarDeclaratorSystem.cs

@@ -10,7 +10,7 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.Configuration;
 using Robust.Shared.Timing;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 using Robust.Shared.Player;
 
 namespace Content.Server.NukeOps;

Content.Server/PowerSink/PowerSinkSystem.cs

@@ -8,7 +8,7 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Content.Server.Power.EntitySystems;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 
 namespace Content.Server.PowerSink
 {

Content.Server/RoundEnd/RoundEndSystem.cs

@@ -22,7 +22,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Timer = Robust.Shared.Timing.Timer;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 
 namespace Content.Server.RoundEnd
 {

Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs

@@ -38,7 +38,7 @@
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 
 namespace Content.Server.Shuttles.Systems;
 

Content.Server/StationEvents/Events/AnomalySpawnRule.cs

@@ -2,7 +2,7 @@
 using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
 using Content.Shared.GameTicking.Components;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 using Robust.Shared.Player;
 
 namespace Content.Server.StationEvents.Events;

Content.Server/StationEvents/Events/BluespaceArtifactRule.cs

@@ -1,7 +1,7 @@
 using Content.Server.StationEvents.Components;
 using Content.Shared.GameTicking.Components;
 using Robust.Shared.Random;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 using Robust.Shared.Player;
 
 namespace Content.Server.StationEvents.Events;

Content.Server/StationEvents/Events/BreakerFlipRule.cs

@@ -4,7 +4,7 @@
 using Content.Shared.GameTicking.Components;
 using Content.Shared.Station.Components;
 using JetBrains.Annotations;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 using Robust.Shared.Player;
 
 namespace Content.Server.StationEvents.Events;

Content.Server/StationEvents/Events/CargoGiftsRule.cs

@@ -6,7 +6,7 @@
 using Content.Server.StationEvents.Components;
 using Content.Shared.GameTicking.Components;
 using Robust.Shared.Prototypes;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 using Robust.Shared.Player;
 
 namespace Content.Server.StationEvents.Events;

Content.Server/StationEvents/Events/FalseAlarmRule.cs

@@ -3,7 +3,7 @@
 using Content.Shared.GameTicking.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Random;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 using Robust.Shared.Player;
 
 namespace Content.Server.StationEvents.Events;

Content.Server/StationEvents/Events/MeteorSwarmSystem.cs

@@ -12,7 +12,7 @@
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 
 namespace Content.Server.StationEvents.Events;
 

Content.Server/StationEvents/Events/RandomSentienceRule.cs

@@ -3,7 +3,7 @@
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.StationEvents.Components;
 using Content.Shared.GameTicking.Components;
-using Content.Server.Announcements.Systems; // Impstation: RandomAnnouncerSystem Port from EE 
+using Content.Server._EE.Announcements.Systems; // Impstation: RandomAnnouncerSystem Port from EE 
 using Content.Server.Station.Components; // Impstation: RandomAnnouncerSystem Port from EE 
 
 namespace Content.Server.StationEvents.Events;

Content.Server/StationEvents/Events/StationEventSystem.cs

@@ -9,7 +9,7 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using Content.Server.Announcements.Systems;
+using Content.Server._EE.Announcements.Systems;
 using Robust.Shared.Player;
 using Content.Server.Station.Components;
 

Content.Server/Announcements/Systems/AnnouncerSystem.Announce.cs → Content.Server/_EE/Announcements/Systems/AnnouncerSystem.Announce.cs

@@ -1,10 +1,10 @@
 using System.Linq;
-using Content.Shared.Announcements.Events;
-using Content.Shared.Announcements.Prototypes;
+using Content.Shared._EE.Announcements.Events;
+using Content.Shared._EE.Announcements.Prototypes;
 using Robust.Shared.Audio;
 using Robust.Shared.Player;
 
-namespace Content.Server.Announcements.Systems;
+namespace Content.Server._EE.Announcements.Systems;
 
 public sealed partial class AnnouncerSystem
 {

Content.Server/Announcements/Systems/AnnouncerSystem.Announcer.cs → Content.Server/_EE/Announcements/Systems/AnnouncerSystem.Announcer.cs

@@ -1,12 +1,12 @@
 using System.Linq;
 using Content.Shared.GameTicking;
-using Content.Shared.Announcements.Prototypes;
+using Content.Shared._EE.Announcements.Prototypes;
 using Content.Shared.CCVar;
 using Content.Shared.Random;
 using Content.Shared.Random.Helpers;
 using Robust.Shared.Utility;
 
-namespace Content.Server.Announcements.Systems;
+namespace Content.Server._EE.Announcements.Systems;
 
 public sealed partial class AnnouncerSystem
 {