Audio System Rejig (#9635)

Content.Client/Audio/BackgroundAudioSystem.cs

@@ -1,24 +1,19 @@
-using System.Threading;
 using Content.Client.GameTicking.Managers;
 using Content.Client.Lobby;
 using Content.Client.Viewport;
-using Content.Shared;
-using Content.Shared.Audio;
 using Content.Shared.CCVar;
-using Content.Shared.Maps;
 using JetBrains.Annotations;
 using Robust.Client;
 using Robust.Client.Player;
 using Robust.Client.State;
 using Robust.Shared.Audio;
 using Robust.Shared.Configuration;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
+using System.Threading;
 using Timer = Robust.Shared.Timing.Timer;
 
 namespace Content.Client.Audio

Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs

@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using Content.Shared.IdentityManagement;
 using Robust.Client.GameObjects;
-using Robust.Shared.GameObjects;
+using System.Linq;
-using Robust.Shared.IoC;
 
 namespace Content.Client.ContextMenu.UI
 {

Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs

@@ -1,12 +1,8 @@
-using System;
-using Content.Shared.Sound;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
-using Robust.Shared.GameObjects;
+using Robust.Shared.Audio;
-using Robust.Shared.IoC;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.Manager.Attributes;
 using static Content.Shared.Disposal.Components.SharedDisposalUnitComponent;
 
 namespace Content.Client.Disposal.Visualizers

Content.Client/Examine/ExamineSystem.cs

@@ -1,5 +1,3 @@
-using System.Linq;
-using System.Threading;
 using Content.Client.Verbs;
 using Content.Shared.Examine;
 using Content.Shared.IdentityManagement;
@@ -14,6 +12,8 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Map;
 using Robust.Shared.Utility;
+using System.Linq;
+using System.Threading;
 using static Content.Shared.Interaction.SharedInteractionSystem;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
 

Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs

@@ -1,13 +1,13 @@
-using System.Text;
+using Content.Shared.Damage;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.UserInterface.XAML;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.Disease.Components;
 using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-using Content.Shared.Damage;
 using Content.Shared.IdentityManagement;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using System.Text;
 using static Content.Shared.MedicalScanner.SharedHealthAnalyzerComponent;
 
 namespace Content.Client.HealthAnalyzer.UI

Content.Client/IdentityManagement/IdentitySystem.cs

@@ -1,4 +1,4 @@
-using Content.Shared.IdentityManagement;
+using Content.Shared.IdentityManagement;
 
 namespace Content.Client.IdentityManagement;
 

Content.Client/Inventory/StrippableBoundUserInterface.cs

@@ -1,13 +1,8 @@
-using System.Collections.Generic;
 using Content.Client.Strip;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Strip.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
-using Robust.Shared.ViewVariables;
 
 namespace Content.Client.Inventory
 {

Content.Client/Items/UI/ItemStatusPanel.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using Content.Client.Items.Components;
 using Content.Client.Resources;
 using Content.Client.Stylesheets;
@@ -8,12 +6,8 @@ using Content.Shared.IdentityManagement;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using Robust.Shared.ViewVariables;
 using static Content.Client.IoC.StaticIoC;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
 

Content.Client/Kitchen/Components/MicrowaveComponent.cs

@@ -1,8 +1,5 @@
 using Content.Shared.Kitchen.Components;
-using Content.Shared.Sound;
 using Robust.Shared.Audio;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.Kitchen.Components
 {

Content.Client/Light/Visualizers/PoweredLightVisualizer.cs

@@ -1,14 +1,10 @@
-using System;
 using Content.Shared.Light;
-using Content.Shared.Sound;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Animations;
-using Robust.Shared.GameObjects;
+using Robust.Shared.Audio;
-using Robust.Shared.IoC;
 using Robust.Shared.Random;
-using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.Light.Visualizers
 {

Content.Client/Physics/Controllers/MoverController.cs

@@ -98,11 +98,6 @@ namespace Content.Client.Physics.Controllers
             HandleMobMovement(mover, body, xformMover, frameTime);
         }
 
-        protected override Filter GetSoundPlayers(EntityUid mover)
-        {
-            return Filter.Local();
-        }
-
         protected override bool CanSound()
         {
             return _timing.IsFirstTimePredicted && _timing.InSimulation;

Content.Client/Trigger/TimerTriggerVisualizer.cs

@@ -1,13 +1,9 @@
-using System;
-using Content.Shared.Sound;
 using Content.Shared.Trigger;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
-using Robust.Shared.GameObjects;
+using Robust.Shared.Audio;
-using Robust.Shared.IoC;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Client.Trigger
 {

Content.Server/AME/Components/AMEControllerComponent.cs

@@ -4,7 +4,6 @@ using Content.Server.Power.Components;
 using Content.Server.UserInterface;
 using Content.Shared.AME;
 using Content.Shared.Hands.EntitySystems;
-using Content.Shared.Sound;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;

Content.Server/AME/Components/AMEPartComponent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 

Content.Server/AirlockPainter/AirlockPainterComponent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.AirlockPainter
 {

Content.Server/AlertLevel/AlertLevelPrototype.cs

@@ -1,5 +1,4 @@
-using System.Collections.Specialized;
+using Robust.Shared.Audio;
-using Content.Shared.Sound;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.AlertLevel;

Content.Server/Animals/Components/EggLayerComponent.cs

@@ -1,7 +1,7 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 using Content.Shared.Actions.ActionTypes;
-using Content.Shared.Sound;
 using Content.Shared.Storage;
+using Robust.Shared.Audio;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 

Content.Server/Announcements/RoundAnnouncementPrototype.cs

@@ -1,5 +1,5 @@
 using Content.Server.GameTicking.Presets;
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 

Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs

@@ -1,7 +1,6 @@
 using Content.Server.Power.Components;
 using Content.Server.UserInterface;
 using Content.Shared.Arcade;
-using Content.Shared.Sound;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Player;

Content.Server/Atmos/Components/GasTankComponent.cs

@@ -1,6 +1,5 @@
 using Content.Shared.Actions.ActionTypes;
 using Content.Shared.Atmos;
-using Content.Shared.Sound;
 using Robust.Shared.Audio;
 
 namespace Content.Server.Atmos.Components

Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs

@@ -1,6 +1,6 @@
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Monitor;
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Server.Atmos.Monitor.Components

Content.Server/Atmos/Piping/Binary/Components/GasValveComponent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Atmos.Piping.Binary.Components
 {

Content.Server/Audio/ServerGlobalSoundSystem.cs

@@ -3,7 +3,6 @@ using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.Administration;
 using Content.Shared.Audio;
-using Content.Shared.Sound;
 using Robust.Server.Player;
 using Robust.Shared.Audio;
 using Robust.Shared.Console;

Content.Server/Bed/Sleep/SleepingSystem.cs

@@ -1,24 +1,23 @@
-using Content.Shared.Stunnable;
+using Content.Server.Actions;
-using Content.Shared.MobState.Components;
+using Content.Server.MobState;
+using Content.Server.Popups;
+using Content.Server.Sound.Components;
+using Content.Shared.Actions.ActionTypes;
+using Content.Shared.Audio;
 using Content.Shared.Bed.Sleep;
 using Content.Shared.Damage;
-using Content.Server.Actions;
-using Content.Shared.Actions.ActionTypes;
-using Robust.Shared.Prototypes;
-using Content.Shared.Sound;
-using Robust.Shared.Timing;
-using Content.Shared.MobState;
-using Content.Server.MobState;
-using Content.Server.Sound.Components;
-using Content.Shared.Verbs;
-using Content.Shared.Interaction;
-using Robust.Shared.Audio;
-using Robust.Shared.Player;
-using Content.Shared.Audio;
-using Content.Server.Popups;
 using Content.Shared.Examine;
 using Content.Shared.IdentityManagement;
+using Content.Shared.Interaction;
+using Content.Shared.MobState;
+using Content.Shared.MobState.Components;
+using Content.Shared.Stunnable;
+using Content.Shared.Verbs;
+using Robust.Shared.Audio;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using Robust.Shared.Timing;
 
 namespace Content.Server.Bed.Sleep
 {
@@ -57,11 +56,12 @@ namespace Content.Server.Bed.Sleep
                 EnsureComp<KnockedDownComponent>(uid);
 
                 var emitSound = EnsureComp<SpamEmitSoundComponent>(uid);
-                emitSound.Sound = new SoundCollectionSpecifier("Snores");
+
+                // TODO WTF is this, these should a data fields and not hard-coded. 
+                emitSound.Sound = new SoundCollectionSpecifier("Snores", AudioParams.Default.WithVariation(0.2f));
                 emitSound.PlayChance = 0.33f;
                 emitSound.RollInterval = 5f;
                 emitSound.PopUp = "sleep-onomatopoeia";
-                emitSound.PitchVariation = 0.2f;
 
                 if (wakeAction != null)
                 {

Content.Server/Bible/Components/BibleComponent.cs

@@ -1,5 +1,5 @@
 using Content.Shared.Damage;
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Bible.Components
 {

Content.Server/Body/Components/BloodstreamComponent.cs

@@ -1,10 +1,10 @@
 using Content.Server.Body.Systems;
+using Content.Server.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
-using Content.Server.Chemistry.EntitySystems;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Server.Body.Components

Content.Server/Body/Components/BodyComponent.cs

@@ -2,7 +2,6 @@ using Content.Shared.Audio;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Part;
 using Content.Shared.Random.Helpers;
-using Content.Shared.Sound;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.Player;

Content.Server/Body/Systems/BodyReassembleSystem.cs

@@ -1,4 +1,3 @@
-using System.Threading;
 using Content.Server.Body.Components;
 using Content.Server.Cloning;
 using Content.Server.DoAfter;
@@ -13,6 +12,7 @@ using Content.Shared.Species;
 using Content.Shared.Verbs;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
+using System.Threading;
 
 /// <remarks>
 /// Fair warning, this is all kinda shitcode, but it'll have to wait for a major

Content.Server/Buckle/Components/BuckleComponent.cs

@@ -1,10 +1,10 @@
-using System.Diagnostics.CodeAnalysis;
 using Content.Server.Hands.Components;
 using Content.Server.Pulling;
 using Content.Shared.ActionBlocker;
-using Content.Shared.Vehicle.Components;
 using Content.Shared.Alert;
+using Content.Shared.Bed.Sleep;
 using Content.Shared.Buckle.Components;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.MobState.Components;
 using Content.Shared.MobState.EntitySystems;
@@ -12,13 +12,12 @@ using Content.Shared.Popups;
 using Content.Shared.Pulling.Components;
 using Content.Shared.Standing;
 using Content.Shared.Stunnable;
-using Robust.Server.GameObjects;
+using Content.Shared.Vehicle.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
-using Content.Shared.IdentityManagement;
+using System.Diagnostics.CodeAnalysis;
-using Content.Shared.Bed.Sleep;
 
 namespace Content.Server.Buckle.Components
 {

Content.Server/Buckle/Components/StrapComponent.cs

@@ -2,7 +2,7 @@ using System.Linq;
 using Content.Shared.Alert;
 using Content.Shared.Buckle.Components;
 using Content.Shared.DragDrop;
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 using Robust.Shared.Serialization;
 
 

Content.Server/Cabinet/ItemCabinetComponent.cs

@@ -1,5 +1,5 @@
 using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Cabinet
 {

Content.Server/Cargo/Components/CargoOrderConsoleComponent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Cargo.Components
 {

Content.Server/Cargo/Components/CargoShuttleConsoleComponent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Cargo.Components;
 

Content.Server/Cargo/Components/CargoTelepadComponent.cs

@@ -2,7 +2,7 @@ using Content.Server.Cargo.Systems;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Components;
 using Content.Shared.MachineLinking;
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 

Content.Server/Chat/Systems/ChatSystem.cs

@@ -18,7 +18,6 @@ using Content.Shared.Chat;
 using Content.Shared.Database;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Inventory;
-using Content.Shared.Sound;
 using Robust.Server.Player;
 using Robust.Shared.Audio;
 using Robust.Shared.Configuration;

Content.Server/Chemistry/Components/ChemMasterComponent.cs

@@ -6,7 +6,6 @@ using Content.Shared.Chemistry.Components;
 using Content.Shared.FixedPoint;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Popups;
-using Content.Shared.Sound;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 

Content.Server/Chemistry/Components/HyposprayComponent.cs

@@ -1,4 +1,3 @@
-using System.Diagnostics.CodeAnalysis;
 using Content.Server.Chemistry.Components.SolutionManager;
 using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Interaction.Components;
@@ -9,9 +8,9 @@ using Content.Shared.FixedPoint;
 using Content.Shared.IdentityManagement;
 using Content.Shared.MobState.Components;
 using Content.Shared.Popups;
-using Content.Shared.Sound;
 using Robust.Shared.Audio;
 using Robust.Shared.Player;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Content.Server.Chemistry.Components
 {

Content.Server/Chemistry/Components/ReagentDispenserComponent.cs

@@ -5,7 +5,6 @@ using Content.Server.UserInterface;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Dispenser;
 using Content.Shared.FixedPoint;
-using Content.Shared.Sound;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;

Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs

@@ -1,4 +1,3 @@
-using System.Threading;
 using Content.Server.Body.Components;
 using Content.Server.Chemistry.Components;
 using Content.Server.Chemistry.Components.SolutionManager;
@@ -15,6 +14,7 @@ using Content.Shared.Interaction.Events;
 using Content.Shared.MobState.Components;
 using Robust.Shared.GameStates;
 using Robust.Shared.Player;
+using System.Threading;
 
 namespace Content.Server.Chemistry.EntitySystems;
 

Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs

@@ -4,7 +4,6 @@ using Content.Server.Coordinates.Helpers;
 using Content.Shared.Audio;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
-using Content.Shared.Sound;
 using JetBrains.Annotations;
 using Robust.Shared.Audio;
 using Robust.Shared.Map;

Content.Server/Chemistry/ReactionEffects/FoamAreaReactionEffect.cs

@@ -2,7 +2,6 @@
 using Content.Server.Coordinates.Helpers;
 using Content.Shared.Audio;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Sound;
 using JetBrains.Annotations;
 using Robust.Shared.Audio;
 using Robust.Shared.Map;

Content.Server/Cloning/Components/CloningPodComponent.cs

@@ -7,7 +7,6 @@ using Content.Shared.CharacterAppearance.Systems;
 using Content.Shared.Cloning;
 using Content.Shared.MobState.Components;
 using Content.Shared.Popups;
-using Content.Shared.Sound;
 using Content.Shared.Species;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;

Content.Server/Communications/CommunicationsConsoleComponent.cs

@@ -1,7 +1,7 @@
 using Content.Server.UserInterface;
 using Content.Shared.Communications;
-using Content.Shared.Sound;
 using Robust.Server.GameObjects;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Communications
 {

Content.Server/Construction/Completions/PlaySound.cs

@@ -1,5 +1,4 @@
 using Content.Shared.Construction;
-using Content.Shared.Sound;
 using JetBrains.Annotations;
 using Robust.Shared.Audio;
 using Robust.Shared.Player;

Content.Server/Crayon/CrayonComponent.cs

@@ -1,7 +1,7 @@
 using Content.Server.UserInterface;
 using Content.Shared.Crayon;
-using Content.Shared.Sound;
 using Robust.Server.GameObjects;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Crayon
 {

Content.Server/Cuffs/Components/HandcuffComponent.cs

@@ -5,7 +5,6 @@ using Content.Server.Hands.Components;
 using Content.Shared.Cuffs.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
-using Content.Shared.Sound;
 using Content.Shared.Stunnable;
 using Robust.Shared.Audio;
 using Robust.Shared.Player;

Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs

@@ -1,5 +1,5 @@
 using Content.Shared.Damage;
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Damage.Components
 {

Content.Server/Damage/Components/StaminaDamageOnHitComponent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Damage.Components;
 

Content.Server/Damage/Events/StaminaDamageOnHitAttemptEvent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Damage.Events;
 

Content.Server/Damage/Systems/StaminaSystem.cs

@@ -5,7 +5,6 @@ using Content.Server.Weapon.Melee;
 using Content.Shared.Alert;
 using Content.Shared.Rounding;
 using Content.Shared.Stunnable;
-using Content.Shared.Sound;
 using Robust.Shared.Collections;
 using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.Player;

Content.Server/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs

@@ -1,5 +1,4 @@
 using Content.Shared.Audio;
-using Content.Shared.Sound;
 using Robust.Shared.Audio;
 using Robust.Shared.Player;
 

Content.Server/DeviceNetwork/Components/NetworkConfiguratorComponent.cs

@@ -1,5 +1,5 @@
 using Content.Server.DeviceNetwork.Systems;
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.DeviceNetwork.Components;
 

Content.Server/Dice/DiceComponent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Dice
 {

Content.Server/Disease/Cures/DiseaseBedrestCure.cs

@@ -1,7 +1,7 @@
-using Content.Shared.Disease;
-using Content.Server.Buckle.Components;
 using Content.Server.Bed.Components;
+using Content.Server.Buckle.Components;
 using Content.Shared.Bed.Sleep;
+using Content.Shared.Disease;
 
 namespace Content.Server.Disease.Cures
 {

Content.Server/Disease/Effects/DiseasePolymorph.cs

@@ -1,10 +1,8 @@
 using Content.Server.Polymorph.Systems;
 using Content.Shared.Audio;
 using Content.Shared.Disease;
-using Content.Shared.Disease.Components;
 using Content.Shared.Polymorph;
 using Content.Shared.Popups;
-using Content.Shared.Sound;
 using JetBrains.Annotations;
 using Robust.Shared.Audio;
 using Robust.Shared.Player;

Content.Server/Disease/Effects/DiseaseSnough.cs

@@ -1,6 +1,5 @@
 using Content.Shared.Disease;
 using JetBrains.Annotations;
-using Content.Shared.Sound;
 using Content.Shared.Audio;
 using Robust.Shared.Audio;
 using Robust.Shared.Player;

Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs

@@ -1,7 +1,6 @@
 using System.Text;
 using Content.Server.Disposal.Unit.Components;
 using Content.Server.UserInterface;
-using Content.Shared.Sound;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Physics;

Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs

@@ -1,6 +1,5 @@
 using Content.Server.Disposal.Unit.Components;
 using Content.Server.UserInterface;
-using Content.Shared.Sound;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Physics;

Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs

@@ -4,7 +4,7 @@ using Content.Server.Disposal.Unit.EntitySystems;
 using Content.Shared.Construction.Components;
 using Content.Shared.Disposal.Components;
 using Content.Shared.Popups;
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.Physics;
 

Content.Server/Doors/Components/AirlockComponent.cs

@@ -2,7 +2,6 @@ using System.Threading;
 using Content.Server.Power.Components;
 // using Content.Server.WireHacking;
 using Content.Shared.Doors.Components;
-using Content.Shared.Sound;
 using Robust.Shared.Audio;
 using Robust.Shared.Player;
 // using static Content.Shared.Wires.SharedWiresComponent;

Content.Server/Doors/Systems/DoorSystem.cs

@@ -3,27 +3,24 @@ using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Construction;
 using Content.Server.Construction.Components;
-using Content.Server.Tools;
 using Content.Server.Doors.Components;
+using Content.Server.Tools;
+using Content.Server.Tools.Systems;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
+using Content.Shared.Database;
 using Content.Shared.Doors;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
 using Content.Shared.Emag.Systems;
 using Content.Shared.Interaction;
-using Content.Shared.Tag;
+using Content.Shared.Tools.Components;
+using Content.Shared.Verbs;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.Player;
 using System.Linq;
-using System.Threading;
-using Content.Server.Tools.Systems;
-using Content.Shared.Database;
-using Content.Shared.Sound;
-using Content.Shared.Tools.Components;
-using Content.Shared.Verbs;
 
 namespace Content.Server.Doors.Systems;
 

Content.Server/Dragon/DragonComponent.cs

@@ -3,7 +3,6 @@ using Robust.Shared.Containers;
 using System.Threading;
 using Content.Shared.Actions;
 using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Sound;
 using Content.Shared.Storage;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio;

Content.Server/Electrocution/Components/ElectrifiedComponent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Electrocution
 {

Content.Server/Explosion/Components/ActiveTimerTriggerComponent.cs

@@ -1,4 +1,3 @@
-using Content.Shared.Sound;
 using Robust.Shared.Audio;
 
 namespace Content.Server.Explosion.Components;

Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs

@@ -1,4 +1,3 @@
-using Content.Shared.Sound;
 using Robust.Shared.Audio;
 
 namespace Content.Server.Explosion.Components

Content.Server/Explosion/EntitySystems/TriggerSystem.cs

@@ -9,7 +9,6 @@ using Robust.Shared.Audio;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.Player;
-using Content.Shared.Sound;
 using Content.Shared.Trigger;
 using Content.Shared.Database;
 using Content.Shared.Explosion;

Content.Server/Extinguisher/FireExtinguisherComponent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Extinguisher;
 

Content.Server/Flash/Components/FlashComponent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Flash.Components
 {

Content.Server/Flash/FlashSystem.cs

@@ -10,7 +10,6 @@ using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory;
 using Content.Shared.Physics;
 using Content.Shared.Popups;
-using Content.Shared.Sound;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Player;

Content.Server/Fluids/Components/AbsorbentComponent.cs

@@ -1,6 +1,6 @@
 using Content.Server.Fluids.EntitySystems;
 using Content.Shared.FixedPoint;
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Fluids.Components;
 

Content.Server/Fluids/Components/PuddleComponent.cs

@@ -1,6 +1,6 @@
 using Content.Server.Fluids.EntitySystems;
 using Content.Shared.FixedPoint;
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Fluids.Components
 {

Content.Server/Fluids/Components/SprayComponent.cs

@@ -1,6 +1,6 @@
 using Content.Server.Fluids.EntitySystems;
 using Content.Shared.FixedPoint;
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 

Content.Server/Fluids/EntitySystems/MoppingSystem.cs

@@ -6,7 +6,6 @@ using Content.Shared.Chemistry.Components;
 using Content.Shared.FixedPoint;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
-using Content.Shared.Sound;
 using Content.Shared.Tag;
 using Robust.Shared.Audio;
 using Robust.Shared.Player;

Content.Server/GameTicking/GameTicker.LobbyMusic.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Audio;
+using Robust.Shared.Audio;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 

Content.Server/GameTicking/GameTicker.RoundFlow.cs

@@ -1,5 +1,3 @@
-using System.Linq;
-using System.Threading.Tasks;
 using Content.Server.Announcements;
 using Content.Server.GameTicking.Events;
 using Content.Server.Ghost;
@@ -10,7 +8,6 @@ using Content.Shared.CCVar;
 using Content.Shared.Coordinates;
 using Content.Shared.GameTicking;
 using Content.Shared.Preferences;
-using Content.Shared.Sound;
 using JetBrains.Annotations;
 using Prometheus;
 using Robust.Server.Maps;
@@ -21,6 +18,8 @@ using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace Content.Server.GameTicking
 {

Content.Server/GameTicking/Rules/Configurations/StationEventRuleConfiguration.cs

@@ -1,5 +1,5 @@
-using Content.Shared.Sound;
+using JetBrains.Annotations;
-using JetBrains.Annotations;
+using Robust.Shared.Audio;
 
 namespace Content.Server.GameTicking.Rules.Configurations;
 

Content.Server/GameTicking/Rules/SuspicionRuleSystem.cs

@@ -16,7 +16,6 @@ using Content.Shared.GameTicking;
 using Content.Shared.Maps;
 using Content.Shared.MobState.Components;
 using Content.Shared.Roles;
-using Content.Shared.Sound;
 using Content.Shared.Suspicion;
 using Content.Shared.Traitor.Uplink;
 using Robust.Server.GameObjects;

Content.Server/GameTicking/Rules/TraitorRuleSystem.cs

@@ -9,7 +9,6 @@ using Content.Server.Traitor.Uplink.Account;
 using Content.Shared.CCVar;
 using Content.Shared.Dataset;
 using Content.Shared.Roles;
-using Content.Shared.Sound;
 using Content.Shared.Traitor.Uplink;
 using Robust.Server.Player;
 using Robust.Shared.Audio;

Content.Server/Gatherable/Components/GatheringToolComponent.cs

@@ -1,6 +1,6 @@
 using System.Threading;
 using Content.Shared.Damage;
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Gatherable.Components
 {

Content.Server/IdentityManagement/IdentitySystem.cs

@@ -1,4 +1,4 @@
-using Content.Server.Access.Systems;
+using Content.Server.Access.Systems;
 using Content.Server.Administration.Logs;
 using Content.Shared.CharacterAppearance.Components;
 using Content.Shared.Database;

Content.Server/ImmovableRod/ImmovableRodComponent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.ImmovableRod;
 

Content.Server/Interaction/Components/InteractionPopupComponent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Interaction.Components;
 

Content.Server/Interaction/InteractionPopupSystem.cs

@@ -1,13 +1,13 @@
-using Content.Server.Popups;
 using Content.Server.Interaction.Components;
+using Content.Server.Popups;
+using Content.Shared.Bed.Sleep;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.MobState.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.Player;
-using Robust.Shared.Timing;
 using Robust.Shared.Random;
-using Content.Shared.Bed.Sleep;
+using Robust.Shared.Timing;
 
 namespace Content.Server.Interaction;
 

Content.Server/Kitchen/Components/MicrowaveComponent.cs

@@ -9,7 +9,6 @@ using Content.Shared.FixedPoint;
 using Content.Shared.Kitchen;
 using Content.Shared.Kitchen.Components;
 using Content.Shared.Power;
-using Content.Shared.Sound;
 using Content.Shared.Tag;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;

Content.Server/Kitchen/Components/ReagentGrinderComponent.cs

@@ -1,7 +1,7 @@
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Kitchen.Components;
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 
 namespace Content.Server.Kitchen.Components

Content.Server/Lathe/Components/LatheComponent.cs

@@ -1,11 +1,11 @@
 using Content.Shared.Lathe;
 using Content.Shared.Research.Prototypes;
 using Robust.Server.GameObjects;
-using Content.Shared.Sound;
 using Content.Shared.Whitelist;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 using Content.Shared.Materials;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Lathe.Components
 {

Content.Server/Light/Components/LightBulbComponent.cs

@@ -1,6 +1,6 @@
 using Content.Server.Light.EntitySystems;
 using Content.Shared.Light;
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Light.Components
 {

Content.Server/Light/Components/LightReplacerComponent.cs

@@ -1,5 +1,5 @@
 using Content.Shared.Light;
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;

Content.Server/Light/Components/MatchstickComponent.cs

@@ -1,6 +1,6 @@
 using Content.Shared.Smoking;
-using Content.Shared.Sound;
 using Content.Server.Light.EntitySystems;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Light.Components
 {

Content.Server/Light/Components/PoweredLightComponent.cs

@@ -1,12 +1,12 @@
 using Content.Server.Light.EntitySystems;
 using Content.Shared.Damage;
 using Content.Shared.Light;
-using Content.Shared.Sound;
 using Robust.Shared.Containers;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Prototypes;
 using Content.Shared.MachineLinking;
 using System.Threading;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Light.Components
 {

Content.Server/Light/Components/UnpoweredFlashlightComponent.cs

@@ -1,5 +1,5 @@
 using Content.Shared.Actions.ActionTypes;
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Light.Components
 {

Content.Server/Lock/LockComponent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Storage.Components
 {

Content.Server/MachineLinking/Components/SignalSwitchComponent.cs

@@ -1,5 +1,5 @@
 using Content.Shared.MachineLinking;
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Server.MachineLinking.Components

Content.Server/Magic/Events/KnockSpellEvent.cs

@@ -1,5 +1,5 @@
 using Content.Shared.Actions;
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Magic.Events;
 

Content.Server/Magic/Events/ProjectileSpellEvent.cs

@@ -1,5 +1,5 @@
-using Content.Shared.Actions;
+using Content.Shared.Actions;
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 

Content.Server/Magic/Events/TeleportSpellEvent.cs

@@ -1,5 +1,5 @@
 using Content.Shared.Actions;
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Magic.Events;
 

Content.Server/Medical/Components/HealingComponent.cs

@@ -1,7 +1,7 @@
 using System.Threading;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Server.Medical.Components

Content.Server/Morgue/Components/CrematoriumComponent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 using System.Threading;
 
 namespace Content.Server.Morgue.Components;

Content.Server/Morgue/Components/MorgueComponent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Sound;
+using Robust.Shared.Audio;
 
 namespace Content.Server.Morgue.Components;
 

Content.Server/Nuke/NukeComponent.cs

@@ -2,7 +2,6 @@ using System.Threading;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Explosion;
 using Content.Shared.Nuke;
-using Content.Shared.Sound;
 using Robust.Shared.Audio;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;