Merge branch 'bleeding-edge-freeze' into viro

This commit is contained in:
comma
2013-07-09 12:49:23 +04:00
117 changed files with 2329 additions and 2264 deletions
@@ -127,7 +127,7 @@
"/obj/item/device/flashlight",
"/obj/item/device/pda",
"/obj/item/device/radio/headset",
"/obj/item/weapon/melee/baton",
"/obj/item/weapon/melee",
"/obj/item/taperoll/police",
"/obj/item/weapon/gun/energy/taser"
)