Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into viro

Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
This commit is contained in:
comma
2013-07-09 23:08:41 +04:00
3 changed files with 76 additions and 68 deletions

View File

@@ -36,6 +36,8 @@
contents = list()
new /obj/item/clothing/suit/bio_suit/virology( src )
new /obj/item/clothing/head/bio_hood/virology( src )
new /obj/item/clothing/mask/breath(src)
new /obj/item/weapon/tank/oxygen(src)
/obj/structure/closet/l3closet/security