diff --git a/Content.Server/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs index 015b480b82..f1fcfa4449 100644 --- a/Content.Server/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs +++ b/Content.Server/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs @@ -16,7 +16,7 @@ namespace Content.Server.Destructible.Thresholds.Behaviors public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause = null) { var pos = system.EntityManager.GetComponent(owner).Coordinates; - SoundSystem.Play(Sound.GetSound(), Filter.Pvs(pos), pos, AudioHelpers.WithVariation(0.125f)); + system.EntityManager.System().PlayPvs(Sound, pos); } } } diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml index 1c78430720..263b872aee 100644 --- a/Resources/Audio/Effects/attributions.yml +++ b/Resources/Audio/Effects/attributions.yml @@ -22,3 +22,8 @@ license: "CC-BY-NC-SA-3.0" copyright: "chime.ogg taken from Citadel Station." source: "https://github.com/Citadel-Station-13/Citadel-Station-13/commit/b604390f334343be80045d955705cf48ee056c61" + +- files: ["tree_fell.ogg"] + license: "CC0-1.0" + copyright: "Taken from felix.blume via freesound.org and cropped + mixed from stereo to mono." + source: "https://freesound.org/people/felix.blume/sounds/414093/" diff --git a/Resources/Audio/Effects/chop.ogg b/Resources/Audio/Effects/chop.ogg new file mode 100644 index 0000000000..bc4c393669 Binary files /dev/null and b/Resources/Audio/Effects/chop.ogg differ diff --git a/Resources/Audio/Effects/tree_fell.ogg b/Resources/Audio/Effects/tree_fell.ogg new file mode 100644 index 0000000000..2c9554efe7 Binary files /dev/null and b/Resources/Audio/Effects/tree_fell.ogg differ diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml index 44652af955..21f2255146 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml @@ -58,6 +58,12 @@ - type: Damageable damageContainer: Inorganic damageModifierSet: Wood + - type: MeleeSound + soundGroups: + Brute: + path: /Audio/Effects/chop.ogg + params: + variation: 0.05 - type: Destructible thresholds: - trigger: @@ -70,6 +76,12 @@ !type:DamageTrigger damage: 50 behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/tree_fell.ogg + params: + volume: 5 + variation: 0.05 - !type:DoActsBehavior acts: [ "Destruction" ] - !type:SpawnEntitiesBehavior