cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-12 08:36:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes gunpowder and teslium explosion scaling. [MDB IGNORE] (#11549)

Browse Source 
* 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 <TemporalOroboros@gmail.com>
This commit is contained in:
SkyratBot
2022-02-17 02:04:54 +01:00
committed by GitHub
parent e1eedc66a3
commit 2cbcebfc76
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+2 -2
View File
@@ -156,7 +156,7 @@
mix_message = "<span class='boldannounce'>Sparks start flying around the gunpowder!</span>"
/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))