Destruction & impact sound rework pass 1 (#24282)

* Various sounds ported

* Replace wall_bonk.ogg

* Metal/metalglass break sound pass

* Replace metalbreak.ogg

* Replace woodhit

* Replcae tap.ogg n some smack uses

* Fix lint

* Replace bang.ogg and some instances of hit_kick.ogg

* couple more

* fix wood sound

* i may be stupid

* le attributing

* bro what

* standardize more destruction sounds

* fix melee hit sound cutting off

* window threshold sounds and remove `destroySound` it literally doesnt exist

diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleTestPrototypes.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleTestPrototypes.cs
index a4f623e8b3fd4c7dad1ddfcb684fdab83f816017..12292f4652dad21b47f165e54291b912a4527c7e 100644 (file)
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleTestPrototypes.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleTestPrototypes.cs
@@ -64,7 +64,7 @@ namespace Content.IntegrationTests.Tests.Destructible
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-            path: /Audio/Effects/woodhit.ogg
+            collection: WoodDestroy
       - !type:SpawnEntitiesBehavior
         spawn:
           {SpawnedEntityId}:
@@ -86,7 +86,7 @@ namespace Content.IntegrationTests.Tests.Destructible
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-            path: /Audio/Effects/woodhit.ogg
+            collection: WoodDestroyHeavy
       - !type:SpawnEntitiesBehavior
         spawn:
           {SpawnedEntityId}:

diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
index 47c0d8497728238a8f6d954666d9711ddbfea535..80f750c715c1d89caec54728966ff3ec5d5c9b52 100644 (file)
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
@@ -106,7 +106,6 @@ namespace Content.IntegrationTests.Tests.Destructible
                 Assert.Multiple(() =>
                 {
                     Assert.That(actsThreshold.Acts, Is.EqualTo(ThresholdActs.Breakage));
-                    Assert.That(audio.GetSound(soundThreshold.Sound), Is.EqualTo("/Audio/Effects/woodhit.ogg"));
                     Assert.That(spawnThreshold.Spawn, Is.Not.Null);
                     Assert.That(spawnThreshold.Spawn, Has.Count.EqualTo(1));
                     Assert.That(spawnThreshold.Spawn.Single().Key, Is.EqualTo(SpawnedEntityId));
@@ -173,7 +172,6 @@ namespace Content.IntegrationTests.Tests.Destructible
                 Assert.Multiple(() =>
                 {
                     Assert.That(actsThreshold.Acts, Is.EqualTo(ThresholdActs.Breakage));
-                    Assert.That(audio.GetSound(soundThreshold.Sound), Is.EqualTo("/Audio/Effects/woodhit.ogg"));
                     Assert.That(spawnThreshold.Spawn, Is.Not.Null);
                     Assert.That(spawnThreshold.Spawn, Has.Count.EqualTo(1));
                     Assert.That(spawnThreshold.Spawn.Single().Key, Is.EqualTo(SpawnedEntityId));
@@ -236,7 +234,6 @@ namespace Content.IntegrationTests.Tests.Destructible
                 Assert.Multiple(() =>
                 {
                     Assert.That(actsThreshold.Acts, Is.EqualTo(ThresholdActs.Breakage));
-                    Assert.That(audio.GetSound(soundThreshold.Sound), Is.EqualTo("/Audio/Effects/woodhit.ogg"));
                     Assert.That(spawnThreshold.Spawn, Is.Not.Null);
                     Assert.That(spawnThreshold.Spawn, Has.Count.EqualTo(1));
                     Assert.That(spawnThreshold.Spawn.Single().Key, Is.EqualTo(SpawnedEntityId));

diff --git a/Content.Server/Ame/Components/AmeControllerComponent.cs b/Content.Server/Ame/Components/AmeControllerComponent.cs
index abdb76c9e33cd0bc722b41430d5a7ea0ae12ba9a..2b7a46e947afbf33a8eba29f6ee3a263cddd8f92 100644 (file)
--- a/Content.Server/Ame/Components/AmeControllerComponent.cs
+++ b/Content.Server/Ame/Components/AmeControllerComponent.cs
@@ -59,7 +59,7 @@ public sealed partial class AmeControllerComponent : SharedAmeControllerComponen
     /// </summary>
     [DataField("injectSound")]
     [ViewVariables(VVAccess.ReadWrite)]
-    public SoundSpecifier InjectSound = new SoundPathSpecifier("/Audio/Effects/bang.ogg");
+    public SoundSpecifier InjectSound = new SoundCollectionSpecifier("MetalThud");
 
     /// <summary>
     /// The last time this could have injected fuel into the AME.

diff --git a/Content.Server/ImmovableRod/ImmovableRodComponent.cs b/Content.Server/ImmovableRod/ImmovableRodComponent.cs
index 75b82d117a0d49c639ad1624d4c84d91597a0518..f360591479551c51ff988c0a5c9734b3d2477719 100644 (file)
--- a/Content.Server/ImmovableRod/ImmovableRodComponent.cs
+++ b/Content.Server/ImmovableRod/ImmovableRodComponent.cs
@@ -8,7 +8,7 @@ public sealed partial class ImmovableRodComponent : Component
     public int MobCount = 0;
 
     [DataField("hitSound")]
-    public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Effects/bang.ogg");
+    public SoundSpecifier Sound = new SoundCollectionSpecifier("MetalSlam");
 
     [DataField("hitSoundProbability")]
     public float HitSoundProbability = 0.1f;

diff --git a/Content.Shared/Doors/Components/DoorComponent.cs b/Content.Shared/Doors/Components/DoorComponent.cs
index d4d121a87a6173aaf2eff79e34640b1516afba53..135f8b0856d9af368c5a1cd4e263668136ed7d41 100644 (file)
--- a/Content.Shared/Doors/Components/DoorComponent.cs
+++ b/Content.Shared/Doors/Components/DoorComponent.cs
@@ -100,7 +100,7 @@ public sealed partial class DoorComponent : Component
     /// Sound to play when a disarmed (hands comp with 0 hands) entity opens the door. What?
     /// </summary>
     [DataField("tryOpenDoorSound")]
-    public SoundSpecifier TryOpenDoorSound = new SoundPathSpecifier("/Audio/Effects/bang.ogg");
+    public SoundSpecifier TryOpenDoorSound = new SoundCollectionSpecifier("MetalSlam");
 
     /// <summary>
     /// Sound to play when door has been emagged or possibly electrically tampered

diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
index cec7402faca4002c9324223fcf06a0dfd6a231b6..27c3a5f0dfa500f0b64b8d90bb89efc1d7a89d57 100644 (file)
--- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
+++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
@@ -138,7 +138,7 @@ public sealed partial class MeleeWeaponComponent : Component
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
     [DataField("soundNoDamage"), AutoNetworkedField]
-    public SoundSpecifier NoDamageSound { get; set; } = new SoundPathSpecifier("/Audio/Weapons/tap.ogg");
+    public SoundSpecifier NoDamageSound { get; set; } = new SoundCollectionSpecifier("WeakHit");
 }
 
 /// <summary>

diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 6fa461860f6e3fdc7d0ba4ce7f293e5f068a16ed..11228bba9ecce0a9b67e4c1420b5ddeaae85bb51 100644 (file)
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -740,22 +740,27 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
     {
         var playedSound = false;
 
+        if (Deleted(target))
+            return;
+
+        // hitting can obv destroy an entity so we play at coords and not following them
+        var coords = Transform(target).Coordinates;
         // Play sound based off of highest damage type.
         if (TryComp<MeleeSoundComponent>(target, out var damageSoundComp))
         {
             if (type == null && damageSoundComp.NoDamageSound != null)
             {
-                Audio.PlayPredicted(damageSoundComp.NoDamageSound, target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
+                Audio.PlayPredicted(damageSoundComp.NoDamageSound, coords, user, AudioParams.Default.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
             else if (type != null && damageSoundComp.SoundTypes?.TryGetValue(type, out var damageSoundType) == true)
             {
-                Audio.PlayPredicted(damageSoundType, target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
+                Audio.PlayPredicted(damageSoundType, coords, user, AudioParams.Default.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
             else if (type != null && damageSoundComp.SoundGroups?.TryGetValue(type, out var damageSoundGroup) == true)
             {
-                Audio.PlayPredicted(damageSoundGroup, target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
+                Audio.PlayPredicted(damageSoundGroup, coords, user, AudioParams.Default.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
         }
@@ -765,12 +770,12 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
         {
             if (hitSoundOverride != null)
             {
-                Audio.PlayPredicted(hitSoundOverride, target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
+                Audio.PlayPredicted(hitSoundOverride, coords, user, AudioParams.Default.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
             else if (hitSound != null)
             {
-                Audio.PlayPredicted(hitSound, target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
+                Audio.PlayPredicted(hitSound, coords, user, AudioParams.Default.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
         }
@@ -789,10 +794,10 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
                     break;
                 // No damage, fallback to tappies
                 case null:
-                    Audio.PlayPredicted(new SoundPathSpecifier("/Audio/Weapons/tap.ogg"), target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
+                    Audio.PlayPredicted(new SoundCollectionSpecifier("WeakHit"), target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
                     break;
                 case "Brute":
-                    Audio.PlayPredicted(new SoundPathSpecifier("/Audio/Weapons/smash.ogg"), target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
+                    Audio.PlayPredicted(new SoundCollectionSpecifier("MetalThud"), target, user, AudioParams.Default.WithVariation(DamagePitchVariation));
                     break;
             }
         }

diff --git a/Content.Shared/Xenoarchaeology/Equipment/ArtifactCrusherComponent.cs b/Content.Shared/Xenoarchaeology/Equipment/ArtifactCrusherComponent.cs
index 6bfbe5d05e2e7089af0b392fa344d8edeb0e3af4..687b29f2083381558735e2783a57075040657b6c 100644 (file)
--- a/Content.Shared/Xenoarchaeology/Equipment/ArtifactCrusherComponent.cs
+++ b/Content.Shared/Xenoarchaeology/Equipment/ArtifactCrusherComponent.cs
@@ -88,7 +88,7 @@ public sealed partial class ArtifactCrusherComponent : Component
     /// Sound played at the end of a successful crush.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public SoundSpecifier? CrushingCompleteSound = new SoundPathSpecifier("/Audio/Effects/metal_crunch.ogg");
+    public SoundSpecifier? CrushingCompleteSound = new SoundCollectionSpecifier("MetalCrunch");
 
     /// <summary>
     /// Sound played throughout the entire crushing. Cut off if ended early.

diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml
index fecc4267ba51df93eadc26468e56fb97b1a53795..f8568718461661dfa131179913d76216dfaef7f9 100644 (file)
--- a/Resources/Audio/Effects/attributions.yml
+++ b/Resources/Audio/Effects/attributions.yml
@@ -77,12 +77,12 @@
   license: "CC-BY-NC-SA-3.0"
   copyright: "Taken from DragishaRambo21 via freesound.org and mixed from stereo to mono."
   source: "https://freesound.org/people/DragishaRambo21/sounds/345920/"
-  
+
 - files: ["tesla_consume.ogg"]
   license: "CC0-1.0"
   copyright: "Taken from egomassive via freesound.org and mixed from stereo to mono."
   source: "https://freesound.org/people/egomassive/sounds/536741/"
-  
+
 - files: ["sizzle.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Recorded by deltanedas for SS14"
@@ -93,11 +93,6 @@
   license: Custom
   source: https://gdc.sonniss.com
 
-- files: ["wall_bonk.ogg"]
-  copyright: '"Nuts and Bolts" by 344 Audio of SONNISS.com. See https://sonniss.com/gdc-bundle-license/ for license.'
-  license: Custom
-  source: https://gdc.sonniss.com
-
 - files: ["pop.ogg"]
   copyright: '"pop.ogg" by mirrorcult of GitHub.com'
   license: "CC0-1.0"
@@ -132,6 +127,26 @@
   license: "CC-BY-NC-4.0"
   source: "https://freesound.org/people/PNMCarrieRailfan/sounds/682439/"
 
+- files: ["metal_slam5.ogg", "metal_break1.ogg", "metal_break1.ogg", "metal_break1.ogg", "metal_break1.ogg", "metal_break5.ogg", "metal_glass_break1.ogg", "metal_glass_break2.ogg"]
+  copyright: 'Created by and released in a sound pack by PNMCarrieRailfan on Freesound.org. Cut, edited and exported to mono .ogg by mirrorcult (github)'
+  license: "CC-BY-NC-4.0"
+  source: "https://freesound.org/people/PNMCarrieRailfan/packs/38016/"
+
+- files: ["glass_break1.ogg", "glass_break2.ogg", "glass_break3.ogg", "glass_break4.ogg", "glass_smack.ogg", "glass_smash.ogg", "metal_thud1.ogg", "metal_thud2.ogg", "metal_thud3.ogg", "weak_hit.ogg", "wood_destroy1.ogg", "window_shatter1.ogg", "window_shatter2.ogg", "window_shatter3.ogg"]
+  copyright: "CM-SS13 at 84dc482572649ae7c2264c71ea1fe9fd169e4774"
+  license: "CC-BY-SA-3.0"
+  source: "https://github.com/cmss13-devs/cmss13"
+
+- files: ["glass_crack1.ogg", "glass_crack2.ogg", "glass_crack3.ogg", "glass_crack4.ogg", "metal_scrape1.ogg", "metal_scrape2.ogg", "metal_scrape3.ogg"]
+  copyright: "Baystation 12 at 23c0d851246ebbaeb0df647318ce9874da895d3d"
+  license: "CC-BY-SA-3.0"
+  source: "https://github.com/Baystation12/Baystation12"
+
+- files: ["wood_destroy2.ogg", "wood_destroy3.ogg", "wood_destroy_heavy1.ogg", "metal_slam1.ogg", "metal_slam2.ogg", "metal_slam3.ogg"]
+  copyright: "Based on sounds from OpenSourceWeb at edb003dc8ff5009476a9bcb74e79206039fb3390, edited and reworked by mirrorcult"
+  license: "CC-BY-SA-3.0"
+  source: "https://github.com/Open-SourceWeb/OpenSourceWeb"
+
 - files: ["voteding.ogg"]
   copyright: '"Bike, Bell Ding, Single, 01-01.wav" byInspectorJ (www.jshaw.co.uk) of Freesound.org; The volume has been reduced.'
   license: "CC-BY-4.0"

diff --git a/Resources/Audio/Effects/bang.ogg b/Resources/Audio/Effects/bang.ogg
deleted file mode 100644 (file)
index 656983f..0000000
Binary files a/Resources/Audio/Effects/bang.ogg and /dev/null differ

diff --git a/Resources/Audio/Effects/glass_break1.ogg b/Resources/Audio/Effects/glass_break1.ogg
index fe14cdeda3415a8934a11ae50bba11b14f4f016a..686ce671feca61f295d18e7756d10a2347193649 100644 (file)
Binary files a/Resources/Audio/Effects/glass_break1.ogg and b/Resources/Audio/Effects/glass_break1.ogg differ

diff --git a/Resources/Audio/Effects/glass_break2.ogg b/Resources/Audio/Effects/glass_break2.ogg
index 79163acc19e94abe74eb14b1a9d6d28ecfbd6514..3404ddfe5238ea95392a1d4de06bb94ac34bbeea 100644 (file)
Binary files a/Resources/Audio/Effects/glass_break2.ogg and b/Resources/Audio/Effects/glass_break2.ogg differ

diff --git a/Resources/Audio/Effects/glass_break3.ogg b/Resources/Audio/Effects/glass_break3.ogg
index bc45ab333240d76ab1edfab8073f668286b515da..28f7a3c9327277c1c06e2baf8079f2dbb60f169e 100644 (file)
Binary files a/Resources/Audio/Effects/glass_break3.ogg and b/Resources/Audio/Effects/glass_break3.ogg differ

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

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

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

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

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

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

diff --git a/Resources/Audio/Effects/wall_bonk.ogg b/Resources/Audio/Effects/glass_smack.ogg
similarity index 60%
rename from Resources/Audio/Effects/wall_bonk.ogg
rename to Resources/Audio/Effects/glass_smack.ogg
index b1c5505f61d4a1b46c3756f3511ab40c52418519..59931e6a73ca74eb7ae7cd508aa75f8146a71c8a 100644 (file)
Binary files a/Resources/Audio/Effects/wall_bonk.ogg and b/Resources/Audio/Effects/glass_smack.ogg differ

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/Resources/Audio/Weapons/tap.ogg b/Resources/Audio/Effects/weak_hit2.ogg
similarity index 100%
rename from Resources/Audio/Weapons/tap.ogg
rename to Resources/Audio/Effects/weak_hit2.ogg

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

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

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

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

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

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

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

diff --git a/Resources/Audio/Effects/woodhit.ogg b/Resources/Audio/Effects/woodhit.ogg
deleted file mode 100644 (file)
index 04ff37f..0000000
Binary files a/Resources/Audio/Effects/woodhit.ogg and /dev/null differ

diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 2f2a42388f08f062ea50e5c0e81d768db1f4895d..9085a87f15237a48cb5a118fa679b0e17650d85c 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -14,7 +14,7 @@
       types:
         Blunt: 5
     soundHit:
-      path: /Audio/Effects/hit_kick.ogg
+      collection: MetalThud
   - type: CombatMode
   - type: NoSlip
   - type: StaticPrice
@@ -159,7 +159,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
       - !type:EmptyContainersBehaviour
         containers:
         - borg_brain
@@ -249,4 +249,4 @@
       channels:
         - Syndicate
     - type: ShowSyndicateIcons
-    - type: MovementAlwaysTouching
\ No newline at end of file
+    - type: MovementAlwaysTouching

diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
index 08c37b56febefb9e8edbc9cc9e7312d4a79e2e3f..06eda05ee15388675d07d189748e33210888f6e0 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -26,7 +26,7 @@
         types:
           Blunt: 5
       soundHit:
-        path: /Audio/Effects/hit_kick.ogg
+        collection: MetalThud
     - type: RandomSprite
       available:
         - enum.DamageStateVisualLayers.Base:

diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
index aedc1eaab882f1a19ddbc016aa93d7649f5f71c7..072c419bc86ad567d2f1c70abb4a7b5b3012c56e 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -13,7 +13,7 @@
       types:
         Blunt: 5
     soundHit:
-      path: /Audio/Effects/hit_kick.ogg
+      collection: MetalThud
   - type: Clickable
   - type: Damageable
     damageContainer: Inorganic

diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
index 8dd3023a0ef1a72a1c4e26b50cc80375357d8769..ac457c95475b22fc0daf9070bd9684bcde4f1db1 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
@@ -62,7 +62,7 @@
       behaviors:
         - !type:PlaySoundBehavior
           sound:
-            path: /Audio/Effects/metalbreak.ogg
+            collection: MetalBreak
             params:
               volume: -8
         - !type:SpawnEntitiesBehavior

diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
index 5cc4c7ec53f19d0c88e67b841061e7332622fe69..799e2921e49fbd53227621bf9c2e44add2c34076 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -223,7 +223,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/glass_break1.ogg
+          collection: GlassBreak
       - !type:SpawnEntitiesBehavior
         spawn:
           FloodlightBroken:
@@ -259,7 +259,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalGlassBreak
       - !type:SpawnEntitiesBehavior
         spawn:
           SheetSteel1:

diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
index 71bd2753faa7fecf01a97543a826e384aada6e66..361efb52663a7d865ec907e85a3c082e1513c52b 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
@@ -34,7 +34,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
           params:
             volume: -8
       - !type:DoActsBehavior

diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml
index 9a30ec4da3d1941134a0034791dd2a1058f61e05..40f6bf6dbed5631b475883af7fe88280d3bf4a81 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -6,8 +6,7 @@
   - type: MeleeSound
     soundGroups:
       Brute:
-        path:
-          "/Audio/Effects/glass_hit.ogg"
+        collection: GlassSmash
   - type: Sprite
     sprite: Objects/Power/light_bulb.rsi
     layers:

diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
index 4761e81de8c7a3575d7407065531b92ed8a6403f..7427b7f87a3e93541c00d5c03aacb38cce2f3b1b 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -47,7 +47,8 @@
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
             - !type:PlaySoundBehavior
-              sound: /Audio/Effects/metalbreak.ogg
+              sound:
+                collection: MetalBreak
             - !type:SpawnEntitiesBehavior
               spawn:
                 SheetSteel:
@@ -160,7 +161,8 @@
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
             - !type:PlaySoundBehavior
-              sound: /Audio/Effects/metalbreak.ogg
+              sound:
+                collection: WoodDestroy
             - !type:SpawnEntitiesBehavior
               spawn:
                 MaterialWoodPlank:
@@ -215,7 +217,8 @@
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
             - !type:PlaySoundBehavior
-              sound: /Audio/Effects/metalbreak.ogg
+              sound:
+                collection: MetalBreak
             - !type:SpawnEntitiesBehavior
               spawn:
                 SheetSteel:
@@ -273,7 +276,7 @@
                   max: 1
             - !type:PlaySoundBehavior
               sound:
-                path: /Audio/Effects/woodhit.ogg
+                collection: WoodDestroy
 
 #Magic/Cult Shields (give these to wizard for now)
 
@@ -346,7 +349,8 @@
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
             - !type:PlaySoundBehavior
-              sound: /Audio/Effects/glass_break1.ogg
+              sound:
+                collection: GlassBreak
             - !type:SpawnEntitiesBehavior
               spawn:
                 SheetGlass:
@@ -440,7 +444,8 @@
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
             - !type:PlaySoundBehavior
-              sound: /Audio/Effects/metalbreak.ogg
+              sound:
+                collection: GlassBreak
             - !type:SpawnEntitiesBehavior
               spawn:
                 BrokenEnergyShield:
@@ -518,7 +523,8 @@
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
             - !type:PlaySoundBehavior
-              sound: /Audio/Effects/metalbreak.ogg
+              sound:
+                collection: MetalGlassBreak
             - !type:SpawnEntitiesBehavior
               spawn:
                 SheetSteel:

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index e284944a537cdb117b9abdce81616196d0781197..3f53b3e1cea051327862ecd9628345b7f98141f2 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -401,7 +401,7 @@
               acts: ["Destruction"]
             - !type:PlaySoundBehavior
               sound:
-                path: /Audio/Effects/metalbreak.ogg
+                collection: MetalBreak
     - type: ItemMapper
       mapLayers:
         cart_plunger:
@@ -544,7 +544,7 @@
               acts: [ "Destruction" ]
             - !type:PlaySoundBehavior
               sound:
-                path: /Audio/Effects/metalbreak.ogg
+                collection: MetalBreak
 
 - type: entity
   name: plunger

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml b/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
index 380b2d356306ec45df7e061dd7c5206ac226e361..0894d6a754758e5df40ebe7c9bd76c82d433813d 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
@@ -40,7 +40,7 @@
               acts: ["Destruction"]
             - !type:PlaySoundBehavior
               sound:
-                path: /Audio/Effects/metalbreak.ogg
+                collection: MetalBreak
     - type: Appearance
     - type: UserInterface
       interfaces:

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml b/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml
index b83b2c8ee2bf66b28afac97e43c9c5b967980c6e..035185487de85f2e8dbba49649c5010755c7769f 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml
@@ -67,7 +67,7 @@
             max: 5
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: PointLight

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Security/target.yml b/Resources/Prototypes/Entities/Objects/Specific/Security/target.yml
index 0bbebe3dede73b32164878f14cb55c9584f03374..adbb7cde40b770d25864757d8464e1e9ca2ba0ef 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Security/target.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Security/target.yml
@@ -44,7 +44,7 @@
             max: 5
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
 
@@ -107,6 +107,6 @@
             max: 10
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
       - !type:DoActsBehavior
         acts: [ "Destruction" ]

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
index 67125c8dffb8ed10a89dcc898d18bb850edd9dce..953c05f107e202ff44788889ff20977a1b4e9047 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
@@ -39,7 +39,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
       - !type:DumpRestockInventory
       - !type:DoActsBehavior
         acts: [ "Destruction" ]

diff --git a/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml b/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml
index f3213fdbc936d025ccd511711ae944a47e49873a..cf30f69754d5e1ad61e6208903f19dc9109ec9f0 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml
+++ b/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml
@@ -37,7 +37,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalGlassBreak
       - !type:ExplodeBehavior
 
 - type: entity
@@ -125,7 +125,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalGlassBreak
       - !type:ExplodeBehavior
       - !type:SpawnEntitiesBehavior # in future should also emit a cloud of hot gas
         spawn:
@@ -402,7 +402,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
 
 - type: entity
   parent: VehicleUnicycle

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 86f1f53939e02de1628c6704c1f5e808105cc2da..a442804b3d5567b7c6aa2d50775382a29afb7d4d 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -255,7 +255,7 @@
       types:
         Heat: 5
     soundHit:
-      path: "/Audio/Weapons/tap.ogg"
+      collection: WeakHit
     forceSound: true
 
 - type: entity
@@ -295,7 +295,7 @@
       types:
         Heat: 1
     soundHit:
-      path: "/Audio/Weapons/tap.ogg"
+      collection: WeakHit
     forceSound: true
 
 - type: entity
@@ -866,7 +866,7 @@
       types:
         Heat: 2
     soundHit:
-      path: "/Audio/Weapons/tap.ogg"
+      collection: WeakHit
     forceSound: true
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
index 632e86e4fcc3cdc5b0e1c972913500ea952bfeac..3f75faf75e1ed338ac9b1269fee03fe289d899c7 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
@@ -23,7 +23,7 @@
               acts: [ "Destruction" ]
             - !type:PlaySoundBehavior
               sound:
-                path: /Audio/Effects/metalbreak.ogg
+                collection: MetalGlassBreak
             - !type:SpawnEntitiesBehavior
               spawn:
                 SheetSteel1:
@@ -86,7 +86,7 @@
               acts: [ "Destruction" ]
             - !type:PlaySoundBehavior
               sound:
-                path: /Audio/Effects/metalbreak.ogg
+                collection: MetalGlassBreak
             - !type:SpawnEntitiesBehavior
               spawn:
                 SheetSteel1:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
index 54ee2d90a505ff6f1189ba275dd0c34e6d123647..ca3edf68c0df4f8ac7c4b3e7c1fb20a19309a787 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
@@ -31,7 +31,8 @@
         damage: 15
       behaviors:
       - !type:PlaySoundBehavior
-        sound: /Audio/Effects/metalbreak.ogg
+        sound:
+          collection: MetalBreak
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: DamageOnLand

diff --git a/Resources/Prototypes/Entities/Objects/base_item.yml b/Resources/Prototypes/Entities/Objects/base_item.yml
index bcc8e0dce4903c50f18bf262781bb80803626512..528069106b14aa6ed75d63253622087b3cf8c9f5 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/base_item.yml
+++ b/Resources/Prototypes/Entities/Objects/base_item.yml
@@ -10,7 +10,7 @@
   - type: MovedByPressure
   - type: EmitSoundOnCollide
     sound:
-      path: /Audio/Effects/wall_bonk.ogg
+      collection: WeakHit
   - type: EmitSoundOnLand
     sound:
       path: /Audio/Effects/drop.ogg
@@ -21,7 +21,7 @@
       types:
         Blunt: 5
     soundHit:
-      path: /Audio/Effects/hit_kick.ogg
+      collection: MetalThud
   - type: CollisionWake
   - type: TileFrictionModifier
     modifier: 0.5

diff --git a/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml b/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml
index 3172989d4ff49827b87072a71b94acbdbbc1b627..53cc75faa61b5bcd204f8d50a85315e451e25875 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml
@@ -23,7 +23,7 @@
           behaviors:
             - !type:PlaySoundBehavior
               sound:
-                path: /Audio/Effects/metalbreak.ogg
+                collection: MetalBreak
             - !type:SpawnEntitiesBehavior
               spawn:
                 PartRodMetal1:

diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
index c54e9f548be713ce254cf22842e8d426a5784b08..d87c5e700abe2b0f162a9db86144aa8175bf552f 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
@@ -53,7 +53,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalGlassBreak
   - type: ReagentDispenser
     storageWhitelist:
       tags:

diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
index 2d98b9ff35676c46343261e8e6b1a75dd704633b..79a17153abf9578d7d51fdf88a37524ab39e02fb 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
@@ -22,6 +22,9 @@
         !type:DamageTrigger
         damage: 100
       behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
       - !type:ChangeConstructionNodeBehavior
         node: machineFrame
       - !type:DoActsBehavior

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
index 80d5011ce36bf3153ccd9505bd4cdbd19ee22199..549a42c26411615edbebf4d9a37f9aa3f6e2bb9a 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
@@ -129,7 +129,7 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/hatch_maint.rsi
- 
+
 # Glass
 
 - type: entity
@@ -140,8 +140,7 @@
   - type: MeleeSound
     soundGroups:
       Brute:
-        path:
-          "/Audio/Effects/glass_hit.ogg"
+        collection: GlassSmack
   - type: Door
     occludes: false
   - type: Occluder

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
index 22770ffc185943f8e5b1f6ade7f16cd79d3bbf9b..d610fb25fba42fc0bb201ba2a44fa2a99558206d 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
@@ -118,6 +118,10 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
+      # TODO this should go to the broken node first
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalSlam
   - type: Construction
     graph: Airlock
     node: airlock

diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
index f661b507bd701ebeace3846f3895cbb4c1fbc388..d3b8521a9bc91722d03e625946f856dcdad22d49 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
@@ -233,7 +233,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/woodhit.ogg
+          collection: WoodDestroy
       - !type:SpawnEntitiesBehavior
         spawn:
           MaterialWebSilk:

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
index e3fab04da889cf92789a1a837348d82b9f2896f1..4281177b4b95cdd4a524e8ca14a17b7999ff6b50 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
@@ -8,8 +8,7 @@
   - type: MeleeSound
     soundGroups:
       Brute:
-        path:
-          "/Audio/Effects/glass_hit.ogg"
+        collection: GlassSmash
   - type: InteractionOutline
   - type: Physics
   - type: Fixtures

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
index b984693a300e687723929e5ddc3009061614bb65..63d950969d5279f41d1b7f701358b2e35f9f3a43 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
@@ -41,7 +41,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
           params:
             volume: -6
       - !type:SpawnEntitiesBehavior
@@ -98,7 +98,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/woodhit.ogg
+          collection: WoodDestroy
       - !type:SpawnEntitiesBehavior
         spawn:
           MaterialWoodPlank1:
@@ -141,7 +141,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
           params:
             volume: -6
       - !type:SpawnEntitiesBehavior
@@ -182,7 +182,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
           params:
             volume: -6
       - !type:SpawnEntitiesBehavior
@@ -220,7 +220,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
           params:
             volume: -6
       - !type:SpawnEntitiesBehavior
@@ -267,13 +267,16 @@
       behaviors:
         - !type:DoActsBehavior
           acts: [ "Destruction" ]
+        - !type:PlaySoundBehavior
+          sound:
+            collection: GlassBreak
     - trigger:
         !type:DamageTrigger
         damage: 5
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/glass_break2.ogg
+          collection: GlassBreak
       - !type:SpawnEntitiesBehavior
         spawn:
           ShardGlass:
@@ -316,13 +319,16 @@
       behaviors: #excess damage (nuke?). avoid computational cost of spawning entities.
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
     - trigger:
         !type:DamageTrigger
         damage: 20
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/glass_break2.ogg
+          collection: GlassBreak
       - !type:ChangeConstructionNodeBehavior
         node: TableFrame
       - !type:SpawnEntitiesBehavior
@@ -368,13 +374,16 @@
       behaviors: #excess damage (nuke?). avoid computational cost of spawning entities.
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
     - trigger:
         !type:DamageTrigger
         damage: 50
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/glass_break2.ogg
+          collection: GlassBreak
       - !type:ChangeConstructionNodeBehavior
         node: TableFrame
       - !type:SpawnEntitiesBehavior
@@ -414,13 +423,16 @@
       behaviors: #excess damage (nuke?). avoid computational cost of spawning entities.
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
     - trigger:
         !type:DamageTrigger
         damage: 15
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/woodhit.ogg
+          collection: WoodDestroy
       - !type:SpawnEntitiesBehavior
         spawn:
           MaterialWoodPlank:
@@ -458,7 +470,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/woodhit.ogg
+          collection: WoodDestroy
       - !type:SpawnEntitiesBehavior
         spawn:
           MaterialWoodPlank:
@@ -589,7 +601,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/woodhit.ogg
+          collection: WoodDestroy
       - !type:SpawnEntitiesBehavior
         spawn:
           MaterialWoodPlank1:
@@ -632,7 +644,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
           params:
             volume: -6
       - !type:SpawnEntitiesBehavior

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/altar.yml b/Resources/Prototypes/Entities/Structures/Furniture/altar.yml
index d34030eb973fdea80de8917ef8af7a71535bab3e..4eaed51597e4671b204c2b41f7d18a4291216767 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Furniture/altar.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/altar.yml
@@ -53,7 +53,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
       - !type:SpawnEntitiesBehavior
         spawn:
           SheetSteel1:
@@ -187,7 +187,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/woodhit.ogg
+          collection: WoodDestroyHeavy
       - !type:SpawnEntitiesBehavior
         spawn:
           MaterialWoodPlank:
@@ -382,7 +382,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
       - !type:SpawnEntitiesBehavior
         spawn:
           SheetSteel1:

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
index 3f0234a089ca768456917149d69d4c6cd150e64d..7a1c066c189e775becfcf7ffeefe01e906d3c8fb 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
@@ -105,7 +105,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/woodhit.ogg
+          collection: WoodDestroy
       - !type:SpawnEntitiesBehavior
         spawn:
           MaterialWoodPlank:
@@ -144,7 +144,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/woodhit.ogg
+          collection: WoodDestroy
       - !type:SpawnEntitiesBehavior
         spawn:
           MaterialWebSilk:

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml b/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml
index b2c53beaff97d22342430e9b41f50d1baf8103ad..86f6719f77ed24a3ba14fc2282ac61346cb72b83 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml
@@ -26,7 +26,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/woodhit.ogg
+          collection: WoodDestroyHeavy
       - !type:SpawnEntitiesBehavior
         spawn:
           MaterialWoodPlank:

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
index 26829aba2d7056454243bf05948381d7b6bd637f..a235cd2546df955fcebe3c0b4e7ab847773419f7 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -45,7 +45,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
   - type: StaticPrice
     price: 10
 
@@ -191,7 +191,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/woodhit.ogg
+          collection: WoodDestroy
       - !type:SpawnEntitiesBehavior
         spawn:
           MaterialWoodPlank:
@@ -289,7 +289,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/woodhit.ogg
+          collection: WoodDestroy
       - !type:SpawnEntitiesBehavior
         spawn:
           MaterialWebSilk:

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
index 53abcf592a8ffe4abae81229d7a1fdf596670be8..161ea25bc43aedc49dec289a94c443dfdf8fb002 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
@@ -22,7 +22,8 @@
         visible: false
     - type: MovedByPressure
     - type: DamageOnHighSpeedImpact
-      soundHit: /Audio/Effects/bang.ogg
+      soundHit:
+        collection: MetalThud
     - type: InteractionOutline
     - type: Physics
     - type: Fixtures

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/sink.yml b/Resources/Prototypes/Entities/Structures/Furniture/sink.yml
index 9ae1a2bb3df35b05f405db4be420c9ab5548fe4b..22f0e2dc2a98eb32911bbe6e61633e4cfa763cc1 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Furniture/sink.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/sink.yml
@@ -58,7 +58,7 @@
             acts: [ "Destruction" ]
           - !type:PlaySoundBehavior
             sound:
-              path: /Audio/Effects/metalbreak.ogg
+              collection: MetalBreak
   - type: AmbientSound
     enabled: false
     volume: -8

diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
index a8792b09764e88a88f4fff9aca96c0f774537e2e..13385a763e5503a957ab0ec2516d058690fec9c1 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -13,8 +13,7 @@
   - type: MeleeSound
     soundGroups:
       Brute:
-        path:
-          "/Audio/Effects/glass_hit.ogg"
+        collection: GlassSmash
   - type: Transform
     anchored: true
   - type: Clickable
@@ -49,6 +48,9 @@
       behaviors: #excess damage, don't spawn entities.
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
     - trigger:
         !type:DamageTrigger
         damage: 50
@@ -61,6 +63,9 @@
             max: 2
       - !type:DoActsBehavior
         acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
   placement:
     mode: SnapgridCenter
     snap:

diff --git a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
index 6eda921ca4097bebc3accf1df7cfdda774bfbe9a..470733ea1880882cb3cda727239d454b9ffa6daa 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
@@ -41,7 +41,7 @@
       - !type:EmptyAllContainersBehaviour
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalGlassBreak
 
 - type: entity
   parent: BaseLightStructure

diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
index d1b870646d6997451af888f11b664305be168707..5aa602aedd9355e02dd3280b288bfa498ed1015a 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
@@ -8,8 +8,7 @@
   - type: MeleeSound
     soundGroups:
       Brute:
-        path:
-          "/Audio/Effects/glass_hit.ogg"
+        collection: GlassSmash
   - type: Construction
     graph: Computer
     node: computer

diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
index b1804e6b7b118030b1e1b34c386b24140c486634..884f68fc22951d299256332297077561514f502c 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
@@ -90,7 +90,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalGlassBreak
           params:
             volume: -6
       - !type:SpawnEntitiesBehavior

diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
index 2184ee73ea66032fec5a4c4e0f1540ae813a90c2..f150a3f63b0627dca1bff8ef4f63d586fcec0e85 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
@@ -63,6 +63,9 @@
         damage: 100
       behaviors:
         - !type:EmptyAllContainersBehaviour
+        - !type:PlaySoundBehavior
+          sound:
+            collection: WindowShatter
         - !type:ChangeConstructionNodeBehavior
           node: machineFrame
         - !type:DoActsBehavior

diff --git a/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml b/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
index 3fad77648f3c29dc6522633e965ab9dcf027ba1d..f846eea0050bf3f650198f57fe3c61cb8058640f 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
@@ -85,7 +85,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalGlassBreak
       - !type:ExplodeBehavior
   - type: GuideHelp
     guides:

diff --git a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
index b4665a9b79af977b24c9665e6a67afc3c65f8f5a..621d9a1a7ecbaf420aa6b6c1e15902819001095b 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
@@ -40,7 +40,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
 
 - type: entity
   abstract: true

diff --git a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
index e215a70f4c0178d06f9d227cb94b5fa869f848cc..d7df219663e6e7852e3bdd5ab5de64d3726c36ce 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
@@ -38,6 +38,9 @@
         !type:DamageTrigger
         damage: 50
       behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
       - !type:ChangeConstructionNodeBehavior
         node: machineFrame
       - !type:DoActsBehavior

diff --git a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
index 6067149c8ae32f1be1af03e6d4e23356e502253e..5d9ab0dd7e48b5f94713980393c91adc930e3987 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
@@ -39,6 +39,9 @@
         !type:DamageTrigger
         damage: 100
       behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
       - !type:ChangeConstructionNodeBehavior
         node: machineFrame
       - !type:DoActsBehavior

diff --git a/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml b/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml
index 403fed9dd88d91c55475ef22ef7a117f9732400c..30e42d59ab505505a2ef56ef12b493cffb2ae692 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml
@@ -50,7 +50,7 @@
               acts: ["Destruction"]
             - !type:PlaySoundBehavior
               sound:
-                path: /Audio/Effects/metalbreak.ogg
+                collection: MetalGlassBreak
             - !type:SpawnEntitiesBehavior
               spawn:
                 SheetSteel1:

diff --git a/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml b/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
index 33186f0a1dda8038647aac29c0b6f491f801fa3e..9f09e49059c25254f59ecaddee638b9e2d9617b5 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
@@ -88,6 +88,9 @@
         !type:DamageTrigger
         damage: 100
       behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
       - !type:ChangeConstructionNodeBehavior
         node: machineFrame
       - !type:DoActsBehavior

diff --git a/Resources/Prototypes/Entities/Structures/Machines/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/frame.yml
index 29806e08226ba8d8b8b4318819c7ca3eb4821cff..3b3f0402aa2e6de0817d5c5c52c5ceb2edf59bac 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/frame.yml
@@ -45,6 +45,9 @@
           !type:DamageTrigger
           damage: 100
         behaviors:
+        - !type:PlaySoundBehavior
+          sound:
+            collection: MetalBreak
         - !type:ChangeConstructionNodeBehavior
           node: start
         - !type:DoActsBehavior
@@ -97,6 +100,9 @@
           !type:DamageTrigger
           damage: 100
         behaviors:
+        - !type:PlaySoundBehavior
+          sound:
+            collection: MetalBreak
         - !type:ChangeConstructionNodeBehavior
           node: missingWires
         - !type:DoActsBehavior

diff --git a/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
index 657c597b1489a617595d025cf76779449aa4871d..2eb4f57fab5c154220b37b634597299d8e8fb90b 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
@@ -113,7 +113,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalGlassBreak
       - !type:SpawnEntitiesBehavior
         spawn:
           MachineFrameDestroyed:

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 3fa3a52387f18f7c2c990ce00e189b6d74bd7909..5280f8e594d9ba0700dd4c0535d01a8cb6667ca4 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -25,6 +25,9 @@
         !type:DamageTrigger
         damage: 100
       behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
       - !type:ChangeConstructionNodeBehavior
         node: machineFrame
       - !type:DoActsBehavior

diff --git a/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml b/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml
index 699c3491f1c6d104e46014d4ea846a02cc849eb1..829525439ed384f817a7a37bf5b676ec77bc69d5 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml
@@ -51,6 +51,9 @@
         !type:DamageTrigger
         damage: 100
       behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
       - !type:ChangeConstructionNodeBehavior
         node: machineFrame
       - !type:DoActsBehavior

diff --git a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
index 3cadb180c9828a09ba243d85d5854dec9568a703..6f05baee94447fabff2a24bfad1d292eb5494f3c 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
@@ -59,6 +59,9 @@
         !type:DamageTrigger
         damage: 100
       behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
       - !type:ChangeConstructionNodeBehavior
         node: machineFrame
       - !type:DoActsBehavior

diff --git a/Resources/Prototypes/Entities/Structures/Machines/research.yml b/Resources/Prototypes/Entities/Structures/Machines/research.yml
index f5003b171272cfe97e54dd4eca205a42312168ec..66ea8e538ad96d269c8e63bd876e88fca58fe678 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/research.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/research.yml
@@ -45,7 +45,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
       - !type:SpawnEntitiesBehavior
         spawn:
           SheetSteel1:
@@ -112,7 +112,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
       - !type:SpawnEntitiesBehavior
         spawn:
           SheetSteel1:

diff --git a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
index 95ce0b9d9231be8494171e5466c390a3dfbe3c43..5a62b74ac0a13b844590f4338fec2e9d109d5d17 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
@@ -82,7 +82,7 @@
         acts: [ "Destruction" ]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
@@ -91,4 +91,4 @@
       types:
         Blunt: 5
     soundHit:
-      path: /Audio/Effects/bang.ogg
+      collection: MetalThud

diff --git a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml
index 0f84f200bb07960831982aacd75d85355d4c3b87..e12826a8ce4cf3a3f8c6bb0d1af784bce663c6e4 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/telecomms.yml
@@ -41,6 +41,9 @@
         !type:DamageTrigger
         damage: 100
       behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
       - !type:ChangeConstructionNodeBehavior
         node: machineFrame
       - !type:DoActsBehavior

diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index d15f993e4622465a531e63a472bdb323bfccfab8..0cf1cc9de0880e9beebd5855c125e9216fdc8160 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -52,7 +52,7 @@
         acts: [ "Destruction" ]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalGlassBreak
   - type: ActivatableUI
     key: enum.VendingMachineUiKey.Key
   - type: ActivatableUIRequiresPower

diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
index b99b88483c20741cc788dcb23e1afbcc64fb7e0f..4bea87f8175ae017f6c1f6a1e7fc9d4c2e70d27e 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
@@ -382,6 +382,9 @@
         !type:DamageTrigger
         damage: 100
       behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
       - !type:ChangeConstructionNodeBehavior
         node: machineFrame
       - !type:DoActsBehavior

diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
index 881976f68a3ad0c7caea04fa8557e2ddd19401e9..e5b77095b0e52f8e84611d9cd428f205f33d9482 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
@@ -33,7 +33,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
           params:
             volume: -8
       - !type:SpawnEntitiesBehavior

diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
index b6f1e6ec4bef9455f0b76716c76b42b66970c2b3..e3ae06fa509788e27be853b431efc2e3eb203904 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
@@ -87,7 +87,7 @@
         behaviors:
           - !type:PlaySoundBehavior
             sound:
-              path: /Audio/Effects/metalbreak.ogg
+              collection: MetalBreak
           - !type:SpawnEntitiesBehavior
             spawn:
               SheetSteel1:

diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
index 45030bd28bd7573ebd356ec129fd2f04c5861cfb..c2f8fa339da124345cbb23fcbe8f5501c15ed259 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
@@ -452,7 +452,7 @@
         solution: tank
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
   - type: NodeContainer
     nodes:
       pipe:

diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml
index 80737339453f0567a13b3db6bffb6fd28aa85ed5..6f3d0705cbb796182b84d3064f102021172b4b07 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml
@@ -37,6 +37,9 @@
             !type:DamageTrigger
             damage: 100
           behaviors:
+            - !type:PlaySoundBehavior
+              sound:
+                collection: MetalBreak
             - !type:ChangeConstructionNodeBehavior
               node: start
             - !type:DoActsBehavior

diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
index d4b7c1d3c96ecea69ab20879a69fee7deec6dc90..218b532efcd1dcf6b1bebdd45bc299ae3e4ba72b 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
@@ -43,6 +43,9 @@
         !type:DamageTrigger
         damage: 50
       behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
       - !type:DoActsBehavior
         acts: ["Breakage"]
       - !type:ChangeConstructionNodeBehavior

diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
index 2fcc18e1b36040913d1f119a4c474b0e55c05372..c5f04d80a14fd0ad6c756c70e893977891962db9 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
@@ -55,7 +55,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
           params:
             volume: -6
       - !type:SpawnEntitiesBehavior

diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
index 8492f31e52b0d5e69dea75a58a1e234dfb5c3b35..e5604bea080b5e372f007a532785725f2d6742f9 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
@@ -69,7 +69,7 @@
         behaviors:
         - !type:PlaySoundBehavior
           sound:
-            path: /Audio/Effects/metalbreak.ogg
+            collection: MetalBreak
         - !type:SpawnEntitiesBehavior
           spawn:
             SheetSteel1:

diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
index 8d5621206dbb0e6f8ecf8cd4697b040603285ec0..f236bb8a41e0e915acea52580343207dcb150dae 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
@@ -96,7 +96,7 @@
             acts: [ "Destruction" ]
           - !type:PlaySoundBehavior
             sound:
-              path: /Audio/Effects/metalbreak.ogg
+              collection: MetalBreak
           - !type:SpawnEntitiesBehavior
             spawn:
               SheetSteel1:
@@ -162,7 +162,7 @@
     messages: WindowMessages
   - type: Repairable
   - type: Damageable
-    damageContainer: StructuralInorganic 
+    damageContainer: StructuralInorganic
   - type: DamageVisuals
     thresholds: [8, 16, 25]
     damageDivisor: 3.333
@@ -174,12 +174,12 @@
       - trigger:
           !type:DamageTrigger
           damage: 300
-        behaviors:      
+        behaviors:
           - !type:DoActsBehavior
             acts: [ "Destruction" ]
           - !type:PlaySoundBehavior
             sound:
-              path: /Audio/Effects/metalbreak.ogg
+              collection: MetalBreak
           - !type:SpawnEntitiesBehavior
             spawn:
               SheetSteel1:

diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
index 2bcd65533f6ff81b60928095ab37ce45fde68f47..4948231b9093fb93d34eca72ce3b82d8bfd170a6 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
@@ -71,7 +71,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
       - !type:ExplodeBehavior
   - type: Explosive
     explosionType: Default
@@ -261,7 +261,7 @@
         behaviors:
           - !type:PlaySoundBehavior
             sound:
-              path: /Audio/Effects/metalbreak.ogg
+              collection: MetalBreak
           - !type:SpawnEntitiesBehavior
             spawn:
               GeneratorRTGDamaged:
@@ -305,7 +305,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
       - !type:SpawnEntitiesBehavior
         spawn:
           SheetSteel1:

diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
index 74fa0b2531b9332c68a9c258eab849249b11cce9..d900d791d3e7aaea0bca622bc4e116d99dca87c8 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
@@ -72,7 +72,7 @@
           behaviors:
             - !type:PlaySoundBehavior
               sound:
-                path: /Audio/Effects/metalbreak.ogg
+                collection: MetalBreak
             - !type:ChangeConstructionNodeBehavior
               node: machineFrame
             - !type:DoActsBehavior
@@ -177,7 +177,7 @@
         - output_mv
       sprite: Structures/Power/Generation/portable_generator.rsi
       state: portgen0
-      
+
 - type: entity
   name: S.U.P.E.R.P.A.C.M.A.N.-type portable generator
   description: |-
@@ -233,7 +233,7 @@
         - output_mv
       sprite: Structures/Power/Generation/portable_generator.rsi
       state: portgen1
-      
+
 - type: entity
   name: J.R.P.A.C.M.A.N.-type portable generator
   description: |-
@@ -307,7 +307,7 @@
       nodes:
         output:
           !type:CableDeviceNode
-          nodeGroupID: Apc   
+          nodeGroupID: Apc
     - type: PowerMonitoringDevice
       group: Generator
       loadNode: output
@@ -340,7 +340,7 @@
               solution: tank
             - !type:PlaySoundBehavior
               sound:
-                path: /Audio/Effects/metalbreak.ogg
+                collection: MetalBreak
             - !type:ChangeConstructionNodeBehavior
               node: machineFrame
             - !type:DoActsBehavior

diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
index 445ee0728d22924bedce528ddaa43ec59f5c52f2..5a28c4962c1b8db72f1fa418dad9e2a0331327ee 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
@@ -8,8 +8,7 @@
   - type: MeleeSound
     soundGroups:
       Brute:
-        path:
-          "/Audio/Effects/glass_hit.ogg"
+        collection: GlassSmash
   - type: Clickable
   - type: InteractionOutline
   - type: Transform

diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml
index ff8b7752effb1342b8afdc5ab0e5a75ee730c250..7efa53e2542abde70b98f8965ee26144bbba104b 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Power/apc.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml
@@ -112,6 +112,9 @@
       behaviors: #excess damage, don't spawn entities.
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
     - trigger:
         !type:DamageTrigger
         damage: 50
@@ -123,6 +126,9 @@
             max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
   - type: StationInfiniteBatteryTarget
   - type: Electrified
     onHandInteract: false
@@ -177,6 +183,9 @@
           SheetSteel1:
             min: 1
             max: 1
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
 

diff --git a/Resources/Prototypes/Entities/Structures/Power/chargers.yml b/Resources/Prototypes/Entities/Structures/Power/chargers.yml
index f9ea39b63f1aa429b10baaea0855ffc7443dc04a..a8e20df192997ee03f8bf402d78ec52de42d4f34 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Power/chargers.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/chargers.yml
@@ -32,7 +32,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
   - type: StaticPrice
     price: 25
 

diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml
index 2155baa6adedbd3d3ecedbb7ec2ff9b61717ca27..9d701564eb49f4956d9c3cc17869ffa947ed4a56 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Power/substation.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml
@@ -76,7 +76,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalGlassBreak
       - !type:ExplodeBehavior
       - !type:SpawnEntitiesBehavior
         spawn:
@@ -210,7 +210,7 @@
       - !type:ExplodeBehavior
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalGlassBreak
   - type: Construction
     graph: WallmountSubstation
     node: substation

diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
index fb053d46a4706f87ca06c9d52b401ecded21fb37..787101c5b55480bcef9291b34e953609a8946012 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
+++ b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
@@ -41,7 +41,7 @@
             acts: ["Destruction"]
           - !type:PlaySoundBehavior
             sound:
-              path: /Audio/Effects/metalbreak.ogg
+              collection: MetalBreak
     - type: StaticPrice
       price: 300
   placement:
@@ -70,7 +70,7 @@
           acts: ["Destruction"]
         - !type:PlaySoundBehavior
           sound:
-            path: /Audio/Effects/metalbreak.ogg
+            collection: MetalBreak
         - !type:ChangeConstructionNodeBehavior
           node: machineFrame
   - type: Sprite
@@ -179,7 +179,7 @@
           acts: ["Destruction"]
         - !type:PlaySoundBehavior
           sound:
-            path: /Audio/Effects/metalbreak.ogg
+            collection: MetalBreak
         - !type:ChangeConstructionNodeBehavior
           node: machineFrame
   - type: UpgradePowerDraw

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
index d02b0d02b1a3578e7241ccf0a8b9a03e39bc512a..760eb31755b78bf8494ef23d67dffe05df0d898b 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -52,7 +52,7 @@
           behaviors:
             - !type:PlaySoundBehavior
               sound:
-                path: /Audio/Effects/metalbreak.ogg
+                collection: MetalBreak
             - !type:SpawnEntitiesBehavior
               spawn:
                 GasCanisterBrokenBase:
@@ -141,7 +141,7 @@
         behaviors:
         - !type:PlaySoundBehavior
           sound:
-            path: /Audio/Effects/metalbreak.ogg
+            collection: MetalBreak
         - !type:SpawnEntitiesBehavior
           spawn:
             StorageCanisterBroken:
@@ -183,7 +183,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
       - !type:SpawnEntitiesBehavior
         spawn:
           AirCanisterBroken:
@@ -222,7 +222,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
       - !type:SpawnEntitiesBehavior
         spawn:
           OxygenCanisterBroken:
@@ -277,7 +277,7 @@
         behaviors:
         - !type:PlaySoundBehavior
           sound:
-            path: /Audio/Effects/metalbreak.ogg
+            collection: MetalBreak
         - !type:SpawnEntitiesBehavior
           spawn:
             NitrogenCanisterBroken:
@@ -334,7 +334,7 @@
         behaviors:
         - !type:PlaySoundBehavior
           sound:
-            path: /Audio/Effects/metalbreak.ogg
+            collection: MetalBreak
         - !type:SpawnEntitiesBehavior
           spawn:
             CarbonDioxideCanisterBroken:
@@ -395,7 +395,7 @@
         behaviors:
         - !type:PlaySoundBehavior
           sound:
-            path: /Audio/Effects/metalbreak.ogg
+            collection: MetalBreak
         - !type:SpawnEntitiesBehavior
           spawn:
             PlasmaCanisterBroken:
@@ -440,7 +440,7 @@
         behaviors:
         - !type:PlaySoundBehavior
           sound:
-            path: /Audio/Effects/metalbreak.ogg
+            collection: MetalBreak
         - !type:SpawnEntitiesBehavior
           spawn:
             TritiumCanisterBroken:
@@ -486,7 +486,7 @@
         behaviors:
         - !type:PlaySoundBehavior
           sound:
-            path: /Audio/Effects/metalbreak.ogg
+            collection: MetalBreak
         - !type:SpawnEntitiesBehavior
           spawn:
             WaterVaporCanisterBroken:
@@ -531,7 +531,7 @@
         behaviors:
         - !type:PlaySoundBehavior
           sound:
-            path: /Audio/Effects/metalbreak.ogg
+            collection: MetalBreak
         - !type:SpawnEntitiesBehavior
           spawn:
             AmmoniaCanisterBroken:
@@ -579,7 +579,7 @@
         behaviors:
         - !type:PlaySoundBehavior
           sound:
-            path: /Audio/Effects/metalbreak.ogg
+            collection: MetalBreak
         - !type:SpawnEntitiesBehavior
           spawn:
             NitrousOxideCanisterBroken:
@@ -626,7 +626,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
       - !type:SpawnEntitiesBehavior
         spawn:
           FrezonCanisterBroken:
@@ -660,7 +660,7 @@
         behaviors:
         - !type:PlaySoundBehavior
           sound:
-            path: /Audio/Effects/metalbreak.ogg
+            collection: MetalBreak
         - !type:SpawnEntitiesBehavior
           spawn:
             SheetPlasteel1:

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 34f4db1ede5fbd651d5767388ea945e8218ac215..4448d551e33cc17b2fd7c369fc10fe74a13308f9 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
@@ -35,7 +35,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
           params:
             volume: -6
       - !type:SpawnEntitiesBehavior

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
index 02729556c9fc424959c96d6d888867fcab6dd3c0..d1a60566d4e5f2d68a78bb5b2d6b27632cc0cf8f 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
@@ -33,7 +33,7 @@
       types:
         Blunt: 5
     soundHit:
-      path: /Audio/Effects/bang.ogg
+      collection: MetalThud
   - type: InteractionOutline
   - type: Physics
   - type: Fixtures
@@ -75,7 +75,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
           params:
             volume: -6
       - !type:SpawnEntitiesBehavior
@@ -163,7 +163,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
           params:
             volume: -6
       - !type:SpawnEntitiesBehavior
@@ -230,7 +230,7 @@
       types:
         Blunt: 5
     soundHit:
-      path: /Audio/Effects/bang.ogg
+      collection: MetalThud
   - type: InteractionOutline
   - type: Physics
   - type: Fixtures
@@ -271,7 +271,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
           params:
             volume: -6
       - !type:SpawnEntitiesBehavior

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
index 8b0f4c26e0f1a2721d6239dbfe79c7743ee56561..76a88e7858f903dce333e1afb501f5811a40b848 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
@@ -48,6 +48,9 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
   - type: Appearance
   - type: EntityStorageVisuals
     stateDoorOpen: open
@@ -111,6 +114,9 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
   - type: Construction
     graph: CrateSecure
     node: cratesecure

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
index 2757d129ab0cc0ce801ef2e5d2b890151cab6582..31340114da25271a18fabab02a8338af2cd4ce75 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -151,7 +151,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/woodhit.ogg
+          collection: WoodDestroy
       - !type:SpawnEntitiesBehavior
         spawn:
           MaterialWebSilk:
@@ -317,7 +317,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/woodhit.ogg
+          collection: WoodDestroyHeavy
       - !type:SpawnEntitiesBehavior
         spawn:
           MaterialWoodPlank1:
@@ -367,7 +367,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/woodhit.ogg
+          collection: MetalGlassBreak
       - !type:SpawnEntitiesBehavior
         spawn:
           SheetPlastic:
@@ -462,7 +462,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/woodhit.ogg
+          collection: WoodDestroy
       - !type:SpawnEntitiesBehavior
         spawn:
           MaterialWoodPlank1:
@@ -500,7 +500,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/woodhit.ogg
+          collection: WoodDestroy
       - !type:SpawnEntitiesBehavior
         spawn:
           MaterialWoodPlank1:

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
index eef5ef6ed6cdde493c184a21618fc5b689061fd5..79015e2d049f6f8744394d5ba4ae253247e65957 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
@@ -53,7 +53,7 @@
         solution: tank
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: SolutionContainerManager

diff --git a/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml b/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
index ea49d5f04da1b2bb23da3d932d22220506f76c14..d341c017a708b0c15d0707bc1c27cac896abca34 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
@@ -56,7 +56,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
       - !type:SpawnEntitiesBehavior
         spawn:
           SheetSteel1:
@@ -145,7 +145,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
       - !type:SpawnEntitiesBehavior
         spawn:
           SheetSteel1:

diff --git a/Resources/Prototypes/Entities/Structures/Storage/storage.yml b/Resources/Prototypes/Entities/Structures/Storage/storage.yml
index 2069fb1e3f14a4d3314464f81bcfff29cea618ad..79a1e35799842f4452bd6fa3b3c20d7a8890490e 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/storage.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/storage.yml
@@ -47,7 +47,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
           params:
             volume: -6
       - !type:SpawnEntitiesBehavior

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
index 109741e862303ee65d18179fcf24e8fa9d82d41d..8e957abfe7f4184ba1d7e67d7dbab0fd427e0598 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
@@ -7,8 +7,7 @@
   - type: MeleeSound
     soundGroups:
       Brute:
-        path:
-          "/Audio/Effects/glass_hit.ogg"
+        collection: GlassSmash
   - type: WallMount
   - type: Sprite
     drawdepth: Objects

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
index ad3997fe6db05b4980057b3cda6ce2db92242d5c..80a8e8ea202b6b2034028766778e1269d13d1436 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
@@ -102,7 +102,7 @@
             acts: [ "Destruction" ]
           - !type:PlaySoundBehavior
             sound:
-              path: /Audio/Effects/metalbreak.ogg
+              collection: MetalGlassBreak
               params:
                 volume: -4
 

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml
index a4ea19d15e8904027c7e4c60e9f44d351567b126..24e5cfda2af76c7dc7afba85d4a0f33d057f6290 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml
@@ -16,7 +16,7 @@
     - state: bell
   - type: InteractionPopup
     successChance: 1
-    interactSuccessSound:   
+    interactSuccessSound:
       path: /Audio/Weapons/boxingbell.ogg
   - type: Clickable
   - type: MeleeSound
@@ -44,4 +44,4 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml
index d5132100db19cf1ae5beef247831dd40d8a9580b..517d2d697d90fa8a04737fd8b1620ae70c8b84c8 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml
@@ -54,7 +54,7 @@
               acts: [ "Destruction" ]
             - !type:PlaySoundBehavior
               sound:
-                path: /Audio/Effects/metalbreak.ogg
+                collection: MetalGlassBreak
   placement:
     mode: SnapgridCenter
 

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
index ca2b381142fd6437acbe70323df2bc541557f898..a0775641ef2dd8fce481b84ed4e73e7cdb7d52b7 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
@@ -54,7 +54,7 @@
               acts: [ "Destruction" ]
             - !type:PlaySoundBehavior
               sound:
-                path: /Audio/Effects/metalbreak.ogg
+                collection: MetalGlassBreak
                 params:
                   volume: -4
   placement:

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
index d8830477f4697ec7eb9a1a2a37281b65ec9f1dd8..05988fbc217e3b566c5ca1298e3d92d57c9008c8 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
@@ -99,7 +99,7 @@
             acts: [ "Destruction" ]
           - !type:PlaySoundBehavior
             sound:
-              path: /Audio/Effects/metalbreak.ogg
+              collection: MetalGlassBreak
               params:
                 volume: -4
   placement:

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
index 1e78eb501f294c911a121a707cd660e9e98e06fb..070c6e526d4a618bb885825185ebc0d91e5e2047 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
@@ -9,8 +9,7 @@
   - type: MeleeSound
     soundGroups:
       Brute:
-        path:
-          "/Audio/Effects/glass_hit.ogg"
+        collection: GlassSmash
   - type: WallMount
   - type: Clickable
   - type: InteractionOutline

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
index 9848993b082fb880415ccbc37a161fe40a18dcf3..037a89a98863a9b9184ce681ca2cc7ba53e052c4 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
@@ -89,7 +89,7 @@
             acts: [ "Destruction" ]
           - !type:PlaySoundBehavior
             sound:
-              path: /Audio/Effects/metalbreak.ogg
+              collection: MetalGlassBreak
               params:
                 volume: -4
   - type: GenericVisualizer

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
index bad84227c851f815df988af8986c49a5f298bfea..4a442d0542fe1e574f7fb60c9d06a051658a4c63 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
@@ -29,7 +29,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/woodhit.ogg
+          collection: WoodDestroy
       - !type:SpawnEntitiesBehavior
         spawn:
           MaterialWoodPlank:

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml
index c85a5b03ae1498fcd7252d7675fee2cb7af3efe8..dfbe99b2d2acba8668383fc68ced5944f411e737 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml
@@ -64,7 +64,7 @@
             acts: [ "Destruction" ]
           - !type:PlaySoundBehavior
             sound:
-              path: /Audio/Effects/metalbreak.ogg
+              collection: MetalBreak
               params:
                 volume: -8
   placement:

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
index 60e097a46d9e3d0b6a338019c0f6e6b6d9a3bbb8..1b285348d5b12ac126c5fbd3b5747205d6f68311 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
@@ -91,7 +91,7 @@
             acts: [ "Destruction" ]
           - !type:PlaySoundBehavior
             sound:
-              path: /Audio/Effects/metalbreak.ogg
+              collection: MetalBreak
               params:
                 volume: -8
 

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
index 4d0e3cb5321d9e70020b8cf1a25400f042823ad3..c8778aea50a0e4809ca4676d0203c452804d5955 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
@@ -4,7 +4,7 @@
   description: Wallmount reagent dispenser.
   placement:
     mode: SnapgridCenter
-    snap: 
+    snap:
     - Wallmount
   components:
   - type: WallMount
@@ -50,7 +50,7 @@
         solution: tank
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: SolutionContainerManager
@@ -86,4 +86,4 @@
     - Welding
     weldingDamage:
       types:
-        Heat: 20
\ No newline at end of file
+        Heat: 20

diff --git a/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml b/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml
index 583ea2ebb24c4dafb8204f49a26c57e521410d09..559970aa91f044872adcc7487d641e6103529b3c 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml
@@ -37,7 +37,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
       - !type:SpawnEntitiesBehavior
         spawn:
           PartRodMetal1:
@@ -125,7 +125,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
       - !type:SpawnEntitiesBehavior
         spawn:
           PartRodMetal1:

diff --git a/Resources/Prototypes/Entities/Structures/Walls/girders.yml b/Resources/Prototypes/Entities/Structures/Walls/girders.yml
index a1ed2332b99e9e905492c62ade227b069bf9658e..3c9a2e7033571b776ce1768d858b7f92b68bbf63 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Walls/girders.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/girders.yml
@@ -49,6 +49,9 @@
             max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
   - type: StaticPrice
     price: 10
 
@@ -72,6 +75,9 @@
           behaviors:
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
+            - !type:PlaySoundBehavior
+              sound:
+                collection: MetalBreak
         - trigger:
             !type:DamageTrigger
             damage: 50
@@ -86,5 +92,8 @@
                   max: 1
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
+            - !type:PlaySoundBehavior
+              sound:
+                collection: MetalBreak
     - type: StaticPrice
       price: 66

diff --git a/Resources/Prototypes/Entities/Structures/Walls/railing.yml b/Resources/Prototypes/Entities/Structures/Walls/railing.yml
index 87a89dfc574acfc34fa1aa9f537097a5bfe0ebc5..95d16742d5832bd69061fbdb32ac3306d35b9141 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Walls/railing.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/railing.yml
@@ -43,7 +43,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
           params:
             volume: -6
       - !type:SpawnEntitiesBehavior
@@ -112,7 +112,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
           params:
             volume: -6
       - !type:SpawnEntitiesBehavior
@@ -172,7 +172,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
           params:
             volume: -6
       - !type:SpawnEntitiesBehavior
@@ -247,7 +247,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
           params:
             volume: -6
       - !type:SpawnEntitiesBehavior

diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index ac464334819a8c157cf79885a1ed76f194c6881f..26a1b3464fe90036493d959b09bc15dc09a279af 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -293,6 +293,9 @@
         !type:DamageTrigger
         damage: 300
       behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalSlam
       - !type:DoActsBehavior
         acts: ["Destruction"]
     - trigger:
@@ -301,13 +304,11 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalSlam
       - !type:ChangeConstructionNodeBehavior
         node: girder
       - !type:DoActsBehavior
         acts: ["Destruction"]
-    destroySound:
-      path: /Audio/Effects/metalbreak.ogg
   - type: IconSmooth
     key: walls
     base: gold
@@ -364,6 +365,9 @@
         !type:DamageTrigger
         damage: 300
       behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalSlam
       - !type:DoActsBehavior
         acts: ["Destruction"]
     - trigger:
@@ -372,13 +376,11 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalSlam
       - !type:ChangeConstructionNodeBehavior
         node: girder
       - !type:DoActsBehavior
         acts: ["Destruction"]
-    destroySound:
-      path: /Audio/Effects/metalbreak.ogg
   - type: IconSmooth
     key: walls
     base: plasma
@@ -409,19 +411,20 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalSlam
     - trigger:
         !type:DamageTrigger
         damage: 150
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalSlam
       - !type:ChangeConstructionNodeBehavior
         node: girder
       - !type:DoActsBehavior
         acts: ["Destruction"]
-    destroySound:
-      path: /Audio/Effects/metalbreak.ogg
   - type: IconSmooth
     key: walls
     base: plastic
@@ -513,19 +516,20 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalSlam
     - trigger:
         !type:DamageTrigger
         damage: 400
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalSlam
       - !type:ChangeConstructionNodeBehavior
         node: girder
       - !type:DoActsBehavior
         acts: ["Destruction"]
-    destroySound:
-      path: /Audio/Effects/metalbreak.ogg
   - type: IconSmooth
     key: walls
     base: reinf_over
@@ -636,19 +640,20 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalSlam
     - trigger:
         !type:DamageTrigger
         damage: 150
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalSlam
       - !type:ChangeConstructionNodeBehavior
         node: girder
       - !type:DoActsBehavior
         acts: ["Destruction"]
-    destroySound:
-      path: /Audio/Effects/metalbreak.ogg
   - type: IconSmooth
     key: walls
     base: silver
@@ -715,6 +720,9 @@
       behaviors:
         - !type:DoActsBehavior
           acts: [ "Destruction" ]
+        - !type:PlaySoundBehavior
+          sound:
+            collection: MetalSlam
     - trigger:
         !type:DamageTrigger
         damage: 300
@@ -723,7 +731,7 @@
         node: girder
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalSlam
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Construction
@@ -805,19 +813,20 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalSlam
     - trigger:
         !type:DamageTrigger
         damage: 200
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalSlam
       - !type:ChangeConstructionNodeBehavior
         node: girder
       - !type:DoActsBehavior
         acts: ["Destruction"]
-    destroySound:
-      path: /Audio/Effects/metalbreak.ogg
   - type: IconSmooth
     key: walls
     base: solid
@@ -866,19 +875,20 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalSlam
     - trigger:
         !type:DamageTrigger
         damage: 200
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalSlam
       - !type:ChangeConstructionNodeBehavior
         node: girder
       - !type:DoActsBehavior
         acts: ["Destruction"]
-    destroySound:
-      path: /Audio/Effects/metalbreak.ogg
   - type: IconSmooth
     key: walls
     base: solidrust
@@ -903,19 +913,20 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalSlam
     - trigger:
         !type:DamageTrigger
         damage: 150
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalSlam
       - !type:ChangeConstructionNodeBehavior
         node: girder
       - !type:DoActsBehavior
         acts: ["Destruction"]
-    destroySound:
-      path: /Audio/Effects/metalbreak.ogg
   - type: IconSmooth
     key: walls
     base: uranium
@@ -942,19 +953,20 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroyHeavy
     - trigger:
         !type:DamageTrigger
         damage: 150
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: WoodDestroyHeavy
       - !type:ChangeConstructionNodeBehavior
         node: girder
       - !type:DoActsBehavior
         acts: ["Destruction"]
-    destroySound:
-      path: /Audio/Effects/metalbreak.ogg
   - type: IconSmooth
     key: walls
     base: wood
@@ -996,7 +1008,7 @@
             max: 1
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/woodhit.ogg
+          collection: WoodDestroy
   - type: IconSmooth
     key: walls
     base: wall

diff --git a/Resources/Prototypes/Entities/Structures/Windows/mining.yml b/Resources/Prototypes/Entities/Structures/Windows/mining.yml
index 0004cf4ec074e91be867de1cc3eb36466faffee7..fc49b9e401cf80bb74391bedc6414af1d2229997 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Windows/mining.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/mining.yml
@@ -28,7 +28,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          collection: GlassBreak
+          collection: WindowShatter
       - !type:SpawnEntitiesBehavior
         spawn:
           ShardGlassReinforced:

diff --git a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
index d69545f8d2f6e3cc725c8d75990b6cc7956959b0..70c1573fb8dfa0a2f963ca813301a6202f9c7705 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
@@ -19,13 +19,16 @@
       behaviors:
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
     - trigger:
         !type:DamageTrigger
         damage: 60
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          collection: GlassBreak
+          collection: WindowShatter
       - !type:SpawnEntitiesBehavior
         spawn:
           ShardGlassPlasma:
@@ -84,7 +87,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          collection: GlassBreak
+          collection: WindowShatter
       - !type:SpawnEntitiesBehavior
         spawn:
           ShardGlassPlasma:

diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
index c7837a5c6c7a6f6ea595fe27507937ae6697998e..e23996549404f81b460e5a2d2278708ab14bbe01 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
@@ -22,13 +22,16 @@
       behaviors:
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
     - trigger:
         !type:DamageTrigger
         damage: 75
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          collection: GlassBreak
+          collection: WindowShatter
       - !type:SpawnEntitiesBehavior
         spawn:
           ShardGlassReinforced:
@@ -104,7 +107,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          collection: GlassBreak
+          collection: WindowShatter
       - !type:SpawnEntitiesBehavior
         spawn:
           ShardGlassReinforced:

diff --git a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
index bdc75b14a939be343c9cc103f05afcf6fb99b4d9..67dfe028d93ccc4e68ce2583967b1da38fe46baa 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
@@ -21,13 +21,16 @@
       behaviors: #excess damage, don't spawn entities.
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
     - trigger:
         !type:DamageTrigger
         damage: 100
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          collection: GlassBreak
+          collection: WindowShatter
       - !type:SpawnEntitiesBehavior
         spawn:
           ShardGlassPlasma:
@@ -93,7 +96,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          collection: GlassBreak
+          collection: WindowShatter
       - !type:SpawnEntitiesBehavior
         spawn:
           ShardGlassPlasma:

diff --git a/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml b/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
index 84c978fff01fbf594d1691df2d60cece0c67dd65..baf50e17d2f54d8be5275f76bf562171a1e4c81d 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
@@ -25,7 +25,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          collection: GlassBreak
+          collection: WindowShatter
       - !type:SpawnEntitiesBehavior
         spawn:
           ShardGlassUranium:

diff --git a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
index 835f5ce528a1467fae7de2cfae3ef0b2dc96a07c..9ec9e563c9d7a62f50ba2b97d0552cd82335779c 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
@@ -28,7 +28,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          collection: GlassBreak
+          collection: WindowShatter
       - !type:SpawnEntitiesBehavior
         spawn:
           ShardGlassReinforced:

diff --git a/Resources/Prototypes/Entities/Structures/Windows/uranium.yml b/Resources/Prototypes/Entities/Structures/Windows/uranium.yml
index a11ca625865d7c4f5ccf6ce93808f95d59fe407a..42ff0f4258fc0087166485fdb3ddc0eb7d34d80e 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Windows/uranium.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/uranium.yml
@@ -26,7 +26,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          collection: GlassBreak
+          collection: WindowShatter
       - !type:SpawnEntitiesBehavior
         spawn:
           ShardGlassUranium:

diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml
index 12552dbf4fd3c4bda38f2f6fd5a50aae7ca99c9d..9d355d4422296abf181f116139f48ca0751d885b 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Windows/window.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -11,8 +11,7 @@
   - type: MeleeSound
     soundGroups:
       Brute:
-        path:
-          "/Audio/Effects/glass_hit.ogg"
+        collection: GlassSmack
   - type: WallMount
     arc: 360 # interact despite grilles
   - type: Tag
@@ -49,6 +48,9 @@
         !type:DamageTrigger
         damage: 100
       behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
     - trigger:
@@ -57,7 +59,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          collection: GlassBreak
+          collection: WindowShatter
       - !type:SpawnEntitiesBehavior
         spawn:
           ShardGlass:
@@ -105,8 +107,7 @@
   - type: MeleeSound
     soundGroups:
       Brute:
-        path:
-          "/Audio/Effects/glass_hit.ogg"
+        collection: GlassSmack
   - type: Sprite
     drawdepth: Mobs
     sprite: Structures/Windows/directional.rsi
@@ -145,13 +146,16 @@
       behaviors:
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
     - trigger:
         !type:DamageTrigger
         damage: 50
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          collection: GlassBreak
+          collection: WindowShatter
       - !type:SpawnEntitiesBehavior
         spawn:
           ShardGlass:

diff --git a/Resources/Prototypes/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
index f2b8feaa395fbeda8e03768055246b4c0e630084..1ab1fd5b2fdb8eb5add97bed58c35ed8951887a6 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/hydro_tray.yml
+++ b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
@@ -73,6 +73,9 @@
       behaviors:
       - !type:ChangeConstructionNodeBehavior
         node: machineFrame
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Machine

diff --git a/Resources/Prototypes/Entities/Structures/meat_spike.yml b/Resources/Prototypes/Entities/Structures/meat_spike.yml
index a312fcb835ee493d1d395231391e257e0a5bd299..086066f5c2621bd8f0f57161c2e14fdb68e5741f 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/meat_spike.yml
+++ b/Resources/Prototypes/Entities/Structures/meat_spike.yml
@@ -31,7 +31,7 @@
         acts: ["Destruction"]
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Effects/metalbreak.ogg
+          collection: MetalBreak
           params:
             volume: -4
       - !type:SpawnEntitiesBehavior

diff --git a/Resources/Prototypes/SoundCollections/destruction.yml b/Resources/Prototypes/SoundCollections/destruction.yml
new file mode 100644 (file)
index 0000000..1e1545b
--- /dev/null
+++ b/Resources/Prototypes/SoundCollections/destruction.yml
@@ -0,0 +1,63 @@
+- type: soundCollection
+  id: GlassBreak
+  files:
+  - /Audio/Effects/glass_break1.ogg
+  - /Audio/Effects/glass_break2.ogg
+  - /Audio/Effects/glass_break3.ogg
+  - /Audio/Effects/glass_break4.ogg
+
+- type: soundCollection
+  id: GlassCrack
+  files:
+  - /Audio/Effects/glass_crack1.ogg
+  - /Audio/Effects/glass_crack2.ogg
+  - /Audio/Effects/glass_crack3.ogg
+  - /Audio/Effects/glass_crack4.ogg
+
+- type: soundCollection
+  id: WindowShatter
+  files:
+  - /Audio/Effects/window_shatter1.ogg
+  - /Audio/Effects/window_shatter2.ogg
+  - /Audio/Effects/window_shatter3.ogg
+
+- type: soundCollection
+  id: WoodDestroy
+  files:
+  - /Audio/Effects/wood_destroy1.ogg
+  - /Audio/Effects/wood_destroy2.ogg
+  - /Audio/Effects/wood_destroy3.ogg
+
+- type: soundCollection
+  id: WoodDestroyHeavy
+  files:
+  - /Audio/Effects/wood_destroy_heavy1.ogg
+
+- type: soundCollection
+  id: MetalCrunch
+  files:
+  - /Audio/Effects/metal_crunch.ogg
+
+- type: soundCollection
+  id: MetalBreak
+  files:
+  - /Audio/Effects/metal_break1.ogg
+  - /Audio/Effects/metal_break2.ogg
+  - /Audio/Effects/metal_break3.ogg
+  - /Audio/Effects/metal_break4.ogg
+  - /Audio/Effects/metal_break5.ogg
+
+- type: soundCollection
+  id: MetalGlassBreak
+  files:
+  - /Audio/Effects/metal_glass_break1.ogg
+  - /Audio/Effects/metal_glass_break2.ogg
+
+- type: soundCollection
+  id: MetalSlam
+  files:
+  - /Audio/Effects/metal_slam1.ogg
+  - /Audio/Effects/metal_slam2.ogg
+  - /Audio/Effects/metal_slam3.ogg
+  - /Audio/Effects/metal_slam4.ogg
+  - /Audio/Effects/metal_slam5.ogg

diff --git a/Resources/Prototypes/SoundCollections/glassbreak.yml b/Resources/Prototypes/SoundCollections/glassbreak.yml
deleted file mode 100644 (file)
index 67417b2..0000000
--- a/Resources/Prototypes/SoundCollections/glassbreak.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: soundCollection
-  id: GlassBreak
-  files:
-  - /Audio/Effects/glass_break1.ogg
-  - /Audio/Effects/glass_break2.ogg
-  - /Audio/Effects/glass_break3.ogg

diff --git a/Resources/Prototypes/SoundCollections/impacts.yml b/Resources/Prototypes/SoundCollections/gun_impacts.yml
similarity index 100%
rename from Resources/Prototypes/SoundCollections/impacts.yml
rename to Resources/Prototypes/SoundCollections/gun_impacts.yml

diff --git a/Resources/Prototypes/SoundCollections/hit_impacts.yml b/Resources/Prototypes/SoundCollections/hit_impacts.yml
new file mode 100644 (file)
index 0000000..b0e805f
--- /dev/null
+++ b/Resources/Prototypes/SoundCollections/hit_impacts.yml
@@ -0,0 +1,29 @@
+- type: soundCollection
+  id: MetalThud
+  files:
+  - /Audio/Effects/metal_thud1.ogg
+  - /Audio/Effects/metal_thud2.ogg
+  - /Audio/Effects/metal_thud3.ogg
+
+- type: soundCollection
+  id: MetalScrape
+  files:
+  - /Audio/Effects/metal_scrape1.ogg
+  - /Audio/Effects/metal_scrape2.ogg
+  - /Audio/Effects/metal_scrape3.ogg
+
+- type: soundCollection
+  id: WeakHit
+  files:
+  - /Audio/Effects/weak_hit1.ogg
+  - /Audio/Effects/weak_hit2.ogg
+
+- type: soundCollection
+  id: GlassSmack
+  files:
+  - /Audio/Effects/glass_smack.ogg
+
+- type: soundCollection
+  id: GlassSmash
+  files:
+  - /Audio/Effects/glass_smash.ogg

diff --git a/Resources/Prototypes/SoundCollections/traits.yml b/Resources/Prototypes/SoundCollections/traits.yml
index 557632c6bbad1c313c479378c6c7a99364c0f0c9..e0d7206c63598e49fa828e615d0da5ac6f8d8e32 100644 (file)
--- a/Resources/Prototypes/SoundCollections/traits.yml
+++ b/Resources/Prototypes/SoundCollections/traits.yml
@@ -20,9 +20,9 @@
   - /Audio/Effects/bodyfall4.ogg
   - /Audio/Effects/demon_dies.ogg
   - /Audio/Effects/demon_attack1.ogg
-  - /Audio/Effects/bang.ogg
   - /Audio/Effects/clang.ogg
-  - /Audio/Effects/metalbreak.ogg
+  - /Audio/Effects/metal_slam1.ogg
+  - /Audio/Effects/metal_slam5.ogg
   - /Audio/Effects/minibombcountdown.ogg
   - /Audio/Effects/sadtrombone.ogg
   - /Audio/Effects/sparks1.ogg