Merge pull request #2690 from Citadel-Station-13/upstream-merge-30553

[MIRROR] Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume!
This commit is contained in:
LetterJay
2017-09-12 01:22:11 -05:00
committed by GitHub
10 changed files with 43 additions and 2 deletions

View File

@@ -405,3 +405,14 @@
attack_verb = list("poked", "impaled", "pierced", "jabbed")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = IS_SHARP
/obj/item/nullrod/egyptian
name = "egyptian staff"
desc = "A tutorial in mummification is carved into the staff. You could probably follow the steps yourself if you had some bandages."
icon = 'icons/obj/guns/magic.dmi'
icon_state = "pharoah_sceptre"
item_state = "pharoah_sceptre"
lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("bashes", "smacks", "whacks")