Merge pull request #9884 from Useroth/blackpowder-alternative

Black powder fix. Alternative to #9861
2019-12-06 11:32:17 +13:00
parent 95829f65a3 b91d0e27da
commit b7d0cc6516
2 changed files with 4 additions and 2 deletions
@@ -226,9 +226,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
@@ -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