Merge pull request #406 from SamCroswell/master

ERT Rework
This commit is contained in:
ZomgPonies
2015-02-25 11:43:07 -05:00
12 changed files with 338 additions and 141 deletions
@@ -1711,6 +1711,12 @@ datum
..()
return
nanites
name = "Nanites"
id = "nanities"
description = "Nanomachines that aid in rapid cellular regeneration."
synaptizine
name = "Synaptizine"
id = "synaptizine"
@@ -68,6 +68,14 @@
..()
reagents.add_reagent("synaptizine", 30)
/obj/item/weapon/reagent_containers/hypospray/combat/nanites
name = "combat stimulant injector"
desc = "A modified air-needle autoinjector filled with expensive regeneration nanites."
volume = 100
/obj/item/weapon/reagent_containers/hypospray/combat/New()
..()
reagents.add_reagent("nanites", 70)
/obj/item/weapon/reagent_containers/hypospray/autoinjector
name = "emergency autoinjector"