Skip to content

Commit

Permalink
initial (#10131)
Browse files Browse the repository at this point in the history
  • Loading branch information
Tsar-Salat authored Nov 11, 2023
1 parent 838f81b commit 3952c58
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions code/modules/reagents/chemistry/recipes/pyrotechnics.dm
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@
required_temp = 474
strengthdiv = 6
modifier = 1
mix_message = "<span class='boldannounce'>Sparks start flying around the black powder!</span>"
mix_message = "<span class='boldnotice'>Sparks start flying around the black powder!</span>"

/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"
Expand Down Expand Up @@ -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
Expand All @@ -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))
Expand Down

0 comments on commit 3952c58

Please sign in to comment.