Audio System Rejig (#9635)

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;
 

Content.Shared/Audio/AudioHelpers.cs

@@ -8,7 +8,7 @@ namespace Content.Shared.Audio
         /// <summary>
         ///     Returns a random pitch.
         /// </summary>
-        [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<SoundCollectionPrototype>(name);
-            return rand.Pick(soundCollection.PickFiles).ToString();
-        }
     }
 }

Content.Shared/Audio/ContentAudioSystem.cs

@@ -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;
-        }
-    }
-}

Content.Shared/Audio/SoundCollectionPrototype.cs

@@ -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<ResourcePath> PickFiles { get; } = new();
-    }
-}