Explosion SFX juicing + higher persistence (#22544)

diff --git a/Content.Client/Explosion/ExplosionOverlaySystem.cs b/Content.Client/Explosion/ExplosionOverlaySystem.cs
index 60208ea1a0d1414a6bbf3537785efd4f21ff4910..064b068a97e320a2e920e9b102e852eeea42a545 100644 (file)
--- a/Content.Client/Explosion/ExplosionOverlaySystem.cs
+++ b/Content.Client/Explosion/ExplosionOverlaySystem.cs
@@ -19,11 +19,6 @@ public sealed class ExplosionOverlaySystem : EntitySystem
     [Dependency] private readonly IOverlayManager _overlayMan = default!;
     [Dependency] private readonly SharedPointLightSystem _lights = default!;
 
-    /// <summary>
-    ///     For how many seconds should an explosion stay on-screen once it has finished expanding?
-    /// </summary>
-    public float ExplosionPersistence = 0.3f;
-
     public override void Initialize()
     {
         base.Initialize();

diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index 9df735ff6acf9e1dee2b7a600e7e3323c4a9751f..d9bfbece239c75faf6eca67406f41974e03f7c0d 100644 (file)
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -63,7 +63,7 @@ public sealed partial class ExplosionSystem : EntitySystem
     /// </summary>
     public const ushort DefaultTileSize = 1;
 
-    private AudioParams _audioParams = AudioParams.Default.WithVolume(-3f);
+    public const int MaxExplosionAudioRange = 30;
 
     /// <summary>
     ///     The "default" explosion prototype.
@@ -328,15 +328,33 @@ public sealed partial class ExplosionSystem : EntitySystem
         var visualEnt = CreateExplosionVisualEntity(epicenter, type.ID, spaceMatrix, spaceData, gridData.Values, iterationIntensity);
 
         // camera shake
-        CameraShake(iterationIntensity.Count * 2.5f, epicenter, totalIntensity);
+        CameraShake(iterationIntensity.Count * 4f, epicenter, totalIntensity);
 
         //For whatever bloody reason, sound system requires ENTITY coordinates.
         var mapEntityCoords = EntityCoordinates.FromMap(EntityManager, _mapManager.GetMapEntityId(epicenter.MapId), epicenter);
 
         // play sound.
-        var audioRange = iterationIntensity.Count * 5;
+        // for the normal audio, we want everyone in pvs range
+        // + if the bomb is big enough, people outside of it too
+        // this is capped to 30 because otherwise really huge bombs
+        // will attempt to play regular audio for people who can't hear it anyway because the epicenter is so far away
+        var audioRange = Math.Min(iterationIntensity.Count * 2, MaxExplosionAudioRange);
         var filter = Filter.Pvs(epicenter).AddInRange(epicenter, audioRange);
-        _audio.PlayStatic(type.Sound.GetSound(), filter, mapEntityCoords, true, _audioParams);
+        var sound = iterationIntensity.Count < type.SmallSoundIterationThreshold
+            ? type.SmallSound
+            : type.Sound;
+
+        _audio.PlayStatic(sound, filter, mapEntityCoords, true, sound.Params);
+
+        // play far sound
+        // far sound should play for anyone who wasn't in range of any of the effects of the bomb
+        var farAudioRange = iterationIntensity.Count * 5;
+        var farFilter = Filter.Empty().AddInRange(epicenter, farAudioRange).RemoveInRange(epicenter, audioRange);
+        var farSound = iterationIntensity.Count < type.SmallSoundIterationThreshold
+            ? type.SmallSoundFar
+            : type.SoundFar;
+
+        _audio.PlayGlobal(farSound, farFilter, true, farSound.Params);
 
         return new Explosion(this,
             type,

diff --git a/Content.Shared/Anomaly/Components/AnomalyComponent.cs b/Content.Shared/Anomaly/Components/AnomalyComponent.cs
index a6f4f6c0867d03a4b4bfb4106bc901f52e813c8f..0e83861863310ead16c9b0c5216ecb97018feef0 100644 (file)
--- a/Content.Shared/Anomaly/Components/AnomalyComponent.cs
+++ b/Content.Shared/Anomaly/Components/AnomalyComponent.cs
@@ -127,7 +127,7 @@ public sealed partial class AnomalyComponent : Component
     /// The sound plays when an anomaly goes supercritical
     /// </summary>
     [DataField]
-    public SoundSpecifier? SupercriticalSound = new SoundCollectionSpecifier("explosion");
+    public SoundSpecifier? SupercriticalSound = new SoundCollectionSpecifier("Explosion");
     #endregion
 
     /// <summary>

diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index ad570ffd3f4880de49edb026dbf39fe2eef0d229..b29e2273509b3597cdc0e9eb7356083527ddab4e 100644 (file)
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -349,7 +349,7 @@ namespace Content.Shared.CCVar
             CVarDef.Create("discord.ahelp_avatar", string.Empty, CVar.SERVERONLY);
 
         /// <summary>
-        /// URL of the Discord webhook which will relay all custom votes. If left empty, disables the webhook. 
+        /// URL of the Discord webhook which will relay all custom votes. If left empty, disables the webhook.
         /// </summary>
         public static readonly CVarDef<string> DiscordVoteWebhook =
             CVarDef.Create("discord.vote_webhook", string.Empty, CVar.SERVERONLY);
@@ -846,7 +846,7 @@ namespace Content.Shared.CCVar
         ///     This determines for how many seconds an explosion should stay visible once it has finished expanding.
         /// </summary>
         public static readonly CVarDef<float> ExplosionPersistence =
-            CVarDef.Create("explosion.persistence", 0.3f, CVar.SERVERONLY);
+            CVarDef.Create("explosion.persistence", 1.0f, CVar.SERVERONLY);
 
         /// <summary>
         ///     If an explosion covers a larger area than this number, the damaging/processing will always start during

diff --git a/Content.Shared/Explosion/ExplosionPrototype.cs b/Content.Shared/Explosion/ExplosionPrototype.cs
index 37d0b2b4212ffeef39e6ef921b5d3b2315757bce..1be3e31939d56082bb72c71a84cfa3b575e1fe3f 100644 (file)
--- a/Content.Shared/Explosion/ExplosionPrototype.cs
+++ b/Content.Shared/Explosion/ExplosionPrototype.cs
@@ -62,8 +62,26 @@ public sealed partial class ExplosionPrototype : IPrototype
     [DataField("fireColor")]
     public Color? FireColor;
 
-    [DataField("Sound")]
-    public SoundSpecifier Sound = new SoundCollectionSpecifier("explosion");
+    /// <summary>
+    ///     If an explosion finishes in less than this many iterations, play a small sound instead.
+    /// </summary>
+    /// <remarks>
+    ///     This value is tuned such that a minibomb is considered small, but just about anything larger is normal
+    /// </remarks>
+    [DataField("smallSoundIterationThreshold")]
+    public int SmallSoundIterationThreshold = 6;
+
+    [DataField("sound")]
+    public SoundSpecifier Sound = new SoundCollectionSpecifier("Explosion");
+
+    [DataField("smallSound")]
+    public SoundSpecifier SmallSound = new SoundCollectionSpecifier("ExplosionSmall");
+
+    [DataField("soundFar")]
+    public SoundSpecifier SoundFar = new SoundCollectionSpecifier("ExplosionFar", AudioParams.Default.WithVolume(2f));
+
+    [DataField("smallSoundFar")]
+    public SoundSpecifier SmallSoundFar = new SoundCollectionSpecifier("ExplosionSmallFar", AudioParams.Default.WithVolume(2f));
 
     [DataField("texturePath")]
     public ResPath TexturePath = new("/Textures/Effects/fire.rsi");

diff --git a/Content.Shared/Light/Components/LightBulbComponent.cs b/Content.Shared/Light/Components/LightBulbComponent.cs
index 01b348d13a5b638a96d245659dc3bb30b7405886..35b04be89743e75476eaa59ccf6db86ce5dc1c39 100644 (file)
--- a/Content.Shared/Light/Components/LightBulbComponent.cs
+++ b/Content.Shared/Light/Components/LightBulbComponent.cs
@@ -71,7 +71,7 @@ public sealed partial class LightBulbComponent : Component
     /// </summary>
     [DataField("breakSound")]
     [ViewVariables(VVAccess.ReadWrite)]
-    public SoundSpecifier BreakSound = new SoundCollectionSpecifier("GlassBreak");
+    public SoundSpecifier BreakSound = new SoundCollectionSpecifier("GlassBreak", AudioParams.Default.WithVolume(-6f));
 
     #region Appearance
 

diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml
index 2e14f74815339deb810cc3ef94f68d7149ffdff3..aa5609ab3d7a2e1cdf892054f942c6e7356633fa 100644 (file)
--- a/Resources/Audio/Effects/attributions.yml
+++ b/Resources/Audio/Effects/attributions.yml
@@ -171,3 +171,8 @@
   copyright: '"jumps from reason.3.Rev.wav" by martian of Freesound.org. Modified by reversing and altering volume.'
   license: CC0-1.0
   source: https://freesound.org/people/martian/sounds/19261/
+
+- files: ["explosion_small1.ogg", "explosion_small2.ogg", "explosion_small3.ogg", "explosion1.ogg", "explosion2.ogg", "explosion3.ogg", "explosion4.ogg", "explosion5.ogg", "explosion6.ogg", "explosionfar.ogg", "explosionsmallfar.ogg"]
+  copyright: "vgstation at c5edbfd7179288080f081e2b8ac2496b7e4455db"
+  license: CC-BY-SA-3.0
+  source: https://github.com/vgstation-coders/vgstation13/tree/c5edbfd7179288080f081e2b8ac2496b7e4455db/sound/effects

diff --git a/Resources/Audio/Effects/explosion_small1.ogg b/Resources/Audio/Effects/explosion_small1.ogg
new file mode 100644 (file)
index 0000000..929c318
Binary files /dev/null and b/Resources/Audio/Effects/explosion_small1.ogg differ

diff --git a/Resources/Audio/Effects/explosion_small2.ogg b/Resources/Audio/Effects/explosion_small2.ogg
new file mode 100644 (file)
index 0000000..018fe3d
Binary files /dev/null and b/Resources/Audio/Effects/explosion_small2.ogg differ

diff --git a/Resources/Audio/Effects/explosion_small3.ogg b/Resources/Audio/Effects/explosion_small3.ogg
new file mode 100644 (file)
index 0000000..154d695
Binary files /dev/null and b/Resources/Audio/Effects/explosion_small3.ogg differ

diff --git a/Resources/Audio/Effects/explosionfar.ogg b/Resources/Audio/Effects/explosionfar.ogg
new file mode 100644 (file)
index 0000000..aecdd0a
Binary files /dev/null and b/Resources/Audio/Effects/explosionfar.ogg differ

diff --git a/Resources/Audio/Effects/explosionsmallfar.ogg b/Resources/Audio/Effects/explosionsmallfar.ogg
new file mode 100644 (file)
index 0000000..1fa4039
Binary files /dev/null and b/Resources/Audio/Effects/explosionsmallfar.ogg differ

diff --git a/Resources/Audio/Effects/metalbreak.ogg b/Resources/Audio/Effects/metalbreak.ogg
index 0b447cc69996d25d2cdf2927849beeb13064fbab..0864824075eade52c5b9d6341e18d86ef803498f 100644 (file)
Binary files a/Resources/Audio/Effects/metalbreak.ogg and b/Resources/Audio/Effects/metalbreak.ogg differ

diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index fc2a75780aff988b7f7a227add45e2690c3770e9..56f49df391d7788761a6fb24c8a1df575b2bdba0 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -149,7 +149,8 @@
         damage: 300
       behaviors:
       - !type:PlaySoundBehavior
-        sound: /Audio/Effects/metalbreak.ogg
+        sound:
+          path: /Audio/Effects/metalbreak.ogg
       - !type:EmptyContainersBehaviour
         containers:
         - borg_brain

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
index e54167aa3e32f010ed31062d920128318aa15163..9e0bd89184f1211db6d991eb0eec46b1032ccbc0 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
@@ -34,6 +34,8 @@
       - !type:PlaySoundBehavior
         sound:
           collection: GlassBreak
+          params:
+            volume: -8
       - !type:SpawnEntitiesBehavior
         spawn:
           FoodPlateTrash:
@@ -84,6 +86,8 @@
       - !type:PlaySoundBehavior
         sound:
           collection: GlassBreak
+          params:
+            volume: -8
       - !type:SpawnEntitiesBehavior
         spawn:
           FoodPlateSmallTrash:

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
index ccb0923694486ff911ddbd7ec27ed30c550e80aa..0dca39ea481365160f04443fb8a37fa3d930a2aa 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
@@ -48,6 +48,8 @@
       - !type:PlaySoundBehavior
         sound:
           collection: GlassBreak
+          params:
+            volume: -8
       - !type:SpillBehavior { }
       - !type:SpawnEntitiesBehavior
         spawn:

diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
index 56d8d26319e840e390de7c9d24c6507ff0310798..b5d98cf7aba6ffbd90b90300fa058653b45c0b4a 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
@@ -36,6 +36,8 @@
       - !type:PlaySoundBehavior
         sound:
           collection: GlassBreak
+          params:
+            volume: -4
       - !type:SpawnEntitiesBehavior
         spawn:
           ShardGlass:
@@ -157,6 +159,8 @@
       - !type:PlaySoundBehavior
         sound:
           collection: GlassBreak
+          params:
+            volume: -4
       - !type:SpawnEntitiesBehavior
         spawn:
           ShardGlassReinforced:
@@ -231,6 +235,8 @@
       - !type:PlaySoundBehavior
         sound:
           collection: GlassBreak
+          params:
+            volume: -4
       - !type:SpawnEntitiesBehavior
         spawn:
           ShardGlassPlasma:
@@ -357,6 +363,8 @@
       - !type:PlaySoundBehavior
         sound:
           collection: GlassBreak
+          params:
+            volume: -4
       - !type:SpawnEntitiesBehavior
         spawn:
           ShardGlassUranium:

diff --git a/Resources/Prototypes/Entities/Objects/Misc/candy_bowl.yml b/Resources/Prototypes/Entities/Objects/Misc/candy_bowl.yml
index 94b459e00ae019755a311a8513a7d2ddc1006437..843b402a6c86497e720315c5c4b2d7a91825bbcf 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/candy_bowl.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/candy_bowl.yml
@@ -39,6 +39,8 @@
       - !type:PlaySoundBehavior
         sound:
           collection: GlassBreak
+          params:
+            volume: -4
       - !type:SpawnEntitiesBehavior
         spawn:
           ShardGlass:

diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
index 3a13ac239c4a788e8eadbc604437a44baa470d87..02033a137a062160069138f5597d994ed024bdd6 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
@@ -24,7 +24,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 40
+        damage: 30
       behaviors:
         - !type:DoActsBehavior
           acts: [ "Destruction" ]
@@ -33,7 +33,10 @@
         damage: 20
       behaviors:
       - !type:PlaySoundBehavior
-        sound: /Audio/Effects/metalbreak.ogg
+        sound:
+          path: /Audio/Effects/metalbreak.ogg
+          params:
+            volume: -8
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: DamageOnLand
@@ -353,7 +356,7 @@
       - FloorMiningLight
   - type: Stack
     stackType: FloorTileMiningLight
-    
+
 # Departamental
 - type: entity
   name: freezer tile

diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml
index 17b7ec179e5397851ad9491e46185891b3cc0bea..05454c374f284d59c9ee302f32c1b199f28a31d7 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -39,6 +39,8 @@
       - !type:PlaySoundBehavior
         sound:
           collection: GlassBreak
+          params:
+            volume: -8
       - !type:DoActsBehavior
         acts: [ "Breakage" ]
     - trigger:
@@ -48,6 +50,8 @@
       - !type:PlaySoundBehavior
         sound:
           collection: GlassBreak
+          params:
+            volume: -8
       - !type:SpawnEntitiesBehavior
         spawn:
           ShardGlass:

diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
index 7dddb71c0d0729952237944b9b93ba7bcc2fcc53..acfb65aa54fab54d63f78bb243d10513c24b7190 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
@@ -79,6 +79,8 @@
       - !type:PlaySoundBehavior
         sound:
           collection: GlassBreak
+          params:
+            volume: -4
       - !type:SpillBehavior { }
       - !type:SpawnEntitiesBehavior
         spawn:

diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index d22e5d14186705cbfb3c39b8f5893b37f9d3ee63..2fad96411fccdc2e51856081212ce913587a0b15 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -62,6 +62,8 @@
       - !type:PlaySoundBehavior
         sound:
           collection: GlassBreak
+          params:
+            volume: -4
       - !type:SpillBehavior
         solution: beaker
       - !type:SpawnEntitiesBehavior

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
index aa383b6f0c8d53f4e2cf2a0a7ee1ac0e5aeabd32..e704fc90a4fe5b581e2531ea2c2cc2ec5bd8b92d 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
@@ -93,6 +93,8 @@
       - !type:PlaySoundBehavior
         sound:
           collection: GlassBreak
+          params:
+            volume: -4
       - !type:SpawnEntitiesBehavior
         spawn:
           PartRodMetal1:

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
index 5036ab83c842c1a9d01b8db24a8c9372f277aed5..5c42e7cf32ccc317fa5f44bfa95c89a963540c6e 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
@@ -42,6 +42,8 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Effects/metalbreak.ogg
+          params:
+            volume: -6
       - !type:SpawnEntitiesBehavior
         spawn:
           PartRodMetal1:
@@ -140,6 +142,8 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Effects/metalbreak.ogg
+          params:
+            volume: -6
       - !type:SpawnEntitiesBehavior
         spawn:
           SheetSteel1:
@@ -179,6 +183,8 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Effects/metalbreak.ogg
+          params:
+            volume: -6
       - !type:SpawnEntitiesBehavior
         spawn:
           SheetSteel1:
@@ -215,6 +221,8 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Effects/metalbreak.ogg
+          params:
+            volume: -6
       - !type:SpawnEntitiesBehavior
         spawn:
           SheetSteel1:
@@ -601,6 +609,8 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Effects/metalbreak.ogg
+          params:
+            volume: -6
       - !type:SpawnEntitiesBehavior
         spawn:
           SheetSteel1:

diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
index 70a4d7e3da09ea40f5cfd8e33d13ee498c654b89..b1804e6b7b118030b1e1b34c386b24140c486634 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
@@ -91,6 +91,8 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Effects/metalbreak.ogg
+          params:
+            volume: -6
       - !type:SpawnEntitiesBehavior
         spawn:
           SheetSteel1:

diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
index a312979507b781572fe1489e58bac3c7a3397a1f..1441d6f30829c0a845203a0d37ef7aab72a084bd 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
@@ -34,6 +34,8 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Effects/metalbreak.ogg
+          params:
+            volume: -8
       - !type:SpawnEntitiesBehavior
         spawn:
           GasPipeBroken:

diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
index 40fb09f7ef85882ee86121de2214e407c6043db6..2fcc18e1b36040913d1f119a4c474b0e55c05372 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
@@ -56,6 +56,8 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Effects/metalbreak.ogg
+          params:
+            volume: -6
       - !type:SpawnEntitiesBehavior
         spawn:
           SheetSteel1:

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
index 8dac19d80d1026327e206ae51b2a2f15226bb637..1b5bf42923c4b53bef2c474399a96a04e98e1e44 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
@@ -36,6 +36,8 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Effects/metalbreak.ogg
+          params:
+            volume: -6
       - !type:SpawnEntitiesBehavior
         spawn:
           SheetSteel1:

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
index 5edad73e3377e14d18f7f80efced66c10a2ec4bb..cf1482b8af6e1eac6beddd6c2b3e86a42f421547 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
@@ -75,6 +75,8 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Effects/metalbreak.ogg
+          params:
+            volume: -6
       - !type:SpawnEntitiesBehavior
         spawn:
           SheetSteel1:
@@ -148,6 +150,8 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Effects/metalbreak.ogg
+          params:
+            volume: -6
       - !type:SpawnEntitiesBehavior
         spawn:
           SheetSteel1:
@@ -254,6 +258,8 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Effects/metalbreak.ogg
+          params:
+            volume: -6
       - !type:SpawnEntitiesBehavior
         spawn:
           SheetSteel1:

diff --git a/Resources/Prototypes/Entities/Structures/Storage/storage.yml b/Resources/Prototypes/Entities/Structures/Storage/storage.yml
index c8723ffefaea2febefcbd2a7d21572d9f09d52eb..2069fb1e3f14a4d3314464f81bcfff29cea618ad 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/storage.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/storage.yml
@@ -48,6 +48,8 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Effects/metalbreak.ogg
+          params:
+            volume: -6
       - !type:SpawnEntitiesBehavior
         spawn:
           SheetSteel1:

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
index 3e91daaa3904a7cd9ed5a76f36742f529e9d4d7b..ad3997fe6db05b4980057b3cda6ce2db92242d5c 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
@@ -103,6 +103,8 @@
           - !type:PlaySoundBehavior
             sound:
               path: /Audio/Effects/metalbreak.ogg
+              params:
+                volume: -4
 
 - type: entity
   id: AirAlarmAssembly

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
index 44e1ff4add9b1f7addb2407a77d0fa73973022cf..ca2b381142fd6437acbe70323df2bc541557f898 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
@@ -55,6 +55,8 @@
             - !type:PlaySoundBehavior
               sound:
                 path: /Audio/Effects/metalbreak.ogg
+                params:
+                  volume: -4
   placement:
     mode: SnapgridCenter
 

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
index 7e0635edc8278b563f781b99c85f69fdf37f7db0..52cc3458f749e3e7ee6d48f00b3151665423b02a 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
@@ -102,6 +102,8 @@
           - !type:PlaySoundBehavior
             sound:
               path: /Audio/Effects/metalbreak.ogg
+              params:
+                volume: -4
   placement:
     mode: SnapgridCenter
     snap:

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
index c8cdcfd40aac2b8dbcfd57419b62adea64597b2a..375cd359c67ae636c786f922b276acbc17b4288e 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
@@ -82,6 +82,8 @@
           - !type:PlaySoundBehavior
             sound:
               path: /Audio/Effects/metalbreak.ogg
+              params:
+                volume: -4
   - type: GenericVisualizer
     visuals:
       enum.PowerDeviceVisuals.Powered:

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml
index 8679d595e318157d34a8e661c853428d5d0efd66..86eb9badf9cae53b3e2f8dd83a1adcf931d10c83 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml
@@ -64,6 +64,8 @@
           - !type:PlaySoundBehavior
             sound:
               path: /Audio/Effects/metalbreak.ogg
+              params:
+                volume: -8
   placement:
     mode: SnapgridCenter
     snap:

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
index 86ac24169ad5e4a5fd8227a4f61575df08ef8bfe..d000993aea22d96db2afa6dc9e80ab079afdcaf2 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
@@ -92,6 +92,8 @@
           - !type:PlaySoundBehavior
             sound:
               path: /Audio/Effects/metalbreak.ogg
+              params:
+                volume: -8
 
 - type: entity
   id: ApcNetSwitch

diff --git a/Resources/Prototypes/Entities/Structures/Walls/railing.yml b/Resources/Prototypes/Entities/Structures/Walls/railing.yml
index b083771ea90a0f424101be4415bc1f2f737d9fcf..87a89dfc574acfc34fa1aa9f537097a5bfe0ebc5 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Walls/railing.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/railing.yml
@@ -44,6 +44,8 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Effects/metalbreak.ogg
+          params:
+            volume: -6
       - !type:SpawnEntitiesBehavior
         spawn:
           PartRodMetal1:
@@ -111,6 +113,8 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Effects/metalbreak.ogg
+          params:
+            volume: -6
       - !type:SpawnEntitiesBehavior
         spawn:
           PartRodMetal1:
@@ -169,6 +173,8 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Effects/metalbreak.ogg
+          params:
+            volume: -6
       - !type:SpawnEntitiesBehavior
         spawn:
           PartRodMetal1:
@@ -242,6 +248,8 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Effects/metalbreak.ogg
+          params:
+            volume: -6
       - !type:SpawnEntitiesBehavior
         spawn:
           PartRodMetal1:

diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index 37c2b27f89dbd31ad89359e3390a432f4dfd6956..96bc6bee19f18c7dc822ba647e1465148c9beee7 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -720,8 +720,6 @@
           path: /Audio/Effects/metalbreak.ogg
       - !type:DoActsBehavior
         acts: ["Destruction"]
-    destroySound:
-      path: /Audio/Effects/metalbreak.ogg
   - type: Construction
     graph: Girder
     node: diagonalshuttleWall

diff --git a/Resources/Prototypes/Entities/Structures/meat_spike.yml b/Resources/Prototypes/Entities/Structures/meat_spike.yml
index 182ec09c8e11e630b0daa8e3fe115e10079ef5b5..a312fcb835ee493d1d395231391e257e0a5bd299 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/meat_spike.yml
+++ b/Resources/Prototypes/Entities/Structures/meat_spike.yml
@@ -32,6 +32,8 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Effects/metalbreak.ogg
+          params:
+            volume: -4
       - !type:SpawnEntitiesBehavior
         spawn:
           SheetSteel1:

diff --git a/Resources/Prototypes/SoundCollections/explosion.yml b/Resources/Prototypes/SoundCollections/explosion.yml
index e208c9d854bd3230d6114731cfec639207cd7e7d..afc4869aec5df3ded0c4eb45951f68d0e0c2917b 100644 (file)
--- a/Resources/Prototypes/SoundCollections/explosion.yml
+++ b/Resources/Prototypes/SoundCollections/explosion.yml
@@ -1,5 +1,5 @@
 - type: soundCollection
-  id: explosion
+  id: Explosion
   files:
   - /Audio/Effects/explosion1.ogg
   - /Audio/Effects/explosion2.ogg
@@ -7,3 +7,20 @@
   - /Audio/Effects/explosion4.ogg
   - /Audio/Effects/explosion5.ogg
   - /Audio/Effects/explosion6.ogg
+
+- type: soundCollection
+  id: ExplosionSmall
+  files:
+  - /Audio/Effects/explosion_small1.ogg
+  - /Audio/Effects/explosion_small2.ogg
+  - /Audio/Effects/explosion_small3.ogg
+
+- type: soundCollection
+  id: ExplosionFar
+  files:
+  - /Audio/Effects/explosionfar.ogg
+
+- type: soundCollection
+  id: ExplosionSmallFar
+  files:
+  - /Audio/Effects/explosionsmallfar.ogg