Merge branch 'master' into dev

This commit is contained in:
Mloc-Argent
2013-11-04 10:46:13 +00:00
29 changed files with 11595 additions and 11501 deletions

View File

@@ -118,7 +118,7 @@
if(istype(W,/obj/item/weapon/storage))
..() // -> item/attackby()
if((slices_num <= 0 || !slices_num) || !slice_path)
return 1
return 0
var/inaccurate = 0
if( \
istype(W, /obj/item/weapon/kitchenknife) || \