diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleTestPrototypes.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleTestPrototypes.cs index a4f623e8b3..12292f4652 100644 --- 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 47c0d84977..80f750c715 100644 --- 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 abdb76c9e3..2b7a46e947 100644 --- a/Content.Server/Ame/Components/AmeControllerComponent.cs +++ b/Content.Server/Ame/Components/AmeControllerComponent.cs @@ -59,7 +59,7 @@ public sealed partial class AmeControllerComponent : SharedAmeControllerComponen /// [DataField("injectSound")] [ViewVariables(VVAccess.ReadWrite)] - public SoundSpecifier InjectSound = new SoundPathSpecifier("/Audio/Effects/bang.ogg"); + public SoundSpecifier InjectSound = new SoundCollectionSpecifier("MetalThud"); /// /// 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 75b82d117a..f360591479 100644 --- 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 d4d121a87a..135f8b0856 100644 --- 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? /// [DataField("tryOpenDoorSound")] - public SoundSpecifier TryOpenDoorSound = new SoundPathSpecifier("/Audio/Effects/bang.ogg"); + public SoundSpecifier TryOpenDoorSound = new SoundCollectionSpecifier("MetalSlam"); /// /// 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 cec7402fac..27c3a5f0df 100644 --- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs +++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs @@ -138,7 +138,7 @@ public sealed partial class MeleeWeaponComponent : Component /// [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"); } /// diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs index 6fa461860f..11228bba9e 100644 --- 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(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 6bfbe5d05e..687b29f208 100644 --- 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. /// [DataField, AutoNetworkedField] - public SoundSpecifier? CrushingCompleteSound = new SoundPathSpecifier("/Audio/Effects/metal_crunch.ogg"); + public SoundSpecifier? CrushingCompleteSound = new SoundCollectionSpecifier("MetalCrunch"); /// /// 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 fecc4267ba..f856871846 100644 --- 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 index 656983f098..0000000000 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 fe14cdeda3..686ce671fe 100644 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 79163acc19..3404ddfe52 100644 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 bc45ab3332..28f7a3c932 100644 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 index 0000000000..46c251106d 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 index 0000000000..0221b238d7 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 index 0000000000..e5e3702458 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 index 0000000000..631c584462 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 index 0000000000..5d6302e88b 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 index e6842104db..0000000000 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 b1c5505f61..59931e6a73 100644 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 index 0000000000..ed341b2306 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 index 0000000000..cb3f3a21a1 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 index 0000000000..976c59bc90 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 index 0000000000..238a9f595c 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 index 0000000000..4be23f1a63 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 index 0000000000..2aad88c27a 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 index 0000000000..050fdf68d0 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 index 0000000000..af246179b5 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 index 0000000000..6fe0fd0db5 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 index 0000000000..813976a708 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 index 0000000000..03f4a258c2 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 index 0000000000..77f8ba3590 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 index 0000000000..4db58c51b3 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 index 0000000000..9d4ee03e4a 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 index 0000000000..a994a2c9cd 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 index 0000000000..ad840af0f9 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 index 0000000000..534e04f6ec 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 index 0000000000..d6ae732ed3 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 index 0000000000..17962c5f2a 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 index 0864824075..0000000000 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 index 0000000000..222879a40d 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 index 0000000000..aa841782df 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 index 0000000000..3887e467be 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 index 0000000000..b639ca43e5 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 index 0000000000..12f9667bdd 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 index 0000000000..04b0d4f955 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 index 0000000000..13577ec8a6 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 index 0000000000..d752de30d5 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 index 04ff37f3c7..0000000000 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 2f2a42388f..9085a87f15 100644 --- 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 08c37b56fe..06eda05ee1 100644 --- 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 aedc1eaab8..072c419bc8 100644 --- 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 8dd3023a0e..ac457c9547 100644 --- 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 5cc4c7ec53..799e2921e4 100644 --- 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 71bd2753fa..361efb5266 100644 --- 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 9a30ec4da3..40f6bf6dbe 100644 --- 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 4761e81de8..7427b7f87a 100644 --- 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 e284944a53..3f53b3e1ce 100644 --- 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 380b2d3563..0894d6a754 100644 --- 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 b83b2c8ee2..035185487d 100644 --- 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 0bbebe3ded..adbb7cde40 100644 --- 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 67125c8dff..953c05f107 100644 --- 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 f3213fdbc9..cf30f69754 100644 --- 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 86f1f53939..a442804b3d 100644 --- 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 632e86e4fc..3f75faf75e 100644 --- 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 54ee2d90a5..ca3edf68c0 100644 --- 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 bcc8e0dce4..528069106b 100644 --- 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 3172989d4f..53cc75faa6 100644 --- 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 c54e9f548b..d87c5e700a 100644 --- 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 2d98b9ff35..79a17153ab 100644 --- 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 80d5011ce3..549a42c264 100644 --- 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 22770ffc18..d610fb25fb 100644 --- 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 f661b507bd..d3b8521a9b 100644 --- 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 e3fab04da8..4281177b4b 100644 --- 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 b984693a30..63d950969d 100644 --- 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 d34030eb97..4eaed51597 100644 --- 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 3f0234a089..7a1c066c18 100644 --- 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 b2c53beaff..86f6719f77 100644 --- 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 26829aba2d..a235cd2546 100644 --- 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 53abcf592a..161ea25bc4 100644 --- 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 9ae1a2bb3d..22f0e2dc2a 100644 --- 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 a8792b0976..13385a763e 100644 --- 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 6eda921ca4..470733ea18 100644 --- 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 d1b870646d..5aa602aedd 100644 --- 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 b1804e6b7b..884f68fc22 100644 --- 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 2184ee73ea..f150a3f63b 100644 --- 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 3fad77648f..f846eea005 100644 --- 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 b4665a9b79..621d9a1a7e 100644 --- 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 e215a70f4c..d7df219663 100644 --- 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 6067149c8a..5d9ab0dd7e 100644 --- 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 403fed9dd8..30e42d59ab 100644 --- 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 33186f0a1d..9f09e49059 100644 --- 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 29806e0822..3b3f0402aa 100644 --- 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 657c597b14..2eb4f57fab 100644 --- 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 3fa3a52387..5280f8e594 100644 --- 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 699c3491f1..829525439e 100644 --- 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 3cadb180c9..6f05baee94 100644 --- 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 f5003b1712..66ea8e538a 100644 --- 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 95ce0b9d92..5a62b74ac0 100644 --- 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 0f84f200bb..e12826a8ce 100644 --- 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 d15f993e46..0cf1cc9de0 100644 --- 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 b99b88483c..4bea87f817 100644 --- 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 881976f68a..e5b77095b0 100644 --- 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 b6f1e6ec4b..e3ae06fa50 100644 --- 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 45030bd28b..c2f8fa339d 100644 --- 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 8073733945..6f3d0705cb 100644 --- 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 d4b7c1d3c9..218b532efc 100644 --- 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 2fcc18e1b3..c5f04d80a1 100644 --- 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 8492f31e52..e5604bea08 100644 --- 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 8d5621206d..f236bb8a41 100644 --- 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 2bcd65533f..4948231b90 100644 --- 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 74fa0b2531..d900d791d3 100644 --- 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 445ee0728d..5a28c4962c 100644 --- 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 ff8b7752ef..7efa53e254 100644 --- 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 f9ea39b63f..a8e20df192 100644 --- 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 2155baa6ad..9d701564eb 100644 --- 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 fb053d46a4..787101c5b5 100644 --- 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 d02b0d02b1..760eb31755 100644 --- 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 34f4db1ede..4448d551e3 100644 --- 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 02729556c9..d1a60566d4 100644 --- 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 8b0f4c26e0..76a88e7858 100644 --- 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 2757d129ab..31340114da 100644 --- 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 eef5ef6ed6..79015e2d04 100644 --- 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 ea49d5f04d..d341c017a7 100644 --- 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 2069fb1e3f..79a1e35799 100644 --- 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 109741e862..8e957abfe7 100644 --- 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 ad3997fe6d..80a8e8ea20 100644 --- 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 a4ea19d15e..24e5cfda2a 100644 --- 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 d5132100db..517d2d697d 100644 --- 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 ca2b381142..a0775641ef 100644 --- 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 d8830477f4..05988fbc21 100644 --- 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 1e78eb501f..070c6e526d 100644 --- 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 9848993b08..037a89a988 100644 --- 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 bad84227c8..4a442d0542 100644 --- 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 c85a5b03ae..dfbe99b2d2 100644 --- 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 60e097a46d..1b285348d5 100644 --- 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 4d0e3cb532..c8778aea50 100644 --- 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 583ea2ebb2..559970aa91 100644 --- 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 a1ed2332b9..3c9a2e7033 100644 --- 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 87a89dfc57..95d16742d5 100644 --- 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 ac46433481..26a1b3464f 100644 --- 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 0004cf4ec0..fc49b9e401 100644 --- 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 d69545f8d2..70c1573fb8 100644 --- 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 c7837a5c6c..e239965494 100644 --- 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 bdc75b14a9..67dfe028d9 100644 --- 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 84c978fff0..baf50e17d2 100644 --- 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 835f5ce528..9ec9e563c9 100644 --- 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 a11ca62586..42ff0f4258 100644 --- 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 12552dbf4f..9d355d4422 100644 --- 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 f2b8feaa39..1ab1fd5b2f 100644 --- 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 a312fcb835..086066f5c2 100644 --- 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 index 0000000000..1e1545b5f5 --- /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 index 67417b22d4..0000000000 --- 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 index 0000000000..b0e805f30d --- /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 557632c6bb..e0d7206c63 100644 --- 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