Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BuffsVulpkanin

This commit is contained in:
Aurorablade
2018-03-01 19:55:48 -05:00
363 changed files with 4514 additions and 1772 deletions
@@ -137,17 +137,6 @@
if(!locate(/obj/effect/decal/cleanable/dirt/blackpowder) in T) //let's not have hundreds of decals of black powder on the same turf
new /obj/effect/decal/cleanable/dirt/blackpowder(T)
/*
/datum/reagent/blackpowder/on_ex_act()
var/location = get_turf(holder.my_atom)
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(2, 1, location)
s.start()
sleep(rand(10,15))
blackpowder_detonate(holder, volume)
holder.remove_reagent("blackpowder", volume)
return */
/datum/reagent/flash_powder
name = "Flash Powder"
id = "flash_powder"