From 999fa625384a7d15509e5bfcbbdae0d3ffa2bd14 Mon Sep 17 00:00:00 2001 From: Errant <35878406+dmnct@users.noreply.github.com> Date: Sun, 6 Aug 2023 08:19:32 +0000 Subject: [PATCH] Fix energy swords healing blunt (#18753) * esword fix * comment --- Content.Server/Weapons/Melee/EnergySword/EnergySwordSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Weapons/Melee/EnergySword/EnergySwordSystem.cs b/Content.Server/Weapons/Melee/EnergySword/EnergySwordSystem.cs index b24c42b137..2b414ea00d 100644 --- a/Content.Server/Weapons/Melee/EnergySword/EnergySwordSystem.cs +++ b/Content.Server/Weapons/Melee/EnergySword/EnergySwordSystem.cs @@ -52,8 +52,8 @@ public sealed class EnergySwordSystem : EntitySystem if (!comp.Activated) return; - // Overrides basic blunt damage with burn+slash as set in yaml - args.Damage = comp.LitDamageBonus; + // Adjusts base damage when the energy blade is active, by values set in yaml + args.Damage += comp.LitDamageBonus; } private void OnUseInHand(EntityUid uid, EnergySwordComponent comp, UseInHandEvent args)