Merge pull request #14107 from LanCartwright/newvirogrenades

Viro-terror grenade renovation
This commit is contained in:
tkdrg
2015-12-31 00:04:38 -03:00
8 changed files with 158 additions and 1 deletions

View File

@@ -441,6 +441,25 @@
beakers += B1
beakers += B2
/obj/item/weapon/grenade/chem_grenade/tuberculosis
name = "Fungal tuberculosis grenade"
desc = "WARNING: GRENADE WILL RELEASE DEADLY SPORES CONTAINING ACTIVE AGENTS. SEAL SUIT AND AIRFLOW BEFORE USE."
stage = READY
/obj/item/weapon/grenade/chem_grenade/tuberculosis/New()
..()
var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B1 = new(src)
var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B2 = new(src)
B1.reagents.add_reagent("potassium", 50)
B1.reagents.add_reagent("phosphorus", 50)
B1.reagents.add_reagent("fungalspores", 200)
B2.reagents.add_reagent("blood", 250)
B2.reagents.add_reagent("sugar", 50)
beakers += B1
beakers += B2
#undef EMPTY
#undef WIRED
#undef READY

View File

@@ -240,3 +240,32 @@
new /obj/item/weapon/screwdriver/nuke(src)
new /obj/item/nuke_core_container(src)
new /obj/item/weapon/paper/nuke_instructions(src)
/obj/item/weapon/storage/box/syndie_kit/tuberculosisgrenade
name = "boxed virus grenade kit"
/obj/item/weapon/storage/box/virus_kit/tuberculosisgrenade/New()
..()
new /obj/item/weapon/grenade/chem_grenade/tuberculosis
new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure
new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure
new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure
new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure
new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure
new /obj/item/weapon/reagent_containers/syringe
new /obj/item/weapon/reagent_containers/glass/bottle/tuberculosiscure
return
/obj/item/weapon/storage/box/syndie_kit/tuberculosiskit
name = "boxed virus kit"
/obj/item/weapon/storage/box/virus_kit/tuberculosiskit/New()
..()
new /obj/item/weapon/reagent_containers/glass/bottle/tuberculosis
new /obj/item/weapon/reagent_containers/hypospray/medipen/tuberculosiscure
new /obj/item/weapon/reagent_containers/syringe
new /obj/item/weapon/reagent_containers/glass/bottle/tuberculosiscure
return