Merge branch 'backup' into medical

This commit is contained in:
Hubblenaut
2014-06-19 15:36:28 +02:00
3 changed files with 218 additions and 219 deletions
@@ -99,7 +99,6 @@
new /obj/item/clothing/shoes/white(src)
// new /obj/item/weapon/cartridge/medical(src)
new /obj/item/device/radio/headset/headset_med(src)
new /obj/item/weapon/storage/belt/medical(src)
return
@@ -140,7 +139,6 @@
new /obj/item/clothing/gloves/latex(src)
new /obj/item/clothing/shoes/brown (src)
new /obj/item/device/radio/headset/heads/cmo(src)
new /obj/item/weapon/storage/belt/medical(src)
new /obj/item/device/flash(src)
new /obj/item/weapon/reagent_containers/hypospray(src)
return