Tweaks ambient sound values and improves some existing sounds (#4576)

* Updates singularity to use AmbientSound

* Removed hum from light tubes and tweaked vending/bulb ambience

* Adds more explosion sound effects

* Moves closet open/close.ogg and adds wooden closet sound effect

* Updates flashlight on/off sound

* Adds HL Scientist scream collection

* Tweaks APC Ambience

* Minor oversight on det locker

* Addressed reviews

Content.Server/Explosion/ExplosionHelper.cs

@@ -36,7 +36,7 @@ namespace Content.Server.Explosion
         /// </summary>
         private static readonly float LightBreakChance = 0.3f;
         private static readonly float HeavyBreakChance = 0.8f;
-        private static SoundSpecifier _explosionSound = new SoundPathSpecifier("/Audio/Effects/explosion.ogg");
+        private static SoundSpecifier _explosionSound = new SoundCollectionSpecifier("explosion");
 
         private static bool IgnoreExplosivePassable(IEntity e) => e.HasTag("ExplosivePassable");
 

Content.Server/Light/Components/HandheldLightComponent.cs

@@ -46,9 +46,9 @@ namespace Content.Server.Light.Components
 
         [ViewVariables] protected override bool HasCell => _cellSlot.HasCell;
 
-        [ViewVariables(VVAccess.ReadWrite)] [DataField("turnOnSound")] public SoundSpecifier TurnOnSound = new SoundPathSpecifier("/Audio/Items/flashlight_toggle.ogg");
+        [ViewVariables(VVAccess.ReadWrite)] [DataField("turnOnSound")] public SoundSpecifier TurnOnSound = new SoundPathSpecifier("/Audio/Items/flashlight_on.ogg");
         [ViewVariables(VVAccess.ReadWrite)] [DataField("turnOnFailSound")] public SoundSpecifier TurnOnFailSound = new SoundPathSpecifier("/Audio/Machines/button.ogg");
-        [ViewVariables(VVAccess.ReadWrite)] [DataField("turnOffSound")] public SoundSpecifier TurnOffSound = new SoundPathSpecifier("/Audio/Items/flashlight_toggle.ogg");
+        [ViewVariables(VVAccess.ReadWrite)] [DataField("turnOffSound")] public SoundSpecifier TurnOffSound = new SoundPathSpecifier("/Audio/Items/flashlight_off .ogg");
 
         [ComponentDependency] private readonly ItemActionsComponent? _itemActions = null;
 

Content.Server/PDA/PDAComponent.cs

@@ -60,7 +60,7 @@ namespace Content.Server.PDA
         [ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(PDAUiKey.Key);
 
         [DataField("insertIdSound")] private SoundSpecifier _insertIdSound = new SoundPathSpecifier("/Audio/Weapons/Guns/MagIn/batrifle_magin.ogg");
-        [DataField("toggleFlashlightSound")] private SoundSpecifier _toggleFlashlightSound = new SoundPathSpecifier("/Audio/Items/flashlight_toggle.ogg");
+        [DataField("toggleFlashlightSound")] private SoundSpecifier _toggleFlashlightSound = new SoundPathSpecifier("/Audio/Items/flashlight_pda.ogg");
         [DataField("ejectIdSound")] private SoundSpecifier _ejectIdSound = new SoundPathSpecifier("/Audio/Machines/id_swipe.ogg");
 
         public PDAComponent()

Content.Server/Pointing/Components/RoguePointingArrowComponent.cs

@@ -42,7 +42,7 @@ namespace Content.Server.Pointing.Components
         private float _chasingTime = 1;
 
         [DataField("explosionSound")]
-        private SoundSpecifier _explosionSound = new SoundPathSpecifier("/Audio/Effects/explosion.ogg");
+        private SoundSpecifier _explosionSound = new SoundCollectionSpecifier("explosion");
 
         private IEntity? RandomNearbyPlayer()
         {

Content.Server/Singularity/Components/ServerSingularityComponent.cs

@@ -73,7 +73,6 @@ namespace Content.Server.Singularity.Components
         private IPlayingAudioStream? _playingSound;
 
         [DataField("singularityFormingSound")] private SoundSpecifier _singularityFormingSound = new SoundPathSpecifier("/Audio/Effects/singularity_form.ogg");
-        [DataField("singularitySound")] private SoundSpecifier _singularitySound = new SoundPathSpecifier("/Audio/Effects/singularity.ogg");
         [DataField("singularityCollapsingSound")] private SoundSpecifier _singularityCollapsingSound = new SoundPathSpecifier("/Audio/Effects/singularity_collapse.ogg");
 
         public override ComponentState GetComponentState(ICommonSession player)
@@ -92,7 +91,6 @@ namespace Content.Server.Singularity.Components
             audioParams.MaxDistance = 20f;
             audioParams.Volume = 5;
             SoundSystem.Play(Filter.Pvs(Owner), _singularityFormingSound.GetSound(), Owner);
-            Timer.Spawn(5200, () => _playingSound = SoundSystem.Play(Filter.Pvs(Owner), _singularitySound.GetSound(), Owner, audioParams));
 
             _singularitySystem.ChangeSingularityLevel(this, 1);
         }

Content.Server/Storage/Components/EntityStorageComponent.cs

@@ -75,10 +75,10 @@ namespace Content.Server.Storage.Components
         private bool _isWeldedShut;
 
         [DataField("closeSound")]
-        private SoundSpecifier _closeSound = new SoundPathSpecifier("/Audio/Machines/closetclose.ogg");
+        private SoundSpecifier _closeSound = new SoundPathSpecifier("/Audio/Effects/closetclose.ogg");
 
         [DataField("openSound")]
-        private SoundSpecifier _openSound = new SoundPathSpecifier("/Audio/Machines/closetopen.ogg");
+        private SoundSpecifier _openSound = new SoundPathSpecifier("/Audio/Effects/closetopen.ogg");
 
         [ViewVariables]
         protected Container Contents = default!;

Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml

@@ -7,7 +7,7 @@
   components:
   - type: AmbientOnPowered
   - type: AmbientSound
-    volume: -15
+    volume: -14
     range: 3
     sound:
       path: /Audio/Ambience/Objects/vending_machine_hum.ogg

Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml

@@ -4,6 +4,11 @@
   description: A mesmerizing swirl of darkness that sucks in everything. If it's moving towards you, run.
   components:
   - type: Clickable
+  - type: AmbientSound
+    volume: -10
+    range: 14
+    sound:
+      path: /Audio/Effects/singularity.ogg
   - type: Physics
     bodyType: Dynamic
     fixtures:

Resources/Prototypes/Entities/Structures/Power/parts.yml

@@ -47,6 +47,8 @@
     mode: SnapgridCenter
   components:
   - type: AmbientSound
+    volume: -15
+    range: 2
     sound:
       path: /Audio/Ambience/Objects/hdd_buzz.ogg
   - type: Clickable

Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml

@@ -10,6 +10,11 @@
       state: cabinet
   - type: AccessReader
     access: [["Bar"]]
+  - type: EntityStorage
+    closeSound:
+      path: /Audio/Effects/woodenclosetclose.ogg
+    openSound:
+      path: /Audio/Effects/woodenclosetopen.ogg
 
 # Cargo
 - type: entity
@@ -264,13 +269,10 @@
 # Detective
 - type: entity
   id: LockerDetective
-  parent: LockerBase
+  parent: LockerBooze
   name: detective's cabinet
+  description: Usually cold and empty... like your heart.
   components:
-  - type: Appearance
-    visuals:
-    - type: StorageVisualizer
-      state: cabinet
   - type: AccessReader
     access: [["Service"]] # TODO access [["Detective"]]
 

Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml

@@ -4,10 +4,6 @@
   description: "An unpowered light."
   suffix: Unpowered
   components:
-  - type: AmbientSound
-    volume: -12
-    sound:
-      path: /Audio/Ambience/Objects/light_hum.ogg
   - type: Clickable
   - type: InteractionOutline
   - type: Construction
@@ -97,6 +93,11 @@
   suffix: Unpowered
   parent: WallLight
   components:
+    - type: AmbientSound
+      volume: -15
+      range: 2
+      sound:
+        path: /Audio/Ambience/Objects/light_hum.ogg
     - type: Sprite
       sprite: Structures/Wallmounts/Lighting/light_small.rsi
       state: on

Resources/Prototypes/SoundCollections/explosion.yml

@@ -0,0 +1,9 @@
+- type: soundCollection
+  id: explosion
+  files:
+  - /Audio/Effects/explosion1.ogg
+  - /Audio/Effects/explosion2.ogg
+  - /Audio/Effects/explosion3.ogg
+  - /Audio/Effects/explosion4.ogg
+  - /Audio/Effects/explosion5.ogg
+  - /Audio/Effects/explosion6.ogg

Resources/Prototypes/SoundCollections/screams.yml

@@ -16,3 +16,13 @@
     - /Audio/Voice/Human/femalescream_3.ogg
     - /Audio/Voice/Human/femalescream_4.ogg
     - /Audio/Voice/Human/femalescream_5.ogg
+
+- type: soundCollection
+  id: ScientistScreams
+  files:
+    - /Audio/Voice/Human/science_scream_1.ogg
+    - /Audio/Voice/Human/science_scream_2.ogg
+    - /Audio/Voice/Human/science_scream_3.ogg
+    - /Audio/Voice/Human/science_scream_4.ogg
+    - /Audio/Voice/Human/science_scream_5.ogg
+    - /Audio/Voice/Human/science_scream_6.ogg