Merge git://github.com/tgstation/-tg-station into critter_crates

Conflicts:
	icons/obj/storage.dmi
This commit is contained in:
VistaPOWA
2013-09-02 13:18:15 +02:00
73 changed files with 1856 additions and 933 deletions
@@ -47,4 +47,5 @@
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/suit/armor/reactive(src)
new /obj/item/device/flash(src)
new /obj/item/device/laser_pointer(src)
return