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

adds a source uid to most damage & mobstate events (#11559)

Browse Source 
Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com>
This commit is contained in:
Paul Ritter
2022-10-08 12:15:27 +02:00
committed by GitHub
parent 548cee77e2
commit 79854e59a4
24 changed files with 50 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs
View File

@@ -30,7 +30,7 @@ namespace Content.Server.Damage.Systems
&& welder.Lit
&& !welder.TankSafe)
{
var dmg = _damageableSystem.TryChangeDamage(args.Target, weldingDamage);
var dmg = _damageableSystem.TryChangeDamage(args.Target, weldingDamage, origin: args.User);
if (dmg != null)
_adminLogger.Add(LogType.Damaged,
@@ -42,7 +42,7 @@ namespace Content.Server.Damage.Systems
&& EntityManager.TryGetComponent<ToolComponent?>(args.Used, out var tool)
&& tool.Qualities.ContainsAny(component.Tools))
{
var dmg = _damageableSystem.TryChangeDamage(args.Target, damage);
var dmg = _damageableSystem.TryChangeDamage(args.Target, damage, origin: args.User);
if (dmg != null)
_adminLogger.Add(LogType.Damaged,