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

Support multiple containers for HealingComponent (#16867)

Browse Source
This commit is contained in:
Vordenburg
2023-06-03 15:30:20 -04:00
committed by GitHub
parent d8c05d013e
commit 49ba959b82
4 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/Medical/HealingSystem.cs
View File

@@ -51,8 +51,12 @@ public sealed class HealingSystem : EntitySystem
if (args.Handled || args.Cancelled)
return;
if (component.DamageContainerID is not null && !component.DamageContainerID.Equals(component.DamageContainerID))
if (healing.DamageContainers is not null &&
component.DamageContainerID is not null &&
!healing.DamageContainers.Contains(component.DamageContainerID))
{
return;
}
// Heal some bloodloss damage.
if (healing.BloodlossModifier != 0)
@@ -140,9 +144,12 @@ public sealed class HealingSystem : EntitySystem
if (!TryComp<DamageableComponent>(target, out var targetDamage))
return false;
if (component.DamageContainerID is not null &&
!component.DamageContainerID.Equals(targetDamage.DamageContainerID))
if (component.DamageContainers is not null &&
targetDamage.DamageContainerID is not null &&
!component.DamageContainers.Contains(targetDamage.DamageContainerID))
{
return false;
}
if (user != target && !_interactionSystem.InRangeUnobstructed(user, target, popup: true))
return false;