Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor

Conflicts:
	code/_onclick/click.dm
	code/game/atoms.dm
	code/game/objects/items/toys.dm
	code/modules/paperwork/folders.dm
	code/modules/power/cable.dm
This commit is contained in:
MrPerson
2014-06-09 01:50:44 -07:00
333 changed files with 7786 additions and 17320 deletions
@@ -53,7 +53,7 @@
update_icon()
default_change_direction_wrench(mob/user, /obj/item/weapon/wrench/W)
default_change_direction_wrench(mob/user, obj/item/weapon/wrench/W)
if(..())
initialize_directions = dir
if(node)