From: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Date: Mon, 13 Mar 2023 21:12:57 +0000 (-0400)
Subject: Revert  "Add tree felling and chopping sounds" (#14622) (#14643)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=59bf67ec8c6eb1b4a7a2618c07a0f8635a41da9b;p=space-station-14.git

Revert  "Add tree felling and chopping sounds" (#14622) (#14643)
---

diff --git a/Content.Server/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs
index f1fcfa4449..015b480b82 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<TransformComponent>(owner).Coordinates;
-            system.EntityManager.System<SharedAudioSystem>().PlayPvs(Sound, pos);
+            SoundSystem.Play(Sound.GetSound(), Filter.Pvs(pos), pos, AudioHelpers.WithVariation(0.125f));
         }
     }
 }
diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml
index 263b872aee..1c78430720 100644
--- a/Resources/Audio/Effects/attributions.yml
+++ b/Resources/Audio/Effects/attributions.yml
@@ -22,8 +22,3 @@
   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
deleted file mode 100644
index bc4c393669..0000000000
Binary files a/Resources/Audio/Effects/chop.ogg and /dev/null differ
diff --git a/Resources/Audio/Effects/tree_fell.ogg b/Resources/Audio/Effects/tree_fell.ogg
deleted file mode 100644
index 2c9554efe7..0000000000
Binary files a/Resources/Audio/Effects/tree_fell.ogg and /dev/null differ
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 43836fc04c..72757d3468 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -2907,8 +2907,3 @@ Entries:
       under them.', type: Tweak}
   id: 3176
   time: '2023-03-13T19:26:21.0000000+00:00'
-- author: metalgearsloth
-  changes:
-  - {message: Trees now have chopping and felling sounds., type: Add}
-  id: 3177
-  time: '2023-03-13T20:42:30.0000000+00:00'
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
index 21f2255146..44652af955 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
@@ -58,12 +58,6 @@
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Wood
-  - type: MeleeSound
-    soundGroups:
-      Brute:
-        path: /Audio/Effects/chop.ogg
-        params:
-          variation: 0.05
   - type: Destructible
     thresholds:
     - trigger:
@@ -76,12 +70,6 @@
         !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