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

Inline UID

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 15:53:09 +01:00
parent 2654775bf0
commit 5cd42c9ad6
803 changed files with 3613 additions and 3577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,10 +28,10 @@ namespace Content.Server.Damage.Systems
return;
if (component.WeldingDamage is {} weldingDamage
&& IoCManager.Resolve<IEntityManager>().TryGetComponent<WelderComponent?>(args.Used.Uid, out var welder)
&& IoCManager.Resolve<IEntityManager>().TryGetComponent<WelderComponent?>(args.Used, out var welder)
&& welder.Lit)
{
var dmg = _damageableSystem.TryChangeDamage(args.Target.Uid, weldingDamage);
var dmg = _damageableSystem.TryChangeDamage(args.Target, weldingDamage);
if (dmg != null)
_logSystem.Add(LogType.Damaged,
@@ -40,10 +40,10 @@ namespace Content.Server.Damage.Systems
args.Handled = true;
}
else if (component.DefaultDamage is {} damage
&& IoCManager.Resolve<IEntityManager>().TryGetComponent<ToolComponent?>(args.Used.Uid, out var tool)
&& IoCManager.Resolve<IEntityManager>().TryGetComponent<ToolComponent?>(args.Used, out var tool)
&& tool.Qualities.ContainsAny(component.Tools))
{
var dmg = _damageableSystem.TryChangeDamage(args.Target.Uid, damage);
var dmg = _damageableSystem.TryChangeDamage(args.Target, damage);
if (dmg != null)
_logSystem.Add(LogType.Damaged,