Merge branch 'master' into upstream-merge-30079

2017-09-06 09:24:23 -05:00
parent 5591afc9ce b2d7ee0e51
commit 24a7aa5a9f
550 changed files with 13328 additions and 156749 deletions
@@ -105,6 +105,10 @@
 /obj/item/nullrod/claymore/darkblade
 	icon_state = "cultblade"
 	item_state = "cultblade"
+	lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
+	inhand_x_dimension = 64
+	inhand_y_dimension = 64
 	name = "dark blade"
 	desc = "Spread the glory of the dark gods!"
 	slot_flags = SLOT_BELT