July 5th TG sync (#1883)

July 5th TG sync
This commit is contained in:
Poojawa
2017-07-05 22:14:19 -05:00
committed by GitHub
parent 454b9c3d68
commit b1b4826c0c
1264 changed files with 149689 additions and 570309 deletions
@@ -886,14 +886,4 @@
/obj/item/weapon/storage/box/fountainpens/PopulateContents()
for(var/i in 1 to 7)
new /obj/item/weapon/pen/fountain(src)
/obj/item/weapon/storage/box/medipens/surival_box
name = "Survival Pen Pack"
desc = "A pack of survival Pens to keep even the most retarded of miners alive"
illustration = "syringe"
/obj/item/weapon/storage/box/medipens/surival_box/PopulateContents()
for(var/i in 1 to 7)
new /obj/item/weapon/reagent_containers/hypospray/medipen/survival(src)
new /obj/item/weapon/pen/fountain(src)