Update DamageableSystem to modern standards (#39417)
* Update DamageableSystem to modern standards * DamageContainerId -> DamageContainerID with lint flag * Replace strings with protoids * Make CVar subscription declarations all consistently whitespaced * ChangeDamage -> TryChangeDamage, cope with C# jank * Revert event signature changes * Restore a comment * Re-add two queries * Init the queries * Use appearanceQuery in DamageChanged * Use damageableQuery in TryChangeDamage * Use damageableQuery in SetDamageModifierSetId * Final cleanup, fix sandboxing * Rectify ExplosionSystem:::ProcessEntity's call to TryChangeDamage * Re-organize DamageableSystem * first big fuck you breaking change. * THATS A LOT OF DAMAGE!!! * Fix test fails * test fixes 2 * push it --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
cf66dd7b35
commit
cdbe92d37d
@@ -1,7 +1,7 @@
|
||||
using Content.Server.Body.Systems;
|
||||
using Content.Server.Popups;
|
||||
using Content.Shared.Actions;
|
||||
using Content.Shared.Damage;
|
||||
using Content.Shared.Damage.Systems;
|
||||
using Content.Shared.DoAfter;
|
||||
using Content.Shared.Examine;
|
||||
using Content.Shared.Guardian;
|
||||
@@ -285,8 +285,8 @@ namespace Content.Server.Guardian
|
||||
if (args.DamageDelta == null || component.Host == null || component.DamageShare == 0)
|
||||
return;
|
||||
|
||||
_damageSystem.TryChangeDamage(
|
||||
component.Host,
|
||||
_damageSystem.ChangeDamage(
|
||||
component.Host.Value,
|
||||
args.DamageDelta * component.DamageShare,
|
||||
origin: args.Origin,
|
||||
ignoreResistances: true,
|
||||
|
||||
Reference in New Issue
Block a user