cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-27 06:54:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unathi Religious Items & Nullrod Tweaks (#18572)

Browse Source 
* sk'akh robes and shaman staff

* nullrod religion restrictions

* ye

* prevents atheists waving a tajaran charm around

* the purity of the blessed machine

* changelog

* Update code/game/objects/items/weapons/chaplain_items.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com>

* Update code/game/objects/items/weapons/chaplain_items.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com>

* Update code/modules/clothing/under/xenos/unathi.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com>

* nullrods on religion datum & icon fix

* underscore

---------

Signed-off-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
This commit is contained in:
RustingWithYou
2024-03-11 09:31:04 +00:00
committed by GitHub
co-authored by SleepyGemmy
parent 5b17c8433b
commit ac435b98e2
19 changed files with 219 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/weapon.dm
-16
View File
@@ -223,22 +223,6 @@
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