Merge pull request #608 from Fox-McCloud/Temporary-Fires

New Feature: Temporary Fires, Napalm Rework, and Dragon's Breath Round Fix
This commit is contained in:
Mark van Alphen
2015-03-23 15:38:28 +01:00
4 changed files with 20 additions and 20 deletions
@@ -404,14 +404,14 @@
New()
..()
var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
var/obj/item/weapon/reagent_containers/glass/beaker/large/B1 = new(src)
var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src)
B1.reagents.add_reagent("aluminum", 25)
B1.reagents.add_reagent("incendiaryfuel",25)
B2.reagents.add_reagent("plasma", 25)
B2.reagents.add_reagent("sacid", 25)
B1.reagents.add_reagent("aluminum", 15)
B1.reagents.add_reagent("fuel",20)
B2.reagents.add_reagent("plasma", 15)
B2.reagents.add_reagent("sacid", 15)
B1.reagents.add_reagent("incendiaryfuel",20)
beakers += B1
beakers += B2