Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixes Esword not changing hit sound and sharpComp. (#9005)

Browse Source 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
This commit is contained in:
Júlio César Ueti
2022-06-21 21:54:28 -03:00
committed by GitHub
parent d958ababb9
commit a8f8426eed
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/Weapon/Melee/EnergySword/EnergySwordSystem.cs
View File

@@ -6,6 +6,9 @@ using Content.Shared.Light.Component;
using Content.Shared.Toggleable;
using Content.Shared.Tools.Components;
using Content.Server.CombatMode.Disarm;
using Content.Server.Kitchen.Components;
using Content.Server.Weapon.Melee.Components;
using Content.Shared.Sound;
using Robust.Shared.Audio;
using Robust.Shared.Player;
using Robust.Shared.Random;
@@ -74,6 +77,11 @@ namespace Content.Server.Weapon.Melee.EnergySword
malus.Malus -= comp.litDisarmMalus;
}
if(TryComp<MeleeWeaponComponent>(comp.Owner, out var weaponComp))
weaponComp.HitSound = comp.OnHitOff;
RemComp<SharpComponent>(comp.Owner);
SoundSystem.Play(comp.DeActivateSound.GetSound(), Filter.Pvs(comp.Owner, entityManager: EntityManager), comp.Owner);
comp.Activated = false;
@@ -89,6 +97,11 @@ namespace Content.Server.Weapon.Melee.EnergySword
item.Size = 9999;
}
EnsureComp<SharpComponent>(comp.Owner);
if(TryComp<MeleeWeaponComponent>(comp.Owner, out var weaponComp))
weaponComp.HitSound = comp.OnHitOn;
SoundSystem.Play(comp.ActivateSound.GetSound(), Filter.Pvs(comp.Owner, entityManager: EntityManager), comp.Owner);
if (TryComp<DisarmMalusComponent>(comp.Owner, out var malus))