Mild Entity Effect/Condition Cleanup (#41059)

* Commit

* ploop

* borger

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

diff --git a/Content.Server/EntityEffects/Effects/ExplodeEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/ExplodeEntityEffectSystem.cs
index 497fec34097d98566d759c846c12b93aa90ae877..2e2fadff323309039df7cb19a887d443eab85ded 100644 (file)
--- a/Content.Server/EntityEffects/Effects/ExplodeEntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/Effects/ExplodeEntityEffectSystem.cs
@@ -1,6 +1,6 @@
 using Content.Server.Explosion.EntitySystems;
 using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Transform;
+using Content.Shared.EntityEffects.Effects;
 using Content.Shared.Explosion.Components;
 
 namespace Content.Server.EntityEffects.Effects;
@@ -9,11 +9,11 @@ namespace Content.Server.EntityEffects.Effects;
 /// Makes this entity explode using its <see cref="ExplosiveComponent"/>.
 /// </summary>
 /// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
-public sealed partial class ExplodeEntityEffectSystem : EntityEffectSystem<ExplosiveComponent, ExplodeEffect>
+public sealed partial class ExplodeEntityEffectSystem : EntityEffectSystem<ExplosiveComponent, Explode>
 {
     [Dependency] private readonly ExplosionSystem _explosion = default!;
 
-    protected override void Effect(Entity<ExplosiveComponent> entity, ref EntityEffectEvent<ExplodeEffect> args)
+    protected override void Effect(Entity<ExplosiveComponent> entity, ref EntityEffectEvent<Explode> args)
     {
         _explosion.TriggerExplosive(entity, entity, args.Effect.Delete, args.Effect.Intensity, args.Effect.Radius, args.User);
     }

diff --git a/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs
index 55fc12005143ffe086b594984d04ac4974704fda..fec56aa2d352b26c043ba04c1bb444461abe458a 100644 (file)
--- a/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs
@@ -1,6 +1,6 @@
 using Content.Server.Explosion.EntitySystems;
 using Content.Shared.EntityEffects;
-using Content.Shared.EntityEffects.Effects.Transform;
+using ExplosionEffect = Content.Shared.EntityEffects.Effects.Transform.Explosion;
 
 namespace Content.Server.EntityEffects.Effects.Transform;
 

diff --git a/Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs b/Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs
index d19d326e26952ff790c75b8968e27973476e196a..ece979a6a85c9e6ca05df1a7505858648e54f228 100644 (file)
--- a/Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs
+++ b/Content.Shared/EntityConditions/Conditions/Body/BreathingEntityCondition.cs
@@ -6,5 +6,5 @@ namespace Content.Shared.EntityConditions.Conditions.Body;
 public sealed partial class BreathingCondition : EntityConditionBase<BreathingCondition>
 {
     public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
-        Loc.GetString("reagent-effect-condition-guidebook-breathing", ("isBreathing", !Inverted));
+        Loc.GetString("entity-condition-guidebook-breathing", ("isBreathing", !Inverted));
 }

diff --git a/Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs
index f9867b28b0520238fa133e91d6ba4e02a9855904..f00707f90782a4c65928f9a67343ca9b497fdbd2 100644 (file)
--- a/Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs
@@ -29,5 +29,5 @@ public sealed partial class HungerCondition : EntityConditionBase<HungerConditio
     public float Max = float.PositiveInfinity;
 
     public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
-        Loc.GetString("reagent-effect-condition-guidebook-total-hunger", ("max", float.IsPositiveInfinity(Max) ? int.MaxValue : Max), ("min", Min));
+        Loc.GetString("entity-condition-guidebook-total-hunger", ("max", float.IsPositiveInfinity(Max) ? int.MaxValue : Max), ("min", Min));
 }

diff --git a/Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs
index e87c54a76173b91b4a73f2eaeefc74e1edacc209..cabf731939c1c9b69fab92f19f0f81fdb5eca325 100644 (file)
--- a/Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/Body/InternalsEntityConditionSystem.cs
@@ -19,5 +19,5 @@ public sealed partial class InternalsOnEntityConditionSystem : EntityConditionSy
 public sealed partial class InternalsCondition : EntityConditionBase<InternalsCondition>
 {
     public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
-        Loc.GetString("reagent-effect-condition-guidebook-internals", ("usingInternals", !Inverted));
+        Loc.GetString("entity-condition-guidebook-internals", ("usingInternals", !Inverted));
 }

diff --git a/Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityCondition.cs b/Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityCondition.cs
index 2196d271ff17b823c5aafaa6f312826d944dfb93..5fb63d008f6d0a50d7233454e89e738ddd87e9ec 100644 (file)
--- a/Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityCondition.cs
+++ b/Content.Shared/EntityConditions/Conditions/Body/MetabolizerTypeEntityCondition.cs
@@ -24,7 +24,7 @@ public sealed partial class MetabolizerTypeCondition : EntityConditionBase<Metab
 
         var names = ContentLocalizationManager.FormatListToOr(typeList);
 
-        return Loc.GetString("reagent-effect-condition-guidebook-organ-type",
+        return Loc.GetString("entity-condition-guidebook-organ-type",
             ("name", names),
             ("shouldhave", !Inverted));
     }

diff --git a/Content.Shared/EntityConditions/Conditions/Body/MobStateEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Body/MobStateEntityConditionSystem.cs
index d00481d3e103fccb7f8a98747de467c319598d97..735720c0ea4d3e2219847786018b67ac2bf0354e 100644 (file)
--- a/Content.Shared/EntityConditions/Conditions/Body/MobStateEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/Body/MobStateEntityConditionSystem.cs
@@ -24,5 +24,5 @@ public sealed partial class MobStateCondition : EntityConditionBase<MobStateCond
     public MobState Mobstate = MobState.Alive;
 
     public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
-        Loc.GetString("reagent-effect-condition-guidebook-mob-state-condition", ("state", Mobstate));
+        Loc.GetString("entity-condition-guidebook-mob-state-condition", ("state", Mobstate));
 }

diff --git a/Content.Shared/EntityConditions/Conditions/DamageGroupEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/DamageGroupEntityConditionSystem.cs
index 4fb0cdf43f576423e7189f8efa100e479d50cfaf..dd877140d61c78050d52df7f77f89b5c8e917e89 100644 (file)
--- a/Content.Shared/EntityConditions/Conditions/DamageGroupEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/DamageGroupEntityConditionSystem.cs
@@ -31,7 +31,7 @@ public sealed partial class DamageGroupCondition : EntityConditionBase<DamageGro
     public ProtoId<DamageGroupPrototype> DamageGroup;
 
     public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
-        Loc.GetString("reagent-effect-condition-guidebook-group-damage",
+        Loc.GetString("entity-condition-guidebook-group-damage",
             ("max", Max == FixedPoint2.MaxValue ? int.MaxValue : Max.Float()),
             ("min", Min.Float()),
             ("type", prototype.Index(DamageGroup).LocalizedName));

diff --git a/Content.Shared/EntityConditions/Conditions/DamageTypeEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/DamageTypeEntityConditionSystem.cs
index b451f5d258fac9427ad1f2c71e2fed79a34db3ad..30490c72e8ca2535ec56d2b06f95473f5929011d 100644 (file)
--- a/Content.Shared/EntityConditions/Conditions/DamageTypeEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/DamageTypeEntityConditionSystem.cs
@@ -31,7 +31,7 @@ public sealed partial class DamageTypeCondition : EntityConditionBase<DamageType
     public ProtoId<DamageTypePrototype> DamageType;
 
     public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
-        Loc.GetString("reagent-effect-condition-guidebook-type-damage",
+        Loc.GetString("entity-condition-guidebook-type-damage",
             ("max", Max == FixedPoint2.MaxValue ? int.MaxValue : Max.Float()),
             ("min", Min.Float()),
             ("type", prototype.Index(DamageType).LocalizedName));

diff --git a/Content.Shared/EntityConditions/Conditions/JobEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/JobEntityConditionSystem.cs
index e07989da36a8d8aba7230bffe8d8f938d94f82cf..a698efa032932f1fc9f22a6e52169cf5f964afda 100644 (file)
--- a/Content.Shared/EntityConditions/Conditions/JobEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/JobEntityConditionSystem.cs
@@ -54,6 +54,6 @@ public sealed partial class JobCondition : EntityConditionBase<JobCondition>
     public override string EntityConditionGuidebookText(IPrototypeManager prototype)
     {
         var localizedNames = Jobs.Select(jobId => prototype.Index(jobId).LocalizedName).ToList();
-        return Loc.GetString("reagent-effect-condition-guidebook-job-condition", ("job", ContentLocalizationManager.FormatListToOr(localizedNames)));
+        return Loc.GetString("entity-condition-guidebook-job-condition", ("job", ContentLocalizationManager.FormatListToOr(localizedNames)));
     }
 }

diff --git a/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs
index c49c9a3d024c09f791c5f67e32493ecc4b681c2f..dbe585e6317cbe6b60bbf9a327de4addc0b536fa 100644 (file)
--- a/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/ReagentEntityConditionSystem.cs
@@ -36,8 +36,8 @@ public sealed partial class ReagentCondition : EntityConditionBase<ReagentCondit
         if (!prototype.Resolve(Reagent, out var reagentProto))
             return String.Empty;
 
-        return Loc.GetString("reagent-effect-condition-guidebook-reagent-threshold",
-            ("reagent", reagentProto.LocalizedName ?? Loc.GetString("reagent-effect-condition-guidebook-this-reagent")),
+        return Loc.GetString("entity-condition-guidebook-reagent-threshold",
+            ("reagent", reagentProto.LocalizedName),
             ("max", Max == FixedPoint2.MaxValue ? int.MaxValue : Max.Float()),
             ("min", Min.Float()));
     }

diff --git a/Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs
index 99d7206c0aa5fc2cd2b465f1ba86bc2200ea53c9..36f4f51bf5dc1ad0dbd33ffdd78beb092c16e4fe 100644 (file)
--- a/Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs
@@ -38,6 +38,6 @@ public sealed partial class AllTagsCondition : EntityConditionBase<AllTagsCondit
 
         var names = ContentLocalizationManager.FormatList(tagList);
 
-        return Loc.GetString("reagent-effect-condition-guidebook-has-tag", ("tag", names), ("invert", Inverted));
+        return Loc.GetString("entity-condition-guidebook-has-tag", ("tag", names), ("invert", Inverted));
     }
 }

diff --git a/Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs
index 3513353125790a11534b4322f2dba5d2a41a4084..dedce491fdfa1e6e6a7b524f4a2e6d0d3c871be3 100644 (file)
--- a/Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs
@@ -38,6 +38,6 @@ public sealed partial class AnyTagCondition : EntityConditionBase<AnyTagConditio
 
         var names = ContentLocalizationManager.FormatListToOr(tagList);
 
-        return Loc.GetString("reagent-effect-condition-guidebook-has-tag", ("tag", names), ("invert", Inverted));
+        return Loc.GetString("entity-condition-guidebook-has-tag", ("tag", names), ("invert", Inverted));
     }
 }

diff --git a/Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs
index 9b67f3828242b393b3724ddb7c6d2e63eb9727ef..6145982a0301ff5bca0370c491f822f368850422 100644 (file)
--- a/Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs
@@ -24,5 +24,5 @@ public sealed partial class TagCondition : EntityConditionBase<TagCondition>
     public ProtoId<TagPrototype> Tag;
 
     public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
-        Loc.GetString("reagent-effect-condition-guidebook-has-tag", ("tag", Tag), ("invert", Inverted));
+        Loc.GetString("entity-condition-guidebook-has-tag", ("tag", Tag), ("invert", Inverted));
 }

diff --git a/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs
index 6585f3bf44aded09fbfd08510969a06b16d8bd40..f87bbecf8c22ee123c71ae314240dc84bf5a3889 100644 (file)
--- a/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/TemperatureEntityConditionSystem.cs
@@ -46,7 +46,7 @@ public sealed partial class TemperatureCondition : EntityConditionBase<Temperatu
     public float Max = float.PositiveInfinity;
 
     public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
-        Loc.GetString("reagent-effect-condition-guidebook-body-temperature",
+        Loc.GetString("entity-condition-guidebook-body-temperature",
             ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
             ("min", Min));
 }

diff --git a/Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs
index e710e07b179bd2a13ae4b9f5428ec8238cf824b4..16f4a946f3cf8e3dd5438563e7c01023329b93e4 100644 (file)
--- a/Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs
+++ b/Content.Shared/EntityConditions/Conditions/TotalDamageEntityConditionSystem.cs
@@ -27,7 +27,7 @@ public sealed partial class TotalDamageCondition : EntityConditionBase<TotalDama
     public FixedPoint2 Min = FixedPoint2.Zero;
 
     public override string EntityConditionGuidebookText(IPrototypeManager prototype) =>
-        Loc.GetString("reagent-effect-condition-guidebook-total-damage",
+        Loc.GetString("entity-condition-guidebook-total-damage",
             ("max", Max == FixedPoint2.MaxValue ? int.MaxValue : Max.Float()),
             ("min", Min.Float()));
 }

diff --git a/Content.Shared/EntityEffects/Effects/ExplodeEntityEffect.cs b/Content.Shared/EntityEffects/Effects/ExplodeEntityEffect.cs
index 0a99ef90f1937df4d632c5fc062fe9c78d6f4e29..ecad4e47adc04e9101c7a3f1bd2dd0114f0c4b84 100644 (file)
--- a/Content.Shared/EntityEffects/Effects/ExplodeEntityEffect.cs
+++ b/Content.Shared/EntityEffects/Effects/ExplodeEntityEffect.cs
@@ -1,11 +1,12 @@
 using Content.Shared.Database;
+using Content.Shared.EntityEffects.Effects.Transform;
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.EntityEffects.Effects.Transform;
+namespace Content.Shared.EntityEffects.Effects;
 
 /// <inheritdoc cref="EntityEffect"/>
-/// <seealso cref="ExplosionEffect">
-public sealed partial class ExplodeEffect : EntityEffectBase<ExplodeEffect>
+/// <seealso cref="Explosion"/>
+public sealed partial class Explode : EntityEffectBase<Explode>
 {
     /// <summary>
     /// Optional override for the explosion intensity.

diff --git a/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs b/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs
index 3cb4d3aac060ba7b392f61634a19a9f8ca53fd5d..907c4e321f9c137a36286486f3ee1b53b02ce397 100644 (file)
--- a/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs
+++ b/Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs
@@ -5,8 +5,8 @@ using Robust.Shared.Prototypes;
 namespace Content.Shared.EntityEffects.Effects.Transform;
 
 /// <inheritdoc cref="EntityEffect"/>
-/// <seealso cref="ExplodeEffect">
-public sealed partial class ExplosionEffect : EntityEffectBase<ExplosionEffect>
+/// <seealso cref="Explode"/>
+public sealed partial class Explosion : EntityEffectBase<Explosion>
 {
     /// <summary>
     ///     The type of explosion. Determines damage types and tile break chance scaling.

diff --git a/Resources/Locale/en-US/guidebook/entity-effects/conditions.ftl b/Resources/Locale/en-US/guidebook/entity-effects/conditions.ftl
index 63654ab08ba359c7f0ac1f5750bc343fd71f7f7f..1d017423d3d48615815907928ac819090f6a865e 100644 (file)
--- a/Resources/Locale/en-US/guidebook/entity-effects/conditions.ftl
+++ b/Resources/Locale/en-US/guidebook/entity-effects/conditions.ftl
@@ -1,4 +1,4 @@
-reagent-effect-condition-guidebook-total-damage =
+entity-condition-guidebook-total-damage =
     { $max ->
         [2147483648] it has at least {NATURALFIXED($min, 2)} total damage
         *[other] { $min ->
@@ -7,7 +7,7 @@ reagent-effect-condition-guidebook-total-damage =
                  }
     }
 
-reagent-effect-condition-guidebook-type-damage =
+entity-condition-guidebook-type-damage =
     { $max ->
         [2147483648] it has at least {NATURALFIXED($min, 2)} of {$type} damage
         *[other] { $min ->
@@ -16,7 +16,7 @@ reagent-effect-condition-guidebook-type-damage =
                  }
     }
 
-reagent-effect-condition-guidebook-group-damage =
+entity-condition-guidebook-group-damage =
     { $max ->
         [2147483648] it has at least {NATURALFIXED($min, 2)} of {$type} damage.
         *[other] { $min ->
@@ -25,7 +25,7 @@ reagent-effect-condition-guidebook-group-damage =
                  }
     }
 
-reagent-effect-condition-guidebook-total-hunger =
+entity-condition-guidebook-total-hunger =
     { $max ->
         [2147483648] the target has at least {NATURALFIXED($min, 2)} total hunger
         *[other] { $min ->
@@ -34,7 +34,7 @@ reagent-effect-condition-guidebook-total-hunger =
                  }
     }
 
-reagent-effect-condition-guidebook-reagent-threshold =
+entity-condition-guidebook-reagent-threshold =
     { $max ->
         [2147483648] there's at least {NATURALFIXED($min, 2)}u of {$reagent}
         *[other] { $min ->
@@ -43,13 +43,13 @@ reagent-effect-condition-guidebook-reagent-threshold =
                  }
     }
 
-reagent-effect-condition-guidebook-mob-state-condition =
+entity-condition-guidebook-mob-state-condition =
     the mob is { $state }
 
-reagent-effect-condition-guidebook-job-condition =
+entity-condition-guidebook-job-condition =
     the target's job is { $job }
 
-reagent-effect-condition-guidebook-solution-temperature =
+entity-condition-guidebook-solution-temperature =
     the solution's temperature is { $max ->
             [2147483648] at least {NATURALFIXED($min, 2)}k
             *[other] { $min ->
@@ -58,7 +58,7 @@ reagent-effect-condition-guidebook-solution-temperature =
                      }
     }
 
-reagent-effect-condition-guidebook-body-temperature =
+entity-condition-guidebook-body-temperature =
     the body's temperature is { $max ->
             [2147483648] at least {NATURALFIXED($min, 2)}k
             *[other] { $min ->
@@ -67,27 +67,27 @@ reagent-effect-condition-guidebook-body-temperature =
                      }
     }
 
-reagent-effect-condition-guidebook-organ-type =
+entity-condition-guidebook-organ-type =
     the metabolizing organ { $shouldhave ->
                                 [true] is
                                 *[false] is not
                            } {INDEFINITE($name)} {$name} organ
 
-reagent-effect-condition-guidebook-has-tag =
+entity-condition-guidebook-has-tag =
     the target { $invert ->
                  [true] does not have
                  *[false] has
                 } the tag {$tag}
 
-reagent-effect-condition-guidebook-this-reagent = this reagent
+entity-condition-guidebook-this-reagent = this reagent
 
-reagent-effect-condition-guidebook-breathing =
+entity-condition-guidebook-breathing =
     the metabolizer is { $isBreathing ->
                 [true] breathing normally
                 *[false] suffocating
                }
 
-reagent-effect-condition-guidebook-internals =
+entity-condition-guidebook-internals =
     the metabolizer is { $usingInternals ->
                 [true] using internals
                 *[false] breathing atmospheric air

diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
index b2a09a1b7ff62cf5e54f5553273f778c0e1b7aa2..08221c6f1a48a59cee68e423cc3d1be11343233d 100644 (file)
--- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml
+++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
@@ -111,7 +111,7 @@
     Potassium:
       amount: 1
   effects:
-    - !type:ExplosionEffect
+    - !type:Explosion
       explosionType: Default
       intensityPerUnit: 0.25
       maxTotalIntensity: 100

diff --git a/Resources/Prototypes/Recipes/Reactions/fun.yml b/Resources/Prototypes/Recipes/Reactions/fun.yml
index 9b335a2acaaa3319092bd05e67246d2b7eb37f8a..9245f36a3631e0fecd01a2ec378e7a208ee0315a 100644 (file)
--- a/Resources/Prototypes/Recipes/Reactions/fun.yml
+++ b/Resources/Prototypes/Recipes/Reactions/fun.yml
@@ -208,7 +208,7 @@
     JuiceThatMakesYouHew:
       amount: 1
   effects:
-  - !type:ExplosionEffect
+  - !type:Explosion
     explosionType: Radioactive
     maxIntensity: 200
     intensityPerUnit: 2

diff --git a/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml b/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml
index 21bea1ff2b8540564fbfcb2dda26c4540d6fb14c..b3b01ab5151e6438b92a4498604d3acfea446e44 100644 (file)
--- a/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml
+++ b/Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml
@@ -39,7 +39,7 @@
     Fluorine:
       amount: 3
   effects:
-  - !type:ExplosionEffect
+  - !type:Explosion
     explosionType: Default # 15 damage per intensity.
     maxIntensity: 200
     intensityPerUnit: 5