From 2cbcebfc76d3c3b0437bbfcd2bd18524cd28a99f Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 17 Feb 2022 02:04:54 +0100 Subject: [PATCH] [MIRROR] Fixes gunpowder and teslium explosion scaling. [MDB IGNORE] (#11549) * Fixes gunpowder and teslium explosion scaling. (#64854) At some point chemical reaction explosions were moved to their own handler proc and gunpowder and teslium were changed to use timers instead of sleeps. It turns out that whoever did one of them forgot to pass the relevant explosion scaling arguments. As a result both gunpowder and teslium were using the default 0 + [V/10] power. This makes them actually pass the scaling args as intended. * Fixes gunpowder and teslium explosion scaling. Co-authored-by: TemporalOroboros --- code/modules/reagents/chemistry/recipes/pyrotechnics.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index f346c91b347..0c375886a69 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -156,7 +156,7 @@ mix_message = "Sparks start flying around the gunpowder!" /datum/chemical_reaction/reagent_explosion/gunpowder_explosion/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume) - addtimer(CALLBACK(src, .proc/default_explode, holder, created_volume), rand(5,10) SECONDS) + addtimer(CALLBACK(src, .proc/default_explode, holder, created_volume, modifier, strengthdiv), rand(5,10) SECONDS) /datum/chemical_reaction/thermite results = list(/datum/reagent/thermite = 3) @@ -555,7 +555,7 @@ added_delay += 1.5 SECONDS if(created_volume >= 10) //10 units minimum for lightning, 40 units for secondary blast, 75 units for tertiary blast. addtimer(CALLBACK(src, .proc/zappy_zappy, holder, T3), added_delay) - addtimer(CALLBACK(src, .proc/default_explode, holder, created_volume), added_delay) + addtimer(CALLBACK(src, .proc/default_explode, holder, created_volume, modifier, strengthdiv), added_delay) /datum/chemical_reaction/reagent_explosion/teslium_lightning/proc/zappy_zappy(datum/reagents/holder, power) if(QDELETED(holder.my_atom))