diff --git a/Content.Client/Audio/BackgroundAudioSystem.cs b/Content.Client/Audio/BackgroundAudioSystem.cs index b66d11b68e..1215560d7d 100644 --- a/Content.Client/Audio/BackgroundAudioSystem.cs +++ b/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 diff --git a/Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs b/Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs index 2609527a03..56f5f321e6 100644 --- a/Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs +++ b/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 Robust.Shared.IoC; +using System.Linq; namespace Content.Client.ContextMenu.UI { diff --git a/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs b/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs index 8a358275cc..e2d258cd85 100644 --- a/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs +++ b/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.IoC; +using Robust.Shared.Audio; using Robust.Shared.Serialization; -using Robust.Shared.Serialization.Manager.Attributes; using static Content.Shared.Disposal.Components.SharedDisposalUnitComponent; namespace Content.Client.Disposal.Visualizers diff --git a/Content.Client/Examine/ExamineSystem.cs b/Content.Client/Examine/ExamineSystem.cs index 1ffa008559..37483e135f 100644 --- a/Content.Client/Examine/ExamineSystem.cs +++ b/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; diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs index ca2e25b94d..35c6aa511d 100644 --- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs +++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs @@ -1,13 +1,13 @@ -using System.Text; -using Robust.Client.AutoGenerated; -using Robust.Client.UserInterface.CustomControls; -using Robust.Client.UserInterface.XAML; +using Content.Shared.Damage; 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 diff --git a/Content.Client/IdentityManagement/IdentitySystem.cs b/Content.Client/IdentityManagement/IdentitySystem.cs index 7a7c96010d..a43fc72084 100644 --- a/Content.Client/IdentityManagement/IdentitySystem.cs +++ b/Content.Client/IdentityManagement/IdentitySystem.cs @@ -1,4 +1,4 @@ -using Content.Shared.IdentityManagement; +using Content.Shared.IdentityManagement; namespace Content.Client.IdentityManagement; diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs index a2009d661e..3a8f4ee23e 100644 --- a/Content.Client/Inventory/StrippableBoundUserInterface.cs +++ b/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 { diff --git a/Content.Client/Items/UI/ItemStatusPanel.cs b/Content.Client/Items/UI/ItemStatusPanel.cs index 3cd1e01110..99d55445b4 100644 --- a/Content.Client/Items/UI/ItemStatusPanel.cs +++ b/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; diff --git a/Content.Client/Kitchen/Components/MicrowaveComponent.cs b/Content.Client/Kitchen/Components/MicrowaveComponent.cs index 50050a5235..7b666f9182 100644 --- a/Content.Client/Kitchen/Components/MicrowaveComponent.cs +++ b/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 { diff --git a/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs b/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs index 136114c312..ec19bd619e 100644 --- a/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs +++ b/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.IoC; +using Robust.Shared.Audio; using Robust.Shared.Random; -using Robust.Shared.Serialization.Manager.Attributes; namespace Content.Client.Light.Visualizers { diff --git a/Content.Client/Physics/Controllers/MoverController.cs b/Content.Client/Physics/Controllers/MoverController.cs index 51292f767b..aa899bea4e 100644 --- a/Content.Client/Physics/Controllers/MoverController.cs +++ b/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; diff --git a/Content.Client/Trigger/TimerTriggerVisualizer.cs b/Content.Client/Trigger/TimerTriggerVisualizer.cs index dcad6c361c..ba26ef2479 100644 --- a/Content.Client/Trigger/TimerTriggerVisualizer.cs +++ b/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.IoC; +using Robust.Shared.Audio; using Robust.Shared.Serialization; -using Robust.Shared.Serialization.Manager.Attributes; namespace Content.Client.Trigger { diff --git a/Content.Server/AME/Components/AMEControllerComponent.cs b/Content.Server/AME/Components/AMEControllerComponent.cs index cf9e01eec9..e9e8e274e7 100644 --- a/Content.Server/AME/Components/AMEControllerComponent.cs +++ b/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; diff --git a/Content.Server/AME/Components/AMEPartComponent.cs b/Content.Server/AME/Components/AMEPartComponent.cs index 19995d5b3c..925e2bc69e 100644 --- a/Content.Server/AME/Components/AMEPartComponent.cs +++ b/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; diff --git a/Content.Server/AirlockPainter/AirlockPainterComponent.cs b/Content.Server/AirlockPainter/AirlockPainterComponent.cs index 5a05d3433d..cd88795c12 100644 --- a/Content.Server/AirlockPainter/AirlockPainterComponent.cs +++ b/Content.Server/AirlockPainter/AirlockPainterComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.AirlockPainter { diff --git a/Content.Server/AlertLevel/AlertLevelPrototype.cs b/Content.Server/AlertLevel/AlertLevelPrototype.cs index 56a81e1697..a048a9d9f0 100644 --- a/Content.Server/AlertLevel/AlertLevelPrototype.cs +++ b/Content.Server/AlertLevel/AlertLevelPrototype.cs @@ -1,5 +1,4 @@ -using System.Collections.Specialized; -using Content.Shared.Sound; +using Robust.Shared.Audio; using Robust.Shared.Prototypes; namespace Content.Server.AlertLevel; diff --git a/Content.Server/Animals/Components/EggLayerComponent.cs b/Content.Server/Animals/Components/EggLayerComponent.cs index 84faa0ef27..a900c96947 100644 --- a/Content.Server/Animals/Components/EggLayerComponent.cs +++ b/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; diff --git a/Content.Server/Announcements/RoundAnnouncementPrototype.cs b/Content.Server/Announcements/RoundAnnouncementPrototype.cs index cc7ab3100c..68780886c7 100644 --- a/Content.Server/Announcements/RoundAnnouncementPrototype.cs +++ b/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; diff --git a/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs b/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs index aa93383678..fca97c2757 100644 --- a/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs +++ b/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; diff --git a/Content.Server/Atmos/Components/GasTankComponent.cs b/Content.Server/Atmos/Components/GasTankComponent.cs index c4ec400a47..fd4b599d4c 100644 --- a/Content.Server/Atmos/Components/GasTankComponent.cs +++ b/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 diff --git a/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs b/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs index 2356641817..a8c56439e6 100644 --- a/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs +++ b/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 diff --git a/Content.Server/Atmos/Piping/Binary/Components/GasValveComponent.cs b/Content.Server/Atmos/Piping/Binary/Components/GasValveComponent.cs index 9fba248f1a..40aea06dd4 100644 --- a/Content.Server/Atmos/Piping/Binary/Components/GasValveComponent.cs +++ b/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 { diff --git a/Content.Server/Audio/ServerGlobalSoundSystem.cs b/Content.Server/Audio/ServerGlobalSoundSystem.cs index 205058d7b5..47f4821e41 100644 --- a/Content.Server/Audio/ServerGlobalSoundSystem.cs +++ b/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; diff --git a/Content.Server/Bed/Sleep/SleepingSystem.cs b/Content.Server/Bed/Sleep/SleepingSystem.cs index f690d73d11..1c9f60e124 100644 --- a/Content.Server/Bed/Sleep/SleepingSystem.cs +++ b/Content.Server/Bed/Sleep/SleepingSystem.cs @@ -1,24 +1,23 @@ -using Content.Shared.Stunnable; -using Content.Shared.MobState.Components; +using Content.Server.Actions; +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(uid); var emitSound = EnsureComp(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) { diff --git a/Content.Server/Bible/Components/BibleComponent.cs b/Content.Server/Bible/Components/BibleComponent.cs index e0eb014db4..9683b1fa22 100644 --- a/Content.Server/Bible/Components/BibleComponent.cs +++ b/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 { diff --git a/Content.Server/Body/Components/BloodstreamComponent.cs b/Content.Server/Body/Components/BloodstreamComponent.cs index 4ac3cdbc6f..2b7f8cfef0 100644 --- a/Content.Server/Body/Components/BloodstreamComponent.cs +++ b/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 Content.Server.Chemistry.EntitySystems; +using Robust.Shared.Audio; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; namespace Content.Server.Body.Components diff --git a/Content.Server/Body/Components/BodyComponent.cs b/Content.Server/Body/Components/BodyComponent.cs index dabc189917..6014fbee23 100644 --- a/Content.Server/Body/Components/BodyComponent.cs +++ b/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; diff --git a/Content.Server/Body/Systems/BodyReassembleSystem.cs b/Content.Server/Body/Systems/BodyReassembleSystem.cs index 91a0f715d4..ff9858fb17 100644 --- a/Content.Server/Body/Systems/BodyReassembleSystem.cs +++ b/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; /// /// Fair warning, this is all kinda shitcode, but it'll have to wait for a major diff --git a/Content.Server/Buckle/Components/BuckleComponent.cs b/Content.Server/Buckle/Components/BuckleComponent.cs index 493767fd93..2b7dd9db52 100644 --- a/Content.Server/Buckle/Components/BuckleComponent.cs +++ b/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 Content.Shared.Bed.Sleep; +using System.Diagnostics.CodeAnalysis; namespace Content.Server.Buckle.Components { diff --git a/Content.Server/Buckle/Components/StrapComponent.cs b/Content.Server/Buckle/Components/StrapComponent.cs index fc89cf7926..97cdf70e96 100644 --- a/Content.Server/Buckle/Components/StrapComponent.cs +++ b/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; diff --git a/Content.Server/Cabinet/ItemCabinetComponent.cs b/Content.Server/Cabinet/ItemCabinetComponent.cs index 1f3ac9001c..127d2ef08c 100644 --- a/Content.Server/Cabinet/ItemCabinetComponent.cs +++ b/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 { diff --git a/Content.Server/Cargo/Components/CargoOrderConsoleComponent.cs b/Content.Server/Cargo/Components/CargoOrderConsoleComponent.cs index 8e1687427e..419f00793c 100644 --- a/Content.Server/Cargo/Components/CargoOrderConsoleComponent.cs +++ b/Content.Server/Cargo/Components/CargoOrderConsoleComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.Cargo.Components { diff --git a/Content.Server/Cargo/Components/CargoShuttleConsoleComponent.cs b/Content.Server/Cargo/Components/CargoShuttleConsoleComponent.cs index a7ff0185cf..e247b917a5 100644 --- a/Content.Server/Cargo/Components/CargoShuttleConsoleComponent.cs +++ b/Content.Server/Cargo/Components/CargoShuttleConsoleComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.Cargo.Components; diff --git a/Content.Server/Cargo/Components/CargoTelepadComponent.cs b/Content.Server/Cargo/Components/CargoTelepadComponent.cs index 1b946d1693..f05f5737c5 100644 --- a/Content.Server/Cargo/Components/CargoTelepadComponent.cs +++ b/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; diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs index 1cfadbeee1..33cb29a0da 100644 --- a/Content.Server/Chat/Systems/ChatSystem.cs +++ b/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; diff --git a/Content.Server/Chemistry/Components/ChemMasterComponent.cs b/Content.Server/Chemistry/Components/ChemMasterComponent.cs index 6d18eaaec7..ef21ceb17c 100644 --- a/Content.Server/Chemistry/Components/ChemMasterComponent.cs +++ b/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; diff --git a/Content.Server/Chemistry/Components/HyposprayComponent.cs b/Content.Server/Chemistry/Components/HyposprayComponent.cs index b87233f918..e5df7e75a2 100644 --- a/Content.Server/Chemistry/Components/HyposprayComponent.cs +++ b/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 { diff --git a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs index 7d1d129ab7..63309e481c 100644 --- a/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs +++ b/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; diff --git a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs index 761553bba7..fc835f76bf 100644 --- a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs +++ b/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; diff --git a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs index a55240b6d0..4221168f52 100644 --- a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs +++ b/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; diff --git a/Content.Server/Chemistry/ReactionEffects/FoamAreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/FoamAreaReactionEffect.cs index 4959384645..83004eb4dc 100644 --- a/Content.Server/Chemistry/ReactionEffects/FoamAreaReactionEffect.cs +++ b/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; diff --git a/Content.Server/Cloning/Components/CloningPodComponent.cs b/Content.Server/Cloning/Components/CloningPodComponent.cs index 819d654dbb..8b257cf236 100644 --- a/Content.Server/Cloning/Components/CloningPodComponent.cs +++ b/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; diff --git a/Content.Server/Communications/CommunicationsConsoleComponent.cs b/Content.Server/Communications/CommunicationsConsoleComponent.cs index 7b35a25288..cae9b2d850 100644 --- a/Content.Server/Communications/CommunicationsConsoleComponent.cs +++ b/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 { diff --git a/Content.Server/Construction/Completions/PlaySound.cs b/Content.Server/Construction/Completions/PlaySound.cs index 2efd405b5a..69f95ab456 100644 --- a/Content.Server/Construction/Completions/PlaySound.cs +++ b/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; diff --git a/Content.Server/Crayon/CrayonComponent.cs b/Content.Server/Crayon/CrayonComponent.cs index c63f4e472b..df2a2e406e 100644 --- a/Content.Server/Crayon/CrayonComponent.cs +++ b/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 { diff --git a/Content.Server/Cuffs/Components/HandcuffComponent.cs b/Content.Server/Cuffs/Components/HandcuffComponent.cs index 1909f7031c..28ee26245a 100644 --- a/Content.Server/Cuffs/Components/HandcuffComponent.cs +++ b/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; diff --git a/Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs b/Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs index 914d940ef3..3a0ddeccca 100644 --- a/Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs +++ b/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 { diff --git a/Content.Server/Damage/Components/StaminaDamageOnHitComponent.cs b/Content.Server/Damage/Components/StaminaDamageOnHitComponent.cs index 23b52197a4..84d2d8eb51 100644 --- a/Content.Server/Damage/Components/StaminaDamageOnHitComponent.cs +++ b/Content.Server/Damage/Components/StaminaDamageOnHitComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.Damage.Components; diff --git a/Content.Server/Damage/Events/StaminaDamageOnHitAttemptEvent.cs b/Content.Server/Damage/Events/StaminaDamageOnHitAttemptEvent.cs index 1564a7843d..a6e10b4172 100644 --- a/Content.Server/Damage/Events/StaminaDamageOnHitAttemptEvent.cs +++ b/Content.Server/Damage/Events/StaminaDamageOnHitAttemptEvent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.Damage.Events; diff --git a/Content.Server/Damage/Systems/StaminaSystem.cs b/Content.Server/Damage/Systems/StaminaSystem.cs index 9098b4c526..0076556c91 100644 --- a/Content.Server/Damage/Systems/StaminaSystem.cs +++ b/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; diff --git a/Content.Server/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs index 94c3a65480..42aae8250d 100644 --- a/Content.Server/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs +++ b/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; diff --git a/Content.Server/DeviceNetwork/Components/NetworkConfiguratorComponent.cs b/Content.Server/DeviceNetwork/Components/NetworkConfiguratorComponent.cs index 01fe35db92..563d2684f1 100644 --- a/Content.Server/DeviceNetwork/Components/NetworkConfiguratorComponent.cs +++ b/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; diff --git a/Content.Server/Dice/DiceComponent.cs b/Content.Server/Dice/DiceComponent.cs index 38639f5e2c..b0df9dc79a 100644 --- a/Content.Server/Dice/DiceComponent.cs +++ b/Content.Server/Dice/DiceComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.Dice { diff --git a/Content.Server/Disease/Cures/DiseaseBedrestCure.cs b/Content.Server/Disease/Cures/DiseaseBedrestCure.cs index ceb7455b81..2357a46fa0 100644 --- a/Content.Server/Disease/Cures/DiseaseBedrestCure.cs +++ b/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 { diff --git a/Content.Server/Disease/Effects/DiseasePolymorph.cs b/Content.Server/Disease/Effects/DiseasePolymorph.cs index 7e3e60a549..daf8f04bd5 100644 --- a/Content.Server/Disease/Effects/DiseasePolymorph.cs +++ b/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; diff --git a/Content.Server/Disease/Effects/DiseaseSnough.cs b/Content.Server/Disease/Effects/DiseaseSnough.cs index 8eea9af3ca..06fd93e782 100644 --- a/Content.Server/Disease/Effects/DiseaseSnough.cs +++ b/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; diff --git a/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs index 281690092b..d3294693fd 100644 --- a/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs +++ b/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; diff --git a/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs index 9df509d954..aab15f299a 100644 --- a/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs +++ b/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; diff --git a/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs index 90835dd790..ff60c107c7 100644 --- a/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs +++ b/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; diff --git a/Content.Server/Doors/Components/AirlockComponent.cs b/Content.Server/Doors/Components/AirlockComponent.cs index 48e4071af9..fdf683d589 100644 --- a/Content.Server/Doors/Components/AirlockComponent.cs +++ b/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; diff --git a/Content.Server/Doors/Systems/DoorSystem.cs b/Content.Server/Doors/Systems/DoorSystem.cs index 083524132d..e9640b5536 100644 --- a/Content.Server/Doors/Systems/DoorSystem.cs +++ b/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; diff --git a/Content.Server/Dragon/DragonComponent.cs b/Content.Server/Dragon/DragonComponent.cs index 3de7deff32..941a2ccf2f 100644 --- a/Content.Server/Dragon/DragonComponent.cs +++ b/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; diff --git a/Content.Server/Electrocution/Components/ElectrifiedComponent.cs b/Content.Server/Electrocution/Components/ElectrifiedComponent.cs index b328fd7497..0d2ed0a244 100644 --- a/Content.Server/Electrocution/Components/ElectrifiedComponent.cs +++ b/Content.Server/Electrocution/Components/ElectrifiedComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.Electrocution { diff --git a/Content.Server/Explosion/Components/ActiveTimerTriggerComponent.cs b/Content.Server/Explosion/Components/ActiveTimerTriggerComponent.cs index 118a579b6d..3edd308d4f 100644 --- a/Content.Server/Explosion/Components/ActiveTimerTriggerComponent.cs +++ b/Content.Server/Explosion/Components/ActiveTimerTriggerComponent.cs @@ -1,4 +1,3 @@ -using Content.Shared.Sound; using Robust.Shared.Audio; namespace Content.Server.Explosion.Components; diff --git a/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs b/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs index d8f7fba643..932a9680e9 100644 --- a/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs +++ b/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs @@ -1,4 +1,3 @@ -using Content.Shared.Sound; using Robust.Shared.Audio; namespace Content.Server.Explosion.Components diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs index 9627bfd8b9..17dc210a27 100644 --- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs +++ b/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; diff --git a/Content.Server/Extinguisher/FireExtinguisherComponent.cs b/Content.Server/Extinguisher/FireExtinguisherComponent.cs index 92008638bd..ba64da5a62 100644 --- a/Content.Server/Extinguisher/FireExtinguisherComponent.cs +++ b/Content.Server/Extinguisher/FireExtinguisherComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.Extinguisher; diff --git a/Content.Server/Flash/Components/FlashComponent.cs b/Content.Server/Flash/Components/FlashComponent.cs index 378b675ad3..53213f65d8 100644 --- a/Content.Server/Flash/Components/FlashComponent.cs +++ b/Content.Server/Flash/Components/FlashComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.Flash.Components { diff --git a/Content.Server/Flash/FlashSystem.cs b/Content.Server/Flash/FlashSystem.cs index 80f669df9e..94129e963a 100644 --- a/Content.Server/Flash/FlashSystem.cs +++ b/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; diff --git a/Content.Server/Fluids/Components/AbsorbentComponent.cs b/Content.Server/Fluids/Components/AbsorbentComponent.cs index 6b6bbc51b9..e536a22f58 100644 --- a/Content.Server/Fluids/Components/AbsorbentComponent.cs +++ b/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; diff --git a/Content.Server/Fluids/Components/PuddleComponent.cs b/Content.Server/Fluids/Components/PuddleComponent.cs index ff387225f3..bb0c8536f8 100644 --- a/Content.Server/Fluids/Components/PuddleComponent.cs +++ b/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 { diff --git a/Content.Server/Fluids/Components/SprayComponent.cs b/Content.Server/Fluids/Components/SprayComponent.cs index 80b0ba913c..8ba5f82d8c 100644 --- a/Content.Server/Fluids/Components/SprayComponent.cs +++ b/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; diff --git a/Content.Server/Fluids/EntitySystems/MoppingSystem.cs b/Content.Server/Fluids/EntitySystems/MoppingSystem.cs index 56f3dfb79a..86b49c9ce6 100644 --- a/Content.Server/Fluids/EntitySystems/MoppingSystem.cs +++ b/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; diff --git a/Content.Server/GameTicking/GameTicker.LobbyMusic.cs b/Content.Server/GameTicking/GameTicker.LobbyMusic.cs index 0054b94b48..a0294447eb 100644 --- a/Content.Server/GameTicking/GameTicker.LobbyMusic.cs +++ b/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; diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs index 807fec5816..d832f1a417 100644 --- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs +++ b/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 { diff --git a/Content.Server/GameTicking/Rules/Configurations/StationEventRuleConfiguration.cs b/Content.Server/GameTicking/Rules/Configurations/StationEventRuleConfiguration.cs index 7a73804acb..5fa0b28fe0 100644 --- a/Content.Server/GameTicking/Rules/Configurations/StationEventRuleConfiguration.cs +++ b/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; diff --git a/Content.Server/GameTicking/Rules/SuspicionRuleSystem.cs b/Content.Server/GameTicking/Rules/SuspicionRuleSystem.cs index d6b1388a3b..c60da5e71c 100644 --- a/Content.Server/GameTicking/Rules/SuspicionRuleSystem.cs +++ b/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; diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs index 2676b2dd5b..030e1c2300 100644 --- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs +++ b/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; diff --git a/Content.Server/Gatherable/Components/GatheringToolComponent.cs b/Content.Server/Gatherable/Components/GatheringToolComponent.cs index 14e9888d41..560c46eedc 100644 --- a/Content.Server/Gatherable/Components/GatheringToolComponent.cs +++ b/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 { diff --git a/Content.Server/IdentityManagement/IdentitySystem.cs b/Content.Server/IdentityManagement/IdentitySystem.cs index cd6cd80c37..65aa0364a1 100644 --- a/Content.Server/IdentityManagement/IdentitySystem.cs +++ b/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; diff --git a/Content.Server/ImmovableRod/ImmovableRodComponent.cs b/Content.Server/ImmovableRod/ImmovableRodComponent.cs index f8403b5ac8..5ef5b0e7c7 100644 --- a/Content.Server/ImmovableRod/ImmovableRodComponent.cs +++ b/Content.Server/ImmovableRod/ImmovableRodComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.ImmovableRod; diff --git a/Content.Server/Interaction/Components/InteractionPopupComponent.cs b/Content.Server/Interaction/Components/InteractionPopupComponent.cs index c543570392..0ebc9fe4f7 100644 --- a/Content.Server/Interaction/Components/InteractionPopupComponent.cs +++ b/Content.Server/Interaction/Components/InteractionPopupComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.Interaction.Components; diff --git a/Content.Server/Interaction/InteractionPopupSystem.cs b/Content.Server/Interaction/InteractionPopupSystem.cs index f643213ca3..563eabca6e 100644 --- a/Content.Server/Interaction/InteractionPopupSystem.cs +++ b/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; diff --git a/Content.Server/Kitchen/Components/MicrowaveComponent.cs b/Content.Server/Kitchen/Components/MicrowaveComponent.cs index 929dcdf100..60e2facc2c 100644 --- a/Content.Server/Kitchen/Components/MicrowaveComponent.cs +++ b/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; diff --git a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs index b33f2ae093..5d697ba2db 100644 --- a/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs +++ b/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 diff --git a/Content.Server/Lathe/Components/LatheComponent.cs b/Content.Server/Lathe/Components/LatheComponent.cs index 49fc2a1135..5902c31d28 100644 --- a/Content.Server/Lathe/Components/LatheComponent.cs +++ b/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 { diff --git a/Content.Server/Light/Components/LightBulbComponent.cs b/Content.Server/Light/Components/LightBulbComponent.cs index 6a72807f75..39b3025446 100644 --- a/Content.Server/Light/Components/LightBulbComponent.cs +++ b/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 { diff --git a/Content.Server/Light/Components/LightReplacerComponent.cs b/Content.Server/Light/Components/LightReplacerComponent.cs index cdcce09b2c..de10898dee 100644 --- a/Content.Server/Light/Components/LightReplacerComponent.cs +++ b/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; diff --git a/Content.Server/Light/Components/MatchstickComponent.cs b/Content.Server/Light/Components/MatchstickComponent.cs index 269c3ee8e9..65e5762907 100644 --- a/Content.Server/Light/Components/MatchstickComponent.cs +++ b/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 { diff --git a/Content.Server/Light/Components/PoweredLightComponent.cs b/Content.Server/Light/Components/PoweredLightComponent.cs index 49d7162fb1..6f68755186 100644 --- a/Content.Server/Light/Components/PoweredLightComponent.cs +++ b/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 { diff --git a/Content.Server/Light/Components/UnpoweredFlashlightComponent.cs b/Content.Server/Light/Components/UnpoweredFlashlightComponent.cs index 50ba53117b..72f057fb6a 100644 --- a/Content.Server/Light/Components/UnpoweredFlashlightComponent.cs +++ b/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 { diff --git a/Content.Server/Lock/LockComponent.cs b/Content.Server/Lock/LockComponent.cs index 158de6d8b2..bec563d9b7 100644 --- a/Content.Server/Lock/LockComponent.cs +++ b/Content.Server/Lock/LockComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.Storage.Components { diff --git a/Content.Server/MachineLinking/Components/SignalSwitchComponent.cs b/Content.Server/MachineLinking/Components/SignalSwitchComponent.cs index 5a00df5b7e..53723f82e4 100644 --- a/Content.Server/MachineLinking/Components/SignalSwitchComponent.cs +++ b/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 diff --git a/Content.Server/Magic/Events/KnockSpellEvent.cs b/Content.Server/Magic/Events/KnockSpellEvent.cs index 328651f54c..946fdf8b0a 100644 --- a/Content.Server/Magic/Events/KnockSpellEvent.cs +++ b/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; diff --git a/Content.Server/Magic/Events/ProjectileSpellEvent.cs b/Content.Server/Magic/Events/ProjectileSpellEvent.cs index 4867dc1407..396b0478eb 100644 --- a/Content.Server/Magic/Events/ProjectileSpellEvent.cs +++ b/Content.Server/Magic/Events/ProjectileSpellEvent.cs @@ -1,5 +1,5 @@ -using Content.Shared.Actions; -using Content.Shared.Sound; +using Content.Shared.Actions; +using Robust.Shared.Audio; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; diff --git a/Content.Server/Magic/Events/TeleportSpellEvent.cs b/Content.Server/Magic/Events/TeleportSpellEvent.cs index 8bbb027400..3d567d4a12 100644 --- a/Content.Server/Magic/Events/TeleportSpellEvent.cs +++ b/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; diff --git a/Content.Server/Medical/Components/HealingComponent.cs b/Content.Server/Medical/Components/HealingComponent.cs index 25dbf88cec..a48b372dd6 100644 --- a/Content.Server/Medical/Components/HealingComponent.cs +++ b/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 diff --git a/Content.Server/Morgue/Components/CrematoriumComponent.cs b/Content.Server/Morgue/Components/CrematoriumComponent.cs index b34e3f987f..a12d86c8dd 100644 --- a/Content.Server/Morgue/Components/CrematoriumComponent.cs +++ b/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; diff --git a/Content.Server/Morgue/Components/MorgueComponent.cs b/Content.Server/Morgue/Components/MorgueComponent.cs index 0327aae241..e1503dbb28 100644 --- a/Content.Server/Morgue/Components/MorgueComponent.cs +++ b/Content.Server/Morgue/Components/MorgueComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.Morgue.Components; diff --git a/Content.Server/Nuke/NukeComponent.cs b/Content.Server/Nuke/NukeComponent.cs index 503a50758e..f4036f7063 100644 --- a/Content.Server/Nuke/NukeComponent.cs +++ b/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; diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs index a44883d065..4519605aa2 100644 --- a/Content.Server/Nuke/NukeSystem.cs +++ b/Content.Server/Nuke/NukeSystem.cs @@ -14,7 +14,6 @@ using Content.Shared.Construction.Components; using Content.Shared.Containers.ItemSlots; using Content.Shared.Nuke; using Content.Shared.Popups; -using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.Player; diff --git a/Content.Server/Nutrition/Components/DrinkComponent.cs b/Content.Server/Nutrition/Components/DrinkComponent.cs index 2816ed5fb0..3815aa05ba 100644 --- a/Content.Server/Nutrition/Components/DrinkComponent.cs +++ b/Content.Server/Nutrition/Components/DrinkComponent.cs @@ -1,8 +1,8 @@ -using Content.Shared.Sound; using JetBrains.Annotations; using Content.Server.Nutrition.EntitySystems; using Content.Shared.FixedPoint; using System.Threading; +using Robust.Shared.Audio; namespace Content.Server.Nutrition.Components { diff --git a/Content.Server/Nutrition/Components/FoodComponent.cs b/Content.Server/Nutrition/Components/FoodComponent.cs index fb81025094..49946414bc 100644 --- a/Content.Server/Nutrition/Components/FoodComponent.cs +++ b/Content.Server/Nutrition/Components/FoodComponent.cs @@ -2,7 +2,7 @@ using System.Threading; using Content.Server.Chemistry.EntitySystems; using Content.Server.Nutrition.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; diff --git a/Content.Server/Nutrition/Components/SliceableFoodComponent.cs b/Content.Server/Nutrition/Components/SliceableFoodComponent.cs index 37efd0cdbf..26eb0f2d7b 100644 --- a/Content.Server/Nutrition/Components/SliceableFoodComponent.cs +++ b/Content.Server/Nutrition/Components/SliceableFoodComponent.cs @@ -1,5 +1,5 @@ using Content.Server.Nutrition.EntitySystems; -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.Nutrition.Components { diff --git a/Content.Server/Nutrition/Components/UtensilComponent.cs b/Content.Server/Nutrition/Components/UtensilComponent.cs index 139ed4d6b5..f90df1757c 100644 --- a/Content.Server/Nutrition/Components/UtensilComponent.cs +++ b/Content.Server/Nutrition/Components/UtensilComponent.cs @@ -1,5 +1,5 @@ using Content.Server.Nutrition.EntitySystems; -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.Nutrition.Components { diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs index 40887ae498..713cc2da4c 100644 --- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs @@ -1,4 +1,3 @@ -using System.Threading; using Content.Server.Body.Components; using Content.Server.Body.Systems; using Content.Server.Chemistry.EntitySystems; @@ -11,16 +10,17 @@ using Content.Shared.Body.Components; using Content.Shared.Chemistry.Reagent; using Content.Shared.Database; using Content.Shared.FixedPoint; +using Content.Shared.Hands.EntitySystems; +using Content.Shared.IdentityManagement; using Content.Shared.Interaction; +using Content.Shared.Interaction.Events; +using Content.Shared.Inventory; using Content.Shared.MobState.Components; using Content.Shared.Verbs; using Robust.Shared.Audio; using Robust.Shared.Player; using Robust.Shared.Utility; -using Content.Shared.Inventory; -using Content.Shared.Hands.EntitySystems; -using Content.Shared.IdentityManagement; -using Content.Shared.Interaction.Events; +using System.Threading; namespace Content.Server.Nutrition.EntitySystems { diff --git a/Content.Server/Paper/PaperSystem.cs b/Content.Server/Paper/PaperSystem.cs index 80ae4650b3..98eeaaf974 100644 --- a/Content.Server/Paper/PaperSystem.cs +++ b/Content.Server/Paper/PaperSystem.cs @@ -1,13 +1,12 @@ +using Content.Server.Popups; using Content.Server.UserInterface; using Content.Shared.Examine; -using Content.Shared.Paper; +using Content.Shared.IdentityManagement; using Content.Shared.Interaction; +using Content.Shared.Paper; using Content.Shared.Tag; using Robust.Server.GameObjects; -using Content.Server.Popups; -using Content.Shared.IdentityManagement; using Robust.Shared.Player; - using static Content.Shared.Paper.SharedPaperComponent; namespace Content.Server.Paper diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs index 8fc3787b93..fa8df2b07b 100644 --- a/Content.Server/Physics/Controllers/MoverController.cs +++ b/Content.Server/Physics/Controllers/MoverController.cs @@ -17,11 +17,6 @@ namespace Content.Server.Physics.Controllers private Dictionary> _shuttlePilots = new(); - protected override Filter GetSoundPlayers(EntityUid mover) - { - return Filter.Pvs(mover, entityManager: EntityManager).RemoveWhereAttachedEntity(o => o == mover); - } - protected override bool CanSound() { return true; diff --git a/Content.Server/Plants/Components/PottedPlantHideComponent.cs b/Content.Server/Plants/Components/PottedPlantHideComponent.cs index 0c31cdb534..93e6e138af 100644 --- a/Content.Server/Plants/Components/PottedPlantHideComponent.cs +++ b/Content.Server/Plants/Components/PottedPlantHideComponent.cs @@ -1,6 +1,6 @@ using Content.Server.Plants.Systems; using Content.Server.Storage.Components; -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.Plants.Components { diff --git a/Content.Server/PneumaticCannon/PneumaticCannonComponent.cs b/Content.Server/PneumaticCannon/PneumaticCannonComponent.cs index 5ec8a7055c..5916772c00 100644 --- a/Content.Server/PneumaticCannon/PneumaticCannonComponent.cs +++ b/Content.Server/PneumaticCannon/PneumaticCannonComponent.cs @@ -1,5 +1,5 @@ -using Content.Shared.Sound; -using Content.Shared.Tools; +using Content.Shared.Tools; +using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; diff --git a/Content.Server/Polymorph/Components/PolymorphOnCollideComponent.cs b/Content.Server/Polymorph/Components/PolymorphOnCollideComponent.cs index 6a137f3e3a..3cb322ea5a 100644 --- a/Content.Server/Polymorph/Components/PolymorphOnCollideComponent.cs +++ b/Content.Server/Polymorph/Components/PolymorphOnCollideComponent.cs @@ -1,6 +1,6 @@ -using Content.Shared.Polymorph; -using Content.Shared.Sound; +using Content.Shared.Polymorph; using Content.Shared.Whitelist; +using Robust.Shared.Audio; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; namespace Content.Server.Polymorph.Components; diff --git a/Content.Server/Polymorph/Systems/PolymorphableSystem.Collide.cs b/Content.Server/Polymorph/Systems/PolymorphableSystem.Collide.cs index 25a6ede9b1..894cb2c5a9 100644 --- a/Content.Server/Polymorph/Systems/PolymorphableSystem.Collide.cs +++ b/Content.Server/Polymorph/Systems/PolymorphableSystem.Collide.cs @@ -1,6 +1,5 @@ -using Content.Server.Polymorph.Components; +using Content.Server.Polymorph.Components; using Content.Shared.Projectiles; -using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.Physics.Dynamics; using Robust.Shared.Player; diff --git a/Content.Server/Power/Components/ApcComponent.cs b/Content.Server/Power/Components/ApcComponent.cs index 32613c11a1..df17b16703 100644 --- a/Content.Server/Power/Components/ApcComponent.cs +++ b/Content.Server/Power/Components/ApcComponent.cs @@ -1,7 +1,7 @@ using Content.Server.Power.EntitySystems; using Content.Server.Power.NodeGroups; using Content.Shared.APC; -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.Power.Components; diff --git a/Content.Server/Projectiles/Components/ProjectileComponent.cs b/Content.Server/Projectiles/Components/ProjectileComponent.cs index c54c7a2777..816f0dc6ce 100644 --- a/Content.Server/Projectiles/Components/ProjectileComponent.cs +++ b/Content.Server/Projectiles/Components/ProjectileComponent.cs @@ -1,6 +1,6 @@ using Content.Shared.Damage; using Content.Shared.Projectiles; -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.Projectiles.Components { diff --git a/Content.Server/RCD/Components/RCDComponent.cs b/Content.Server/RCD/Components/RCDComponent.cs index 5665e6ac6e..610726de0b 100644 --- a/Content.Server/RCD/Components/RCDComponent.cs +++ b/Content.Server/RCD/Components/RCDComponent.cs @@ -1,5 +1,5 @@ using System.Threading; -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.RCD.Components { diff --git a/Content.Server/Radiation/RadiationPulseComponent.cs b/Content.Server/Radiation/RadiationPulseComponent.cs index ee62b0eaea..34843b0ba7 100644 --- a/Content.Server/Radiation/RadiationPulseComponent.cs +++ b/Content.Server/Radiation/RadiationPulseComponent.cs @@ -1,5 +1,4 @@ using Content.Shared.Radiation; -using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.Player; using Robust.Shared.Random; diff --git a/Content.Server/Recycling/Components/RecyclerComponent.cs b/Content.Server/Recycling/Components/RecyclerComponent.cs index 455572e4ad..45e41b7552 100644 --- a/Content.Server/Recycling/Components/RecyclerComponent.cs +++ b/Content.Server/Recycling/Components/RecyclerComponent.cs @@ -1,5 +1,5 @@ using Content.Shared.Recycling; -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.Recycling.Components { diff --git a/Content.Server/Shuttles/Components/FTLComponent.cs b/Content.Server/Shuttles/Components/FTLComponent.cs index 7b8a9d13b4..5d102d1ef7 100644 --- a/Content.Server/Shuttles/Components/FTLComponent.cs +++ b/Content.Server/Shuttles/Components/FTLComponent.cs @@ -1,5 +1,4 @@ using Content.Shared.Shuttles.Systems; -using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.Map; @@ -41,11 +40,7 @@ public sealed class FTLComponent : Component [ViewVariables(VVAccess.ReadWrite), DataField("soundTravel")] public SoundSpecifier? TravelSound = new SoundPathSpecifier("/Audio/Effects/Shuttle/hyperspace_progress.ogg") { - Params = - { - Volume = -10, - Loop = true, - } + Params = AudioParams.Default.WithVolume(-3f).WithLoop(true) }; public IPlayingAudioStream? TravelStream; diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs index 98ccdb0b5c..a6e4709952 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs @@ -1,4 +1,3 @@ -using System.Diagnostics.CodeAnalysis; using Content.Server.Buckle.Components; using Content.Server.Doors.Components; using Content.Server.Doors.Systems; @@ -7,13 +6,13 @@ using Content.Server.Station.Systems; using Content.Server.Stunnable; using Content.Shared.Parallax; using Content.Shared.Shuttles.Systems; -using Content.Shared.Sound; using Content.Shared.StatusEffect; using Robust.Shared.Audio; using Robust.Shared.Collections; using Robust.Shared.Map; using Robust.Shared.Player; using Robust.Shared.Utility; +using System.Diagnostics.CodeAnalysis; namespace Content.Server.Shuttles.Systems; diff --git a/Content.Server/Singularity/Components/EmitterComponent.cs b/Content.Server/Singularity/Components/EmitterComponent.cs index 1c122522a4..4addcfef9e 100644 --- a/Content.Server/Singularity/Components/EmitterComponent.cs +++ b/Content.Server/Singularity/Components/EmitterComponent.cs @@ -1,6 +1,5 @@ using System.Threading; -using Content.Shared.Sound; - +using Robust.Shared.Audio; namespace Content.Server.Singularity.Components { diff --git a/Content.Server/Singularity/Components/ServerSingularityComponent.cs b/Content.Server/Singularity/Components/ServerSingularityComponent.cs index b20bba3f96..389af2f673 100644 --- a/Content.Server/Singularity/Components/ServerSingularityComponent.cs +++ b/Content.Server/Singularity/Components/ServerSingularityComponent.cs @@ -1,6 +1,5 @@ using Content.Shared.Singularity; using Content.Shared.Singularity.Components; -using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.Player; diff --git a/Content.Server/Sound/Components/BaseEmitSoundComponent.cs b/Content.Server/Sound/Components/BaseEmitSoundComponent.cs index bbbc6196bd..b8bcac286d 100644 --- a/Content.Server/Sound/Components/BaseEmitSoundComponent.cs +++ b/Content.Server/Sound/Components/BaseEmitSoundComponent.cs @@ -1,4 +1,3 @@ -using Content.Shared.Sound; using Robust.Shared.Audio; namespace Content.Server.Sound.Components @@ -9,15 +8,10 @@ namespace Content.Server.Sound.Components /// public abstract class BaseEmitSoundComponent : Component { + public static readonly AudioParams DefaultParams = AudioParams.Default.WithVolume(-2f); + [ViewVariables(VVAccess.ReadWrite)] [DataField("sound", required: true)] public SoundSpecifier Sound { get; set; } = default!; - - [DataField("audioParams")] - public AudioParams AudioParams = AudioParams.Default.WithVolume(-2f); - - [ViewVariables(VVAccess.ReadWrite)] - [DataField("variation")] - public float PitchVariation { get; set; } = 0.0f; } } diff --git a/Content.Server/Sound/EmitSoundSystem.cs b/Content.Server/Sound/EmitSoundSystem.cs index f05cb4e152..84b4deed38 100644 --- a/Content.Server/Sound/EmitSoundSystem.cs +++ b/Content.Server/Sound/EmitSoundSystem.cs @@ -3,16 +3,15 @@ using Content.Server.Interaction.Components; using Content.Server.Sound.Components; using Content.Server.Throwing; using Content.Server.UserInterface; +using Content.Server.Popups; using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.Maps; using Content.Shared.Throwing; using JetBrains.Annotations; -using Robust.Shared.Audio; using Robust.Shared.Map; using Robust.Shared.Player; using Robust.Shared.Random; -using Content.Server.Popups; namespace Content.Server.Sound { @@ -23,8 +22,9 @@ namespace Content.Server.Sound public sealed class EmitSoundSystem : EntitySystem { [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly ITileDefinitionManager _tileDefMan = default!; + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly SharedAudioSystem _audioSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; /// @@ -108,8 +108,7 @@ namespace Content.Server.Sound private void TryEmitSound(BaseEmitSoundComponent component) { - var audioParams = component.AudioParams.WithPitchScale((float) _random.NextGaussian(1, component.PitchVariation)); - SoundSystem.Play(component.Sound.GetSound(), Filter.Pvs(component.Owner, entityManager: EntityManager), component.Owner, audioParams); + _audioSystem.PlayPvs(component.Sound, component.Owner, component.Sound.Params.AddVolume(-2f)); } } } diff --git a/Content.Server/Speech/Components/VocalComponent.cs b/Content.Server/Speech/Components/VocalComponent.cs index 0fbfe06e84..5f9cd73644 100644 --- a/Content.Server/Speech/Components/VocalComponent.cs +++ b/Content.Server/Speech/Components/VocalComponent.cs @@ -1,6 +1,5 @@ using Content.Shared.Actions; using Content.Shared.Actions.ActionTypes; -using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; diff --git a/Content.Server/StationEvents/Events/DiseaseOutbreak.cs b/Content.Server/StationEvents/Events/DiseaseOutbreak.cs index ab54914dcd..bf2d64e1be 100644 --- a/Content.Server/StationEvents/Events/DiseaseOutbreak.cs +++ b/Content.Server/StationEvents/Events/DiseaseOutbreak.cs @@ -1,13 +1,9 @@ -using Content.Server.Chat; -using Content.Server.Chat.Systems; -using Content.Server.Disease.Components; using Content.Server.Disease; +using Content.Server.Disease.Components; using Content.Server.Station.Systems; using Content.Shared.Disease; using Content.Shared.MobState.Components; -using Content.Shared.Sound; using Robust.Shared.Random; -using Robust.Shared.Prototypes; namespace Content.Server.StationEvents.Events; /// diff --git a/Content.Server/StationEvents/Events/MeteorSwarm.cs b/Content.Server/StationEvents/Events/MeteorSwarm.cs index cacb2b2fe4..6fe91db933 100644 --- a/Content.Server/StationEvents/Events/MeteorSwarm.cs +++ b/Content.Server/StationEvents/Events/MeteorSwarm.cs @@ -1,10 +1,6 @@ using Content.Server.GameTicking; -using Content.Server.GameTicking.Rules; -using Content.Server.Projectiles.Components; -using Content.Shared.Sound; using Content.Shared.Spawners.Components; using Robust.Shared.Map; -using Robust.Shared.Random; namespace Content.Server.StationEvents.Events { diff --git a/Content.Server/StationEvents/Events/PowerGridCheck.cs b/Content.Server/StationEvents/Events/PowerGridCheck.cs index da38312573..101747bf27 100644 --- a/Content.Server/StationEvents/Events/PowerGridCheck.cs +++ b/Content.Server/StationEvents/Events/PowerGridCheck.cs @@ -1,11 +1,9 @@ -using System.Threading; using Content.Server.Power.Components; -using Content.Shared.Sound; using JetBrains.Annotations; using Robust.Shared.Audio; using Robust.Shared.Player; -using Robust.Shared.Random; using Robust.Shared.Utility; +using System.Threading; using Timer = Robust.Shared.Timing.Timer; namespace Content.Server.StationEvents.Events diff --git a/Content.Server/StationEvents/Events/VentClog.cs b/Content.Server/StationEvents/Events/VentClog.cs index 822d4b22fc..ba1aca3fde 100644 --- a/Content.Server/StationEvents/Events/VentClog.cs +++ b/Content.Server/StationEvents/Events/VentClog.cs @@ -1,12 +1,11 @@ -using System.Linq; using Content.Server.Atmos.Piping.Unary.Components; using Content.Server.Chemistry.ReactionEffects; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reagent; -using Content.Shared.Sound; using JetBrains.Annotations; -using Robust.Shared.Prototypes; +using Robust.Shared.Audio; using Robust.Shared.Random; +using System.Linq; namespace Content.Server.StationEvents.Events; diff --git a/Content.Server/StationEvents/Events/VentCritters.cs b/Content.Server/StationEvents/Events/VentCritters.cs index 041b304d2b..4054ff4db4 100644 --- a/Content.Server/StationEvents/Events/VentCritters.cs +++ b/Content.Server/StationEvents/Events/VentCritters.cs @@ -1,7 +1,6 @@ -using System.Linq; using Content.Server.StationEvents.Components; -using Content.Shared.Sound; using Robust.Shared.Random; +using System.Linq; namespace Content.Server.StationEvents.Events; diff --git a/Content.Server/Storage/Components/CursedEntityStorageComponent.cs b/Content.Server/Storage/Components/CursedEntityStorageComponent.cs index d268b22743..92e83afcee 100644 --- a/Content.Server/Storage/Components/CursedEntityStorageComponent.cs +++ b/Content.Server/Storage/Components/CursedEntityStorageComponent.cs @@ -1,6 +1,4 @@ -using Content.Shared.Audio; -using Content.Shared.Interaction; -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.Storage.Components; diff --git a/Content.Server/Storage/Components/EntityStorageComponent.cs b/Content.Server/Storage/Components/EntityStorageComponent.cs index 37093efd1d..776abb4602 100644 --- a/Content.Server/Storage/Components/EntityStorageComponent.cs +++ b/Content.Server/Storage/Components/EntityStorageComponent.cs @@ -1,6 +1,6 @@ using Content.Shared.Physics; -using Content.Shared.Sound; using Content.Shared.Whitelist; +using Robust.Shared.Audio; using Robust.Shared.Containers; namespace Content.Server.Storage.Components; diff --git a/Content.Server/Storage/Components/ServerStorageComponent.cs b/Content.Server/Storage/Components/ServerStorageComponent.cs index 22682b2ee4..a16603469d 100644 --- a/Content.Server/Storage/Components/ServerStorageComponent.cs +++ b/Content.Server/Storage/Components/ServerStorageComponent.cs @@ -1,6 +1,6 @@ -using Content.Shared.Sound; using Content.Shared.Storage; using Content.Shared.Whitelist; +using Robust.Shared.Audio; using Robust.Shared.Containers; using System.Threading; diff --git a/Content.Server/Storage/Components/SpawnItemsOnUseComponent.cs b/Content.Server/Storage/Components/SpawnItemsOnUseComponent.cs index 939994271c..363561606c 100644 --- a/Content.Server/Storage/Components/SpawnItemsOnUseComponent.cs +++ b/Content.Server/Storage/Components/SpawnItemsOnUseComponent.cs @@ -1,5 +1,5 @@ -using Content.Shared.Sound; using Content.Shared.Storage; +using Robust.Shared.Audio; namespace Content.Server.Storage.Components { diff --git a/Content.Server/Stunnable/Components/StunbatonComponent.cs b/Content.Server/Stunnable/Components/StunbatonComponent.cs index 780dae688b..ca5b98c9bb 100644 --- a/Content.Server/Stunnable/Components/StunbatonComponent.cs +++ b/Content.Server/Stunnable/Components/StunbatonComponent.cs @@ -1,6 +1,6 @@ using Content.Server.Stunnable.Systems; -using Content.Shared.Sound; using Content.Shared.Timing; +using Robust.Shared.Audio; namespace Content.Server.Stunnable.Components { diff --git a/Content.Server/Tiles/FloorTileComponent.cs b/Content.Server/Tiles/FloorTileComponent.cs index 05cdc6c309..96cebe8971 100644 --- a/Content.Server/Tiles/FloorTileComponent.cs +++ b/Content.Server/Tiles/FloorTileComponent.cs @@ -1,5 +1,5 @@ using Content.Shared.Maps; -using Content.Shared.Sound; +using Robust.Shared.Audio; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; namespace Content.Server.Tiles diff --git a/Content.Server/Tiles/FloorTileSystem.cs b/Content.Server/Tiles/FloorTileSystem.cs index 4e8f322b76..3a9726c66a 100644 --- a/Content.Server/Tiles/FloorTileSystem.cs +++ b/Content.Server/Tiles/FloorTileSystem.cs @@ -2,7 +2,6 @@ using Content.Server.Stack; using Content.Shared.Audio; using Content.Shared.Interaction; using Content.Shared.Maps; -using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.Map; using Robust.Shared.Player; diff --git a/Content.Server/Tools/Components/MultipleToolComponent.cs b/Content.Server/Tools/Components/MultipleToolComponent.cs index 77abb6b6ca..eb7a383596 100644 --- a/Content.Server/Tools/Components/MultipleToolComponent.cs +++ b/Content.Server/Tools/Components/MultipleToolComponent.cs @@ -1,6 +1,6 @@ -using Content.Shared.Sound; using Content.Shared.Tools; using Content.Shared.Tools.Components; +using Robust.Shared.Audio; using Robust.Shared.Utility; namespace Content.Server.Tools.Components diff --git a/Content.Server/Tools/Components/WelderComponent.cs b/Content.Server/Tools/Components/WelderComponent.cs index 33e96bc2de..6f1cc2ae1a 100644 --- a/Content.Server/Tools/Components/WelderComponent.cs +++ b/Content.Server/Tools/Components/WelderComponent.cs @@ -1,8 +1,8 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Damage; using Content.Shared.FixedPoint; -using Content.Shared.Sound; using Content.Shared.Tools.Components; +using Robust.Shared.Audio; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; namespace Content.Server.Tools.Components diff --git a/Content.Server/Traitor/Uplink/UplinkComponent.cs b/Content.Server/Traitor/Uplink/UplinkComponent.cs index 68e6e68285..efa1afd925 100644 --- a/Content.Server/Traitor/Uplink/UplinkComponent.cs +++ b/Content.Server/Traitor/Uplink/UplinkComponent.cs @@ -1,6 +1,6 @@ using Content.Shared.Roles; -using Content.Shared.Sound; using Content.Shared.Traitor.Uplink; +using Robust.Shared.Audio; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set; namespace Content.Server.Traitor.Uplink.Components diff --git a/Content.Server/VendingMachines/VendingMachineComponent.cs b/Content.Server/VendingMachines/VendingMachineComponent.cs index 24f536a0a5..ac3a1d076d 100644 --- a/Content.Server/VendingMachines/VendingMachineComponent.cs +++ b/Content.Server/VendingMachines/VendingMachineComponent.cs @@ -1,8 +1,8 @@ using Content.Server.UserInterface; using Content.Shared.Actions.ActionTypes; -using Content.Shared.Sound; using Content.Shared.VendingMachines; using Robust.Server.GameObjects; +using Robust.Shared.Audio; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; namespace Content.Server.VendingMachines diff --git a/Content.Server/Weapon/Melee/Components/MeleeSoundComponent.cs b/Content.Server/Weapon/Melee/Components/MeleeSoundComponent.cs index 0a338b16de..a8a6fcbe83 100644 --- a/Content.Server/Weapon/Melee/Components/MeleeSoundComponent.cs +++ b/Content.Server/Weapon/Melee/Components/MeleeSoundComponent.cs @@ -1,5 +1,5 @@ using Content.Shared.Damage.Prototypes; -using Content.Shared.Sound; +using Robust.Shared.Audio; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary; namespace Content.Server.Weapon.Melee.Components; diff --git a/Content.Server/Weapon/Melee/Components/MeleeWeaponComponent.cs b/Content.Server/Weapon/Melee/Components/MeleeWeaponComponent.cs index f5b983486e..cc71ef2b48 100644 --- a/Content.Server/Weapon/Melee/Components/MeleeWeaponComponent.cs +++ b/Content.Server/Weapon/Melee/Components/MeleeWeaponComponent.cs @@ -1,5 +1,5 @@ using Content.Shared.Damage; -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.Weapon.Melee.Components { diff --git a/Content.Server/Weapon/Melee/EnergySword/Components/EnergySwordComponent.cs b/Content.Server/Weapon/Melee/EnergySword/Components/EnergySwordComponent.cs index ed358cc28e..f7fac0bc8d 100644 --- a/Content.Server/Weapon/Melee/EnergySword/Components/EnergySwordComponent.cs +++ b/Content.Server/Weapon/Melee/EnergySword/Components/EnergySwordComponent.cs @@ -1,5 +1,5 @@ using Content.Shared.Damage; -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.Weapon.Melee.EnergySword { diff --git a/Content.Server/Weapon/Melee/EnergySword/EnergySwordSystem.cs b/Content.Server/Weapon/Melee/EnergySword/EnergySwordSystem.cs index 07c3e5d6f4..a94afbb90c 100644 --- a/Content.Server/Weapon/Melee/EnergySword/EnergySwordSystem.cs +++ b/Content.Server/Weapon/Melee/EnergySword/EnergySwordSystem.cs @@ -1,3 +1,6 @@ +using Content.Server.CombatMode.Disarm; +using Content.Server.Kitchen.Components; +using Content.Server.Weapon.Melee.Components; using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.Item; @@ -5,10 +8,6 @@ using Content.Shared.Light; using Content.Shared.Light.Component; using Content.Shared.Toggleable; using Content.Shared.Tools.Components; -using Content.Server.CombatMode.Disarm; -using Content.Server.Kitchen.Components; -using Content.Server.Weapon.Melee.Components; -using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.Player; using Robust.Shared.Random; diff --git a/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs index 456bd092b9..7f3013e2b8 100644 --- a/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs +++ b/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs @@ -7,7 +7,6 @@ using Content.Server.Chemistry.EntitySystems; using Content.Server.Cooldown; using Content.Server.Weapon.Melee.Components; using Content.Shared.Damage; -using Content.Shared.Sound; using Content.Shared.Audio; using Content.Shared.Database; using Content.Shared.FixedPoint; diff --git a/Content.Server/Weapon/Ranged/Components/RangedDamageSoundComponent.cs b/Content.Server/Weapon/Ranged/Components/RangedDamageSoundComponent.cs index bb5fc27fbf..118a820093 100644 --- a/Content.Server/Weapon/Ranged/Components/RangedDamageSoundComponent.cs +++ b/Content.Server/Weapon/Ranged/Components/RangedDamageSoundComponent.cs @@ -1,5 +1,5 @@ using Content.Shared.Damage.Prototypes; -using Content.Shared.Sound; +using Robust.Shared.Audio; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary; namespace Content.Server.Weapon.Ranged.Components; diff --git a/Content.Server/Weapon/Ranged/Components/RechargeBasicEntityAmmoComponent.cs b/Content.Server/Weapon/Ranged/Components/RechargeBasicEntityAmmoComponent.cs index 01fb30b24d..05a15213ea 100644 --- a/Content.Server/Weapon/Ranged/Components/RechargeBasicEntityAmmoComponent.cs +++ b/Content.Server/Weapon/Ranged/Components/RechargeBasicEntityAmmoComponent.cs @@ -1,4 +1,3 @@ -using Content.Shared.Sound; using Robust.Shared.Audio; namespace Content.Server.Weapon.Ranged.Components; diff --git a/Content.Server/Weapon/Ranged/Systems/GunSystem.cs b/Content.Server/Weapon/Ranged/Systems/GunSystem.cs index 6aff79b2e6..1e2bb3f55a 100644 --- a/Content.Server/Weapon/Ranged/Systems/GunSystem.cs +++ b/Content.Server/Weapon/Ranged/Systems/GunSystem.cs @@ -6,7 +6,6 @@ using Content.Server.Weapon.Ranged.Components; using Content.Shared.Audio; using Content.Shared.Damage; using Content.Shared.Database; -using Content.Shared.Sound; using Content.Shared.Weapons.Ranged; using Content.Shared.Weapons.Ranged.Components; using Content.Shared.Weapons.Ranged.Events; diff --git a/Content.Server/Wieldable/Components/WieldableComponent.cs b/Content.Server/Wieldable/Components/WieldableComponent.cs index f7f96e9763..2966c9e8d8 100644 --- a/Content.Server/Wieldable/Components/WieldableComponent.cs +++ b/Content.Server/Wieldable/Components/WieldableComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.Wieldable.Components { diff --git a/Content.Server/Wires/WiresComponent.cs b/Content.Server/Wires/WiresComponent.cs index 3059323592..69d9a90762 100644 --- a/Content.Server/Wires/WiresComponent.cs +++ b/Content.Server/Wires/WiresComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Server.Wires; diff --git a/Content.Shared/Actions/ActionTypes/ActionType.cs b/Content.Shared/Actions/ActionTypes/ActionType.cs index f7ac83a3bf..de20beb65e 100644 --- a/Content.Shared/Actions/ActionTypes/ActionType.cs +++ b/Content.Shared/Actions/ActionTypes/ActionType.cs @@ -1,4 +1,3 @@ -using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.Serialization; using Robust.Shared.Utility; diff --git a/Content.Shared/Audio/AmbientSoundComponent.cs b/Content.Shared/Audio/AmbientSoundComponent.cs index 3163dcb701..fa62380cd1 100644 --- a/Content.Shared/Audio/AmbientSoundComponent.cs +++ b/Content.Shared/Audio/AmbientSoundComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Sound; +using Robust.Shared.Audio; using Robust.Shared.GameStates; using Robust.Shared.Serialization; diff --git a/Content.Shared/Audio/AudioHelpers.cs b/Content.Shared/Audio/AudioHelpers.cs index f6fc4f9cfe..74ec0361ec 100644 --- a/Content.Shared/Audio/AudioHelpers.cs +++ b/Content.Shared/Audio/AudioHelpers.cs @@ -8,7 +8,7 @@ namespace Content.Shared.Audio /// /// Returns a random pitch. /// - [Obsolete("Use variant that takes in IRobustRandom instead.")] + [Obsolete("Use variation datafield.")] public static AudioParams WithVariation(float amplitude) { return WithVariation(amplitude, null); @@ -59,12 +59,5 @@ namespace Content.Shared.Audio variation = Math.Clamp(variation, 0, 12); return ShiftSemitone(rand.Next(-variation, variation)); } - - public static string GetRandomFileFromSoundCollection(string name, IRobustRandom? rand, IPrototypeManager? proto) - { - IoCManager.Resolve(ref rand, ref proto); - var soundCollection = proto.Index(name); - return rand.Pick(soundCollection.PickFiles).ToString(); - } } } diff --git a/Content.Shared/Audio/ContentAudioSystem.cs b/Content.Shared/Audio/ContentAudioSystem.cs deleted file mode 100644 index d732f20506..0000000000 --- a/Content.Shared/Audio/ContentAudioSystem.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Content.Shared.Physics; -using Robust.Shared.Audio; - -namespace Content.Shared.Audio -{ - public sealed class ContentAudioSystem : EntitySystem - { - public override void Initialize() - { - base.Initialize(); - SoundSystem.OcclusionCollisionMask = (int) CollisionGroup.Impassable; - } - } -} diff --git a/Content.Shared/Audio/SoundCollectionPrototype.cs b/Content.Shared/Audio/SoundCollectionPrototype.cs deleted file mode 100644 index 28520ae32b..0000000000 --- a/Content.Shared/Audio/SoundCollectionPrototype.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Robust.Shared.Prototypes; -using Robust.Shared.Utility; - -namespace Content.Shared.Audio -{ - [Prototype("soundCollection")] - public sealed class SoundCollectionPrototype : IPrototype - { - [ViewVariables] - [IdDataFieldAttribute] - public string ID { get; } = default!; - - [DataField("files")] - public List PickFiles { get; } = new(); - } -} diff --git a/Content.Shared/Blocking/Components/BlockingComponent.cs b/Content.Shared/Blocking/Components/BlockingComponent.cs index abdd032a3c..08188e79e5 100644 --- a/Content.Shared/Blocking/Components/BlockingComponent.cs +++ b/Content.Shared/Blocking/Components/BlockingComponent.cs @@ -1,5 +1,5 @@ -using Content.Shared.Actions.ActionTypes; -using Content.Shared.Sound; +using Content.Shared.Actions.ActionTypes; +using Robust.Shared.Audio; using Robust.Shared.Physics.Collision.Shapes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; diff --git a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs index 23c8509f42..9f45ae9305 100644 --- a/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs +++ b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs @@ -1,7 +1,7 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Database; using Content.Shared.FixedPoint; -using Content.Shared.Sound; +using Robust.Shared.Audio; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary; diff --git a/Content.Shared/Clothing/Components/SharedClothingComponent.cs b/Content.Shared/Clothing/Components/SharedClothingComponent.cs index edf6e09c07..f5cb9f8b86 100644 --- a/Content.Shared/Clothing/Components/SharedClothingComponent.cs +++ b/Content.Shared/Clothing/Components/SharedClothingComponent.cs @@ -1,6 +1,6 @@ using Content.Shared.Clothing.EntitySystems; using Content.Shared.Inventory; -using Content.Shared.Sound; +using Robust.Shared.Audio; using Robust.Shared.GameStates; using Robust.Shared.Serialization; diff --git a/Content.Shared/CombatMode/SharedCombatModeComponent.cs b/Content.Shared/CombatMode/SharedCombatModeComponent.cs index 8a958f6f59..f72869d246 100644 --- a/Content.Shared/CombatMode/SharedCombatModeComponent.cs +++ b/Content.Shared/CombatMode/SharedCombatModeComponent.cs @@ -1,7 +1,7 @@ using Content.Shared.Actions; using Content.Shared.Actions.ActionTypes; -using Content.Shared.Sound; using Content.Shared.Targeting; +using Robust.Shared.Audio; using Robust.Shared.GameStates; using Robust.Shared.Serialization; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs index 791d09e3ef..dafb33fce1 100644 --- a/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs +++ b/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs @@ -1,4 +1,3 @@ -using Content.Shared.Sound; using Content.Shared.Whitelist; using Robust.Shared.Audio; using Robust.Shared.Containers; diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs index 5debc3f03f..fdc69aec3c 100644 --- a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs +++ b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs @@ -1,20 +1,16 @@ using Content.Shared.ActionBlocker; +using Content.Shared.Destructible; using Content.Shared.Hands.Components; using Content.Shared.Hands.EntitySystems; using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.Popups; -using Content.Shared.Sound; using Content.Shared.Verbs; -using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.GameStates; using Robust.Shared.Player; -using Robust.Shared.Timing; -using System.Diagnostics.CodeAnalysis; -using Content.Shared.Destructible; -using Robust.Shared.Network; using Robust.Shared.Utility; +using System.Diagnostics.CodeAnalysis; namespace Content.Shared.Containers.ItemSlots { @@ -27,8 +23,7 @@ namespace Content.Shared.Containers.ItemSlots [Dependency] private readonly SharedContainerSystem _containers = default!; [Dependency] private readonly SharedPopupSystem _popupSystem = default!; [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly INetManager _netMan = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private readonly SharedAudioSystem _audioSystem = default!; public override void Initialize() { @@ -218,31 +213,12 @@ namespace Content.Shared.Containers.ItemSlots slot.ContainerSlot?.Insert(item); // ContainerSlot automatically raises a directed EntInsertedIntoContainerMessage - PlaySound(uid, slot.InsertSound, slot.SoundOptions, excludeUserAudio ? user : null); + _audioSystem.PlayPredicted(slot.InsertSound, uid, excludeUserAudio ? user : null); + var ev = new ItemSlotChangedEvent(); RaiseLocalEvent(uid, ref ev, true); } - /// - /// Plays a sound - /// - /// Source of the sound - /// The sound - /// Optional (server-side) argument used to prevent sending the audio to a specific - /// user. When run client-side, exclusion does nothing. - private void PlaySound(EntityUid uid, SoundSpecifier? sound, AudioParams audioParams, EntityUid? excluded) - { - if (sound == null || !_gameTiming.IsFirstTimePredicted) - return; - - var filter = Filter.Pvs(uid, entityManager: EntityManager); - - if (excluded != null && _netMan.IsServer) - filter = filter.RemoveWhereAttachedEntity(entity => entity == excluded.Value); - - SoundSystem.Play(sound.GetSound(), filter, uid, audioParams); - } - /// /// Check whether a given item can be inserted into a slot. Unless otherwise specified, this will return /// false if the slot is already filled. @@ -343,7 +319,7 @@ namespace Content.Shared.Containers.ItemSlots slot.ContainerSlot?.Remove(item); // ContainerSlot automatically raises a directed EntRemovedFromContainerMessage - PlaySound(uid, slot.EjectSound, slot.SoundOptions, excludeUserAudio ? user : null); + _audioSystem.PlayPredicted(slot.EjectSound, uid, excludeUserAudio ? user : null, slot.SoundOptions); var ev = new ItemSlotChangedEvent(); RaiseLocalEvent(uid, ref ev, true); } diff --git a/Content.Shared/Doors/Components/DoorComponent.cs b/Content.Shared/Doors/Components/DoorComponent.cs index 6fc3e7fb11..20376b23f8 100644 --- a/Content.Shared/Doors/Components/DoorComponent.cs +++ b/Content.Shared/Doors/Components/DoorComponent.cs @@ -1,6 +1,4 @@ -using System.Threading; using Content.Shared.Damage; -using Content.Shared.Sound; using Content.Shared.Tools; using Robust.Shared.Audio; using Robust.Shared.GameStates; diff --git a/Content.Shared/Explosion/ExplosionPrototype.cs b/Content.Shared/Explosion/ExplosionPrototype.cs index 8bd1d13c7e..c4b532280e 100644 --- a/Content.Shared/Explosion/ExplosionPrototype.cs +++ b/Content.Shared/Explosion/ExplosionPrototype.cs @@ -1,5 +1,5 @@ using Content.Shared.Damage; -using Content.Shared.Sound; +using Robust.Shared.Audio; using Robust.Shared.Prototypes; using Robust.Shared.Utility; diff --git a/Content.Shared/Gravity/GravityComponent.cs b/Content.Shared/Gravity/GravityComponent.cs index 9c9641eaa1..59ee649eac 100644 --- a/Content.Shared/Gravity/GravityComponent.cs +++ b/Content.Shared/Gravity/GravityComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Sound; +using Robust.Shared.Audio; using Robust.Shared.GameStates; using Robust.Shared.Serialization; diff --git a/Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs b/Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs index 53c263448e..685b77c378 100644 --- a/Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs +++ b/Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs @@ -1,6 +1,6 @@ using Content.Shared.DragDrop; using Content.Shared.Nutrition.Components; -using Content.Shared.Sound; +using Robust.Shared.Audio; using Robust.Shared.Serialization; namespace Content.Shared.Kitchen.Components diff --git a/Content.Shared/Light/Component/HandheldLightComponent.cs b/Content.Shared/Light/Component/HandheldLightComponent.cs index 90cdb1b515..1db963ac56 100644 --- a/Content.Shared/Light/Component/HandheldLightComponent.cs +++ b/Content.Shared/Light/Component/HandheldLightComponent.cs @@ -1,5 +1,5 @@ using Content.Shared.Actions.ActionTypes; -using Content.Shared.Sound; +using Robust.Shared.Audio; using Robust.Shared.GameStates; using Robust.Shared.Serialization; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; diff --git a/Content.Shared/Light/Component/SharedExpendableLightComponent.cs b/Content.Shared/Light/Component/SharedExpendableLightComponent.cs index 2c0fcc190c..5fcd1c9ccb 100644 --- a/Content.Shared/Light/Component/SharedExpendableLightComponent.cs +++ b/Content.Shared/Light/Component/SharedExpendableLightComponent.cs @@ -1,4 +1,3 @@ -using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameStates; using Robust.Shared.Serialization; diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs index edaadfe859..fa623249eb 100644 --- a/Content.Shared/Maps/ContentTileDefinition.cs +++ b/Content.Shared/Maps/ContentTileDefinition.cs @@ -1,9 +1,9 @@ -using Content.Shared.Sound; +using Content.Shared.Atmos; using JetBrains.Annotations; +using Robust.Shared.Audio; using Robust.Shared.Map; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -using Content.Shared.Atmos; namespace Content.Shared.Maps { diff --git a/Content.Shared/Movement/Components/FootstepModifierComponent.cs b/Content.Shared/Movement/Components/FootstepModifierComponent.cs index b20452f742..8bd5b3d1ee 100644 --- a/Content.Shared/Movement/Components/FootstepModifierComponent.cs +++ b/Content.Shared/Movement/Components/FootstepModifierComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Sound; +using Robust.Shared.Audio; using Robust.Shared.GameStates; namespace Content.Shared.Movement.Components diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Footsteps.cs b/Content.Shared/Movement/Systems/SharedMoverController.Footsteps.cs index 8f300c7c57..bbaf2250ec 100644 --- a/Content.Shared/Movement/Systems/SharedMoverController.Footsteps.cs +++ b/Content.Shared/Movement/Systems/SharedMoverController.Footsteps.cs @@ -1,5 +1,5 @@ using Content.Shared.Movement.Components; -using Content.Shared.Sound; +using Robust.Shared.Audio; using Robust.Shared.GameStates; using Robust.Shared.Serialization; diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs index 48e17108c4..9f1cc7aa4c 100644 --- a/Content.Shared/Movement/Systems/SharedMoverController.cs +++ b/Content.Shared/Movement/Systems/SharedMoverController.cs @@ -1,16 +1,12 @@ -using System.Diagnostics.CodeAnalysis; -using Content.Shared.Audio; using Content.Shared.CCVar; using Content.Shared.Friction; using Content.Shared.Gravity; using Content.Shared.Inventory; using Content.Shared.Maps; -using Content.Shared.MobState.Components; using Content.Shared.MobState.EntitySystems; using Content.Shared.Movement.Components; using Content.Shared.Movement.Events; using Content.Shared.Pulling.Components; -using Content.Shared.Sound; using Content.Shared.Tag; using Robust.Shared.Audio; using Robust.Shared.Configuration; @@ -18,9 +14,9 @@ using Robust.Shared.Containers; using Robust.Shared.Map; using Robust.Shared.Physics; using Robust.Shared.Physics.Controllers; -using Robust.Shared.Player; using Robust.Shared.Timing; using Robust.Shared.Utility; +using System.Diagnostics.CodeAnalysis; namespace Content.Shared.Movement.Systems { @@ -39,6 +35,7 @@ namespace Content.Shared.Movement.Systems [Dependency] private readonly SharedGravitySystem _gravity = default!; [Dependency] private readonly SharedMobStateSystem _mobState = default!; [Dependency] private readonly TagSystem _tags = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; private const float StepSoundMoveDistanceRunning = 2; private const float StepSoundMoveDistanceWalking = 1.5f; @@ -221,9 +218,12 @@ namespace Content.Shared.Movement.Systems TryGetSound(weightless, mover, mobMover, xform, out var sound)) { var soundModifier = mover.Sprinting ? 1.0f : FootstepWalkingAddedVolumeMultiplier; - SoundSystem.Play(sound.GetSound(), - GetSoundPlayers(mover.Owner), - mover.Owner, sound.Params.WithVolume(FootstepVolume * soundModifier)); + + var audioParams = sound.Params + .WithVolume(FootstepVolume * soundModifier) + .WithVariation(sound.Params.Variation ?? FootstepVariation); + + _audio.PlayPredicted(sound, mover.Owner, mover.Owner, audioParams); } } @@ -311,9 +311,6 @@ namespace Content.Shared.Movement.Systems return false; } - // TODO: Predicted audio moment. - protected abstract Filter GetSoundPlayers(EntityUid mover); - protected abstract bool CanSound(); private bool TryGetSound(bool weightless, InputMoverComponent mover, MobMoverComponent mobMover, TransformComponent xform, [NotNullWhen(true)] out SoundSpecifier? sound) diff --git a/Content.Shared/Nutrition/Components/CreamPieComponent.cs b/Content.Shared/Nutrition/Components/CreamPieComponent.cs index eb6a6581f6..00ba55a3f9 100644 --- a/Content.Shared/Nutrition/Components/CreamPieComponent.cs +++ b/Content.Shared/Nutrition/Components/CreamPieComponent.cs @@ -1,5 +1,5 @@ using Content.Shared.Nutrition.EntitySystems; -using Content.Shared.Sound; +using Robust.Shared.Audio; namespace Content.Shared.Nutrition.Components { diff --git a/Content.Shared/Slippery/SlipperyComponent.cs b/Content.Shared/Slippery/SlipperyComponent.cs index 496671d0c2..fb52504d47 100644 --- a/Content.Shared/Slippery/SlipperyComponent.cs +++ b/Content.Shared/Slippery/SlipperyComponent.cs @@ -1,6 +1,5 @@ -using Content.Shared.Sound; -using Content.Shared.StepTrigger; using Content.Shared.StepTrigger.Components; +using Robust.Shared.Audio; using Robust.Shared.GameStates; using Robust.Shared.Serialization; diff --git a/Content.Shared/Sound/SoundSpecifier.cs b/Content.Shared/Sound/SoundSpecifier.cs deleted file mode 100644 index 1c89180532..0000000000 --- a/Content.Shared/Sound/SoundSpecifier.cs +++ /dev/null @@ -1,75 +0,0 @@ -using Content.Shared.Audio; -using JetBrains.Annotations; -using Robust.Shared.Audio; -using Robust.Shared.Prototypes; -using Robust.Shared.Random; -using Robust.Shared.Serialization; -using Robust.Shared.Serialization.TypeSerializers.Implementations; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -using Robust.Shared.Utility; - -namespace Content.Shared.Sound -{ - [ImplicitDataDefinitionForInheritors, Serializable, NetSerializable] - public abstract class SoundSpecifier - { - [ViewVariables(VVAccess.ReadWrite), DataField("params")] - public AudioParams Params = AudioParams.Default; - - // TODO: remove most uses of this function, and just make the audio-system take in a SoundSpecifier - public abstract string GetSound(IRobustRandom? rand = null, IPrototypeManager? proto = null); - } - - [Serializable, NetSerializable] - public sealed class SoundPathSpecifier : SoundSpecifier - { - public const string Node = "path"; - - [DataField(Node, customTypeSerializer: typeof(ResourcePathSerializer), required: true)] - public ResourcePath? Path { get; } - - [UsedImplicitly] - public SoundPathSpecifier() - { - } - - public SoundPathSpecifier(string path) - { - Path = new ResourcePath(path); - } - - public SoundPathSpecifier(ResourcePath path) - { - Path = path; - } - - public override string GetSound(IRobustRandom? rand = null, IPrototypeManager? proto = null) - { - return Path == null ? string.Empty : Path.ToString(); - } - } - - [Serializable, NetSerializable] - public sealed class SoundCollectionSpecifier : SoundSpecifier - { - public const string Node = "collection"; - - [DataField(Node, customTypeSerializer: typeof(PrototypeIdSerializer), required: true)] - public string? Collection { get; } - - [UsedImplicitly] - public SoundCollectionSpecifier() - { - } - - public SoundCollectionSpecifier(string collection) - { - Collection = collection; - } - - public override string GetSound(IRobustRandom? rand = null, IPrototypeManager? proto = null) - { - return Collection == null ? string.Empty : AudioHelpers.GetRandomFileFromSoundCollection(Collection, rand, proto); - } - } -} diff --git a/Content.Shared/Sound/SoundSpecifierTypeSerializer.cs b/Content.Shared/Sound/SoundSpecifierTypeSerializer.cs deleted file mode 100644 index 4667022ed7..0000000000 --- a/Content.Shared/Sound/SoundSpecifierTypeSerializer.cs +++ /dev/null @@ -1,63 +0,0 @@ -using Robust.Shared.Serialization.Manager; -using Robust.Shared.Serialization.Markdown.Mapping; -using Robust.Shared.Serialization.Markdown.Validation; -using Robust.Shared.Serialization.Markdown.Value; -using Robust.Shared.Serialization.TypeSerializers.Interfaces; -using Robust.Shared.Utility; - -namespace Content.Shared.Sound -{ - [TypeSerializer] - public sealed class SoundSpecifierTypeSerializer : - ITypeReader, - ITypeReader - { - private Type GetType(MappingDataNode node) - { - var hasPath = node.Has(SoundPathSpecifier.Node); - var hasCollection = node.Has(SoundCollectionSpecifier.Node); - - if (hasPath || !(hasPath ^ hasCollection)) - return typeof(SoundPathSpecifier); - - if (hasCollection) - return typeof(SoundCollectionSpecifier); - - return typeof(SoundPathSpecifier); - } - - public SoundSpecifier Read(ISerializationManager serializationManager, MappingDataNode node, - IDependencyCollection dependencies, bool skipHook, ISerializationContext? context = null, SoundSpecifier? _ = null) - { - var type = GetType(node); - return (SoundSpecifier) serializationManager.Read(type, node, context, skipHook)!; - } - - public SoundSpecifier Read(ISerializationManager serializationManager, ValueDataNode node, - IDependencyCollection dependencies, bool skipHook, ISerializationContext? context = null, SoundSpecifier? _ = null) - { - return new SoundPathSpecifier(node.Value); - } - - public ValidationNode Validate(ISerializationManager serializationManager, MappingDataNode node, - IDependencyCollection dependencies, ISerializationContext? context = null) - { - if (node.Has(SoundPathSpecifier.Node) && node.Has(SoundCollectionSpecifier.Node)) - return new ErrorNode(node, "You can only specify either a sound path or a sound collection!"); - - if (!node.Has(SoundPathSpecifier.Node) && !node.Has(SoundCollectionSpecifier.Node)) - return new ErrorNode(node, "You need to specify either a sound path or a sound collection!"); - - return serializationManager.ValidateNode(GetType(node), node, context); - } - - public ValidationNode Validate(ISerializationManager serializationManager, ValueDataNode node, - IDependencyCollection dependencies, ISerializationContext? context = null) - { - if (serializationManager.ValidateNode(node, context) is not ErrorNode) - return new ValidatedValueNode(node); - - return new ErrorNode(node, "SoundSpecifier value is not a valid resource path!"); - } - } -} diff --git a/Content.Shared/Speech/SpeechSoundsPrototype.cs b/Content.Shared/Speech/SpeechSoundsPrototype.cs index 396974fe69..01d63c2d6c 100644 --- a/Content.Shared/Speech/SpeechSoundsPrototype.cs +++ b/Content.Shared/Speech/SpeechSoundsPrototype.cs @@ -1,5 +1,5 @@ +using Robust.Shared.Audio; using Robust.Shared.Prototypes; -using Content.Shared.Sound; namespace Content.Shared.Speech { diff --git a/Content.Shared/Standing/StandingStateComponent.cs b/Content.Shared/Standing/StandingStateComponent.cs index 29bb951879..da343645b0 100644 --- a/Content.Shared/Standing/StandingStateComponent.cs +++ b/Content.Shared/Standing/StandingStateComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Sound; +using Robust.Shared.Audio; using Robust.Shared.GameStates; namespace Content.Shared.Standing diff --git a/Content.Shared/Stunnable/KnockedDownComponent.cs b/Content.Shared/Stunnable/KnockedDownComponent.cs index d7e361f6e1..7b684e20e4 100644 --- a/Content.Shared/Stunnable/KnockedDownComponent.cs +++ b/Content.Shared/Stunnable/KnockedDownComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Sound; +using Robust.Shared.Audio; using Robust.Shared.GameStates; using Robust.Shared.Serialization; diff --git a/Content.Shared/Toilet/ToiletComponent.cs b/Content.Shared/Toilet/ToiletComponent.cs index 0404e70eb9..86067fb56c 100644 --- a/Content.Shared/Toilet/ToiletComponent.cs +++ b/Content.Shared/Toilet/ToiletComponent.cs @@ -1,5 +1,5 @@ -using Content.Shared.Sound; using Content.Shared.Tools; +using Robust.Shared.Audio; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; namespace Content.Shared.Toilet diff --git a/Content.Shared/Tools/Components/ToolComponent.cs b/Content.Shared/Tools/Components/ToolComponent.cs index eaf21009b3..200ca6222b 100644 --- a/Content.Shared/Tools/Components/ToolComponent.cs +++ b/Content.Shared/Tools/Components/ToolComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Sound; +using Robust.Shared.Audio; using Robust.Shared.Utility; namespace Content.Shared.Tools.Components diff --git a/Content.Shared/Vehicle/Components/VehicleComponent.cs b/Content.Shared/Vehicle/Components/VehicleComponent.cs index 6d52ef5b35..f76dd3b8df 100644 --- a/Content.Shared/Vehicle/Components/VehicleComponent.cs +++ b/Content.Shared/Vehicle/Components/VehicleComponent.cs @@ -1,5 +1,4 @@ using Content.Shared.Actions.ActionTypes; -using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.Utility; @@ -36,10 +35,7 @@ namespace Content.Shared.Vehicle.Components [DataField("hornSound")] public SoundSpecifier? HornSound = new SoundPathSpecifier("/Audio/Effects/Vehicle/carhorn.ogg") { - Params = - { - Volume = -3f, - } + Params = AudioParams.Default.WithVolume(-3f) }; public IPlayingAudioStream? HonkPlayingStream; diff --git a/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs b/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs index 8ba1b5b5a4..44aca5d47d 100644 --- a/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs @@ -1,5 +1,4 @@ -using Content.Shared.Sound; -using Content.Shared.Weapons.Ranged.Systems; +using Robust.Shared.Audio; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; diff --git a/Content.Shared/Weapons/Ranged/Components/BallisticAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/BallisticAmmoProviderComponent.cs index 9377238f24..51f23ae19e 100644 --- a/Content.Shared/Weapons/Ranged/Components/BallisticAmmoProviderComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/BallisticAmmoProviderComponent.cs @@ -1,5 +1,5 @@ -using Content.Shared.Sound; using Content.Shared.Whitelist; +using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Weapons/Ranged/Components/FlyBySoundComponent.cs b/Content.Shared/Weapons/Ranged/Components/FlyBySoundComponent.cs index 43fd067e26..076e975614 100644 --- a/Content.Shared/Weapons/Ranged/Components/FlyBySoundComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/FlyBySoundComponent.cs @@ -1,4 +1,3 @@ -using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameStates; diff --git a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs index 1cf442ed1f..a903caf767 100644 --- a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs @@ -1,5 +1,5 @@ using Content.Shared.Actions.ActionTypes; -using Content.Shared.Sound; +using Robust.Shared.Audio; using Robust.Shared.GameStates; using Robust.Shared.Map; diff --git a/Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs index 18d5d04397..60977dda73 100644 --- a/Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs @@ -1,5 +1,5 @@ -using Content.Shared.Sound; using Content.Shared.Weapons.Ranged.Components; +using Robust.Shared.Audio; namespace Content.Shared.Weapons.Ranged; diff --git a/Content.Shared/Weapons/Ranged/Components/RevolverAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/RevolverAmmoProviderComponent.cs index f591fbbebf..9592ac7842 100644 --- a/Content.Shared/Weapons/Ranged/Components/RevolverAmmoProviderComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/RevolverAmmoProviderComponent.cs @@ -1,5 +1,5 @@ -using Content.Shared.Sound; using Content.Shared.Whitelist; +using Robust.Shared.Audio; using Robust.Shared.Containers; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Weapons/Ranged/HitscanPrototype.cs b/Content.Shared/Weapons/Ranged/HitscanPrototype.cs index 2918918162..24a75273a2 100644 --- a/Content.Shared/Weapons/Ranged/HitscanPrototype.cs +++ b/Content.Shared/Weapons/Ranged/HitscanPrototype.cs @@ -1,7 +1,6 @@ using Content.Shared.Damage; using Content.Shared.Physics; -using Content.Shared.Sound; -using Content.Shared.Weapons.Ranged.Systems; +using Robust.Shared.Audio; using Robust.Shared.Prototypes; using Robust.Shared.Utility; diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedFlyBySoundSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedFlyBySoundSystem.cs index 084c65ce24..01a5580ee3 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedFlyBySoundSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedFlyBySoundSystem.cs @@ -1,6 +1,6 @@ using Content.Shared.Physics; -using Content.Shared.Sound; using Content.Shared.Weapons.Ranged.Components; +using Robust.Shared.Audio; using Robust.Shared.GameStates; using Robust.Shared.Physics; using Robust.Shared.Physics.Collision.Shapes; diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml index b125267b52..51c64adbca 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml @@ -45,6 +45,8 @@ - type: FootstepModifier footstepSoundCollection: collection: footstep_duck + params: + variation: 0.07 - type: entity parent: ClothingShoesBase diff --git a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml index 508d1f0fc7..094273183f 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml @@ -18,17 +18,23 @@ - type: EmitSoundOnUse sound: collection: BikeHorn + params: + variation: 0.125 - type: UseDelay delay: 0.5 - type: EmitSoundOnTrigger sound: collection: BikeHorn + params: + variation: 0.125 - type: Tag tags: - Payload # yes, you can make re-usable prank grenades - type: MeleeWeapon hitSound: collection: BikeHorn + params: + variation: 0.125 damage: types: Blunt: 0