From 3952c586714514054ef5f2d55b6c93bbdb3ae1fb Mon Sep 17 00:00:00 2001
From: Tsar-Salat <62388554+Tsar-Salat@users.noreply.github.com>
Date: Sat, 11 Nov 2023 15:29:45 -0500
Subject: [PATCH] initial (#10131)
---
.../modules/reagents/chemistry/recipes/pyrotechnics.dm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
index 2d1c3f947c43d..c881dd1653ea5 100644
--- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
@@ -113,10 +113,10 @@
required_temp = 474
strengthdiv = 6
modifier = 1
- mix_message = "Sparks start flying around the black powder!"
+ mix_message = "Sparks start flying around the black powder!"
/datum/chemical_reaction/reagent_explosion/blackpowder_explosion/on_reaction(datum/reagents/holder, created_volume)
- addtimer(CALLBACK(src, PROC_REF(explode), holder, created_volume), rand(50,100))
+ addtimer(CALLBACK(src, PROC_REF(explode), holder, created_volume, modifier, strengthdiv), rand(5,10) SECONDS)
/datum/chemical_reaction/thermite
name = "Thermite"
@@ -451,7 +451,7 @@
var/tesla_flags = TESLA_MOB_DAMAGE | TESLA_OBJ_DAMAGE | TESLA_MOB_STUN
/datum/chemical_reaction/reagent_explosion/teslium_lightning/on_reaction(datum/reagents/holder, created_volume)
- var/T1 = created_volume * 20 //100 units : Zap 3 times, with powers 2000/5000/12000. Tesla revolvers have a power of 10000 for comparison.
+ var/T1 = created_volume * 20 //100 units : Zap 3 times, with powers 2000/5000/12000. Tesla revolvers have a power of 10000 for comparison.
var/T2 = created_volume * 50
var/T3 = created_volume * 120
var/added_delay = 0.5 SECONDS
@@ -461,9 +461,9 @@
if(created_volume >= 40)
addtimer(CALLBACK(src, PROC_REF(zappy_zappy), holder, T2), added_delay)
added_delay += 1.5 SECONDS
- if(created_volume >= 10) //10 units minimum for lightning, 40 units for secondary blast, 75 units for tertiary blast.
+ if(created_volume >= 10) //10 units minimum for lightning, 40 units for secondary blast, 75 units for tertiary blast.
addtimer(CALLBACK(src, PROC_REF(zappy_zappy), holder, T3), added_delay)
- addtimer(CALLBACK(src, PROC_REF(explode), holder, created_volume), added_delay)
+ addtimer(CALLBACK(src, PROC_REF(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))