Merge branch 'master' into upstream-merge-30176

2017-09-06 17:43:07 -05:00
parent 9265694418 bbab9d8d5a
commit 2f3f56352c
675 changed files with 20253 additions and 158942 deletions
@@ -8,6 +8,8 @@
 	name = "\improper Codex Gigas"
 	desc = "A book documenting the nature of devils."
 	icon_state ="demonomicon"
+	lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi'
 	throw_speed = 1
 	throw_range = 10
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF