Merge pull request #7885 from Baystation12/master

Updating dev-freeze from master.
This commit is contained in:
Zuhayr
2015-01-20 18:49:03 +10:30
5 changed files with 13 additions and 32 deletions
@@ -61,6 +61,8 @@
playsound(M.loc,'sound/items/eatfood.ogg', rand(10,40), 1)
overlays.Cut()
return
else
..()
/obj/item/weapon/kitchen/utensil/fork
name = "fork"