From 527eabc677eac492ef3a152dea97a487769eb3a2 Mon Sep 17 00:00:00 2001
From: metalgearsloth <comedian_vs_clown@hotmail.com>
Date: Mon, 16 May 2022 15:50:11 +1000
Subject: [PATCH] Remove esword unneeded property

---
 .../Melee/EnergySword/Components/EnergySwordComponent.cs       | 3 ---
 Content.Server/Weapon/Melee/EnergySword/EnergySwordSystem.cs   | 1 -
 .../Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml      | 2 ++
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Content.Server/Weapon/Melee/EnergySword/Components/EnergySwordComponent.cs b/Content.Server/Weapon/Melee/EnergySword/Components/EnergySwordComponent.cs
index 455fb71aae..442f979faf 100644
--- a/Content.Server/Weapon/Melee/EnergySword/Components/EnergySwordComponent.cs
+++ b/Content.Server/Weapon/Melee/EnergySword/Components/EnergySwordComponent.cs
@@ -18,9 +18,6 @@ namespace Content.Server.Weapon.Melee.EnergySword
         [DataField("cycleRate")]
         public float CycleRate = 1f;
 
-        [DataField("hitSound")]
-        public SoundSpecifier HitSound { get; set; } = new SoundPathSpecifier("/Audio/Weapons/eblade1.ogg");
-
         [DataField("activateSound")]
         public SoundSpecifier ActivateSound { get; set; } = new SoundPathSpecifier("/Audio/Weapons/ebladeon.ogg");
 
diff --git a/Content.Server/Weapon/Melee/EnergySword/EnergySwordSystem.cs b/Content.Server/Weapon/Melee/EnergySword/EnergySwordSystem.cs
index 5321822a43..c9a10e498f 100644
--- a/Content.Server/Weapon/Melee/EnergySword/EnergySwordSystem.cs
+++ b/Content.Server/Weapon/Melee/EnergySword/EnergySwordSystem.cs
@@ -38,7 +38,6 @@ namespace Content.Server.Weapon.Melee.EnergySword
 
             // Overrides basic blunt damage with burn+slash as set in yaml
             args.BonusDamage = comp.LitDamageBonus;
-            args.HitSoundOverride = comp.HitSound;
         }
 
         private void OnUseInHand(EntityUid uid, EnergySwordComponent comp, UseInHandEvent args)
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index c58638167c..b31075c040 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -21,6 +21,8 @@
         shader: unshaded
         map: [ "blade" ]
   - type: MeleeWeapon
+    hitSound:
+      path: /Audio/Weapons/eblade1.ogg
     damage:
       types:
         Blunt: 7