From db05016fe0dd744cd91faacba8c6ed78dad16eaf Mon Sep 17 00:00:00 2001 From: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Date: Mon, 27 Oct 2025 15:43:28 -0700 Subject: [PATCH] Fix chemical explosion scaling. (#41153) Fix area reaction scaling Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> --- .../EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs | 2 ++ .../EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs | 2 ++ .../EntityEffects/Effects/Transform/ExplosionEntityEffect.cs | 2 ++ .../EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs | 2 ++ 4 files changed, 8 insertions(+) diff --git a/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs index 13175cfed1..9d3dc38222 100644 --- a/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs +++ b/Content.Shared/EntityEffects/Effects/Solution/AreaReactionEntityEffect.cs @@ -28,6 +28,8 @@ public sealed partial class AreaReactionEffect : EntityEffectBase [DataField(required: true)] public SoundSpecifier Sound = default!; + public override bool Scaling => true; + public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("entity-effect-guidebook-area-reaction", ("duration", Duration) diff --git a/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs index 2cbb6d6dad..334223686b 100644 --- a/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs @@ -49,6 +49,8 @@ public sealed partial class Emp : EntityEffectBase [DataField] public TimeSpan Duration = TimeSpan.FromSeconds(15); + public override bool Scaling => true; + public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("entity-effect-guidebook-emp-reaction-effect", ("chance", Probability)); diff --git a/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs index 907c4e321f..2e32c434a3 100644 --- a/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs +++ b/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs @@ -50,6 +50,8 @@ public sealed partial class Explosion : EntityEffectBase [DataField] public float TileBreakScale = 1f; + public override bool Scaling => true; + public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("entity-effect-guidebook-explosion", ("chance", Probability)); diff --git a/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs index df788e94d6..66d30945aa 100644 --- a/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs @@ -76,6 +76,8 @@ public sealed partial class Flash : EntityEffectBase [DataField] public SoundSpecifier? Sound = new SoundPathSpecifier("/Audio/Weapons/flash.ogg"); + public override bool Scaling => true; + public override string EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) => Loc.GetString("entity-effect-guidebook-flash-reaction-effect", ("chance", Probability)); } -- 2.51.2