Adds an unathi shaman staff to the loadout. (#10137)

With permission from Herpetophilia, this adds an unathi staff to the loadout, sacrilegiously held by a human below. It's available in the religion loadout tab.
This commit is contained in:
TheStryker
2020-10-03 19:11:01 +03:00
committed by GitHub
parent db15949592
commit 5b9ccaf2d8
7 changed files with 36 additions and 1 deletions
+16
View File
@@ -222,6 +222,22 @@
return washit
/obj/item/cane/shaman
name = "shaman staff"
desc = "A seven foot staff traditionally carried by Unathi shamans both as a symbol of authority and to aid them in walking. It is made out of dark, polished wood and is curved at the end."
icon_state = "shaman_staff"
item_state = "shaman_staff"
w_class = ITEMSIZE_LARGE
/obj/item/cane/shaman/afterattack(atom/A, mob/user as mob, proximity)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if(!proximity)
return
if (istype(A, /turf/simulated/floor))
user.visible_message("<span class='notice'>[user] loudly taps their [src.name] against the floor.</span>")
playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1)
return
/obj/item/cane/concealed
var/concealed_blade
@@ -13,7 +13,17 @@
throwforce = 10
w_class = ITEMSIZE_SMALL
var/cooldown = 0 // floor tap cooldown
var/static/list/nullchoices = list("Null Rod" = /obj/item/nullrod/, "Null Staff" = /obj/item/nullrod/staff, "Null Orb" = /obj/item/nullrod/orb, "Null Athame" = /obj/item/nullrod/athame)
var/static/list/nullchoices = list("Null Rod" = /obj/item/nullrod/, "Null Staff" = /obj/item/nullrod/staff, "Null Orb" = /obj/item/nullrod/orb, "Null Athame" = /obj/item/nullrod/athame, "Tribunal Rod" = /obj/item/nullrod/dominia)
/obj/item/nullrod/dominia
name = "tribunalist purification rod"
desc = "A holy Symbol often carried by female Tribunalist clergy, the obsidian encased in the wooden handle is intended to ward off malevolent spirits and bless followers of the Goddess. The ornament on top depicts 'The Eye'\
Moroz Holy Tribunal."
desc_fluff = "With origins in House Zhao, Tribunalist purification rods are a common sight throughout the Empire of Dominia. Intended to ward off malevolent entities and bless the \
faithful a Tribunalist priestess is nothing without her rod, which is typically granted upon promotion to full priestess. This particular example has been built around an obsidian \
core in the shaft, and is heavier than it seems."
icon_state = "tribunalrod"
item_state = "tribunalrod"
/obj/item/nullrod/staff
name = "null staff"
@@ -64,3 +64,7 @@
/datum/gear/religion/dominia/accessory
display_name = "tribunal necklace"
path = "/obj/item/clothing/accessory/dominia"
/datum/gear/religion/shaman_staff
display_name = "shaman staff"
path = /obj/item/cane/shaman
+5
View File
@@ -0,0 +1,5 @@
author: The Stryker
delete-after: True
changes:
- rscadd: "Adds a wooden shaman staff for unathi based on Herpetophilia's custom item."
- rscadd: "Adds a Dominian Tribunalist rod as an alternate skin for the null rod. Description done by Schwann."
Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 43 KiB