tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop toys from electrocuting on attack (#15318)

Browse Source
This commit is contained in:
Dawid Bla
2023-04-12 02:11:55 +02:00
committed by GitHub
parent f474171451
commit c6de63c535
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Electrocution/ElectrocutionSystem.cs
View File

@@ -130,6 +130,13 @@ namespace Content.Server.Electrocution
if (!electrified.OnAttacked) if (!electrified.OnAttacked)
return; return;
//Dont shock if the attacker used a toy
if (EntityManager.TryGetComponent<MeleeWeaponComponent>(args.Used, out var meleeWeaponComponent))
{
if (meleeWeaponComponent.Damage.Total == 0)
return;
}
TryDoElectrifiedAct(uid, args.User, 1, electrified); TryDoElectrifiedAct(uid, args.User, 1, electrified);
} }