Merge branch 'master' into upstream-merge-34105

This commit is contained in:
deathride58
2018-01-08 20:03:41 +00:00
committed by GitHub
746 changed files with 25211 additions and 18454 deletions
@@ -296,8 +296,8 @@
/obj/item/ammo_casing/shotgun/dart/bioterror
desc = "A shotgun dart filled with deadly toxins."
/obj/item/ammo_casing/shotgun/dart/bioterror/New()
..()
/obj/item/ammo_casing/shotgun/dart/bioterror/Initialize()
. = ..()
reagents.add_reagent("neurotoxin", 6)
reagents.add_reagent("spore", 6)
reagents.add_reagent("mutetoxin", 6) //;HELP OPS IN MAINT