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

Remove stamina + damageable .Owner (#14602)

Browse Source 
* Remove stamina + damageable .Owner

* More
This commit is contained in:
metalgearsloth
2023-03-13 00:19:05 +11:00
committed by GitHub
parent 058c732db1
commit 49c7c0f9a7
12 changed files with 70 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,7 +39,7 @@ namespace Content.Server.Damage.Systems
if (EntityManager.TryGetComponent(entity, out DamageableComponent? damageable))
{
_damageableSystem.SetDamage(damageable, new DamageSpecifier());
_damageableSystem.SetDamage(entity, damageable, new DamageSpecifier());
}
return true;
@@ -66,7 +66,7 @@ namespace Content.Server.Damage.Systems
{
if (old.Damage != null)
{
_damageableSystem.SetDamage(damageable, old.Damage);
_damageableSystem.SetDamage(entity, damageable, old.Damage);
}
}

4
Content.Server/Polymorph/Systems/PolymorphSystem.cs
View File

@@ -155,7 +155,7 @@ namespace Content.Server.Polymorph.Systems
_mobThreshold.GetScaledDamage(uid, child, out var damage) &&
damage != null)
{
_damageable.SetDamage(damageParent, damage);
_damageable.SetDamage(child, damageParent, damage);
}
if (proto.Inventory == PolymorphInventoryChange.Transfer)
@@ -244,7 +244,7 @@ namespace Content.Server.Polymorph.Systems
_mobThreshold.GetScaledDamage(uid, parent, out var damage) &&
damage != null)
{
_damageable.SetDamage(damageParent, damage);
_damageable.SetDamage(parent, damageParent, damage);
}
if (proto.Inventory == PolymorphInventoryChange.Transfer)

2
Content.Server/Repairable/RepairableSystem.cs
View File

@@ -34,7 +34,7 @@ namespace Content.Server.Repairable
else
{
// Repair all damage
_damageableSystem.SetAllDamage(damageable, 0);
_damageableSystem.SetAllDamage(uid, damageable, 0);
_adminLogger.Add(LogType.Healed, $"{ToPrettyString(args.User):user} repaired {ToPrettyString(uid):target} back to full health");
}

2
Content.Server/Salvage/SalvageMobRestrictionsSystem.cs
View File

@@ -62,7 +62,7 @@ public sealed class SalvageMobRestrictionsSystem : EntitySystem
}
else if (damageQuery.TryGetComponent(target, out var damageableComponent))
{
_damageableSystem.SetAllDamage(damageableComponent, 200);
_damageableSystem.SetAllDamage(target, damageableComponent, 200);
}
}
}

2
Content.Server/Zombies/ZombifyOnDeathSystem.cs
View File

@@ -165,7 +165,7 @@ namespace Content.Server.Zombies
//Heals the zombie from all the damage it took while human
if (TryComp<DamageableComponent>(target, out var damageablecomp))
_damageable.SetAllDamage(damageablecomp, 0);
_damageable.SetAllDamage(target, damageablecomp, 0);
//gives it the funny "Zombie ___" name.
var meta = MetaData(target);