From b91d0e27da4c6fcc2f46bf71da28b16d89777158 Mon Sep 17 00:00:00 2001 From: Useroth Date: Wed, 20 Nov 2019 15:49:04 +0100 Subject: [PATCH] An alternative solution to the problems with blackpowder. --- code/modules/hydroponics/grown/misc.dm | 5 ++++- code/modules/reagents/chemistry/recipes/pyrotechnics.dm | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm index 0902052a11..1d5d1f7220 100644 --- a/code/modules/hydroponics/grown/misc.dm +++ b/code/modules/hydroponics/grown/misc.dm @@ -156,9 +156,12 @@ /obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/prime() icon_state = "cherry_bomb_lit" playsound(src, 'sound/effects/fuse.ogg', seed.potency, 0) + addtimer(CALLBACK(src, /obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/detonate), rand(50, 100)) + +/obj/item/reagent_containers/food/snacks/grown/cherry_bomb/proc/detonate() reagents.chem_temp = 1000 //Sets off the black powder reagents.handle_reactions() - + // Lavaland cactus /obj/item/seeds/lavaland/cactus diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index b29a1c6809..ad1efc1da7 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -99,7 +99,6 @@ /datum/chemical_reaction/reagent_explosion/blackpowder_explosion/on_reaction(datum/reagents/holder, created_volume) var/turf/T = get_turf(holder.my_atom) - sleep(rand(50,100)) ..(holder, created_volume, T) /datum/chemical_reaction/thermite