diff --git a/code/__DEFINES/background.dm b/code/__DEFINES/background.dm
index 7a1c716f47d..bde41d93726 100644
--- a/code/__DEFINES/background.dm
+++ b/code/__DEFINES/background.dm
@@ -220,3 +220,5 @@
 #define CITIZENSHIPS_ADHOMAI list(CITIZENSHIP_PRA, CITIZENSHIP_DPRA, CITIZENSHIP_NKA)
 
 #define CITIZENSHIPS_DOMINIA list(CITIZENSHIP_DOMINIA, CITIZENSHIP_COALITION, CITIZENSHIP_BIESEL)
+
+#define RELIGIONS_UNATHI list(RELIGION_THAKH, RELIGION_AUTAKH, RELIGION_SKAKH, RELIGION_SIAKH)
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index d54242a6b9f..ea6b436ebd5 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -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
 
diff --git a/code/game/objects/items/weapons/chaplain_items.dm b/code/game/objects/items/weapons/chaplain_items.dm
index fafb7139d28..965d11aa7a8 100644
--- a/code/game/objects/items/weapons/chaplain_items.dm
+++ b/code/game/objects/items/weapons/chaplain_items.dm
@@ -18,8 +18,12 @@
 	w_class = ITEMSIZE_SMALL
 	var/can_change_form = TRUE // For holodeck check.
 	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, "Tribunal Rod" = /obj/item/nullrod/dominia, "Tajaran charm" = /obj/item/nullrod/charm,
-									"Mata'ke Sword" = /obj/item/nullrod/matake, "Rredouane Sword" = /obj/item/nullrod/rredouane, "Shumaila Hammer" = /obj/item/nullrod/shumaila, "Zhukamir Ladle" = /obj/item/nullrod/zhukamir, "Azubarre Torch" = /obj/item/nullrod/azubarre)
+	var/list/null_choices = list( //Generic nullrods only here, religion-specific ones should be on the religion datum
+		"Null Rod" = /obj/item/nullrod,
+		"Null Staff" = /obj/item/nullrod/staff,
+		"Null Orb" = /obj/item/nullrod/orb,
+		"Null Athame" = /obj/item/nullrod/athame,
+	)
 
 /obj/item/nullrod/obsidianshards
 	name = "obsidian shards"
@@ -145,32 +149,92 @@
 /obj/item/nullrod/azubarre/isFlameSource()
 	return lit
 
-/obj/item/nullrod/verb/change(mob/user)
+/obj/item/nullrod/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 = 'icons/obj/unathi_items.dmi'
+	icon_state = "shaman_staff"
+	item_state = "shaman_staff"
+	contained_sprite = TRUE
+	w_class = ITEMSIZE_LARGE
+	slot_flags = null
+
+/obj/item/nullrod/skakh_warrior
+	name = "\improper Sk'akh sword"
+	desc = "A silver-bladed ceremonial sword, made in the image of the Warrior Mukari's holy weapon. These blades are often carried by Sk'akh Priests of the Warrior in representation of His strength, though they are of little use in practical combat."
+	icon = 'icons/obj/unathi_items.dmi'
+	icon_state = "skakh_sword"
+	item_state = "skakh_sword"
+	slot_flags = SLOT_BACK|SLOT_BELT
+	contained_sprite = TRUE
+	w_class = ITEMSIZE_LARGE
+
+/obj/item/nullrod/skakh_healer
+	name = "\improper Sk'akh staff"
+	desc = "A long staff topped with a green gemstone set in silver, made in the image of the Healer Simi's holy item. These staves are often carried by Sk'akh Priestesses of the Healer, in representation of Her wisdom."
+	icon = 'icons/obj/unathi_items.dmi'
+	icon_state = "skakh_staff"
+	item_state = "skakh_staff"
+	contained_sprite = TRUE
+	w_class = ITEMSIZE_LARGE
+	slot_flags = null
+
+/obj/item/nullrod/skakh_fisher
+	name = "\improper Sk'akh sickle"
+	desc = "A silver-bladed ceremonial sickle, made in the image of the Fisher Verrix's holy item. These sickles are often carried by Sk'akh Priests of the Fisher, in representation of Their benevolence."
+	icon = 'icons/obj/unathi_items.dmi'
+	icon_state = "skakh_sickle"
+	item_state = "skakh_sickle"
+	contained_sprite = TRUE
+
+/obj/item/nullrod/autakh //not included in the list as it's meant to be an augment
+	name = "blessed cybernetic claw"
+	desc = "A prosthetic limb etched in Sinta'Mador runes and inlayed with obsidian."
+	icon = 'icons/obj/organs/augments.dmi'
+	icon_state = "anchor"
+	item_state = "anchor" //won't appear in-hand and looks suitably aut'akh spiritual
+	can_change_form = FALSE //this is integrated so we dont want anything silly with it
+
+/obj/item/nullrod/autakh/throw_at()
+	usr.drop_from_inventory(src)
+
+/obj/item/nullrod/autakh/dropped()
+	. = ..()
+	loc = null
+	qdel(src)
+
+/obj/item/nullrod/verb/change(mob/living/user)
 	set name = "Reassemble Null Item"
 	set category = "Object"
 	set src in usr
 
-	// Holodeck Check
+	// Holodeck/Augment Check
 	if(!can_change_form)
-		to_chat(user, SPAN_NOTICE("You can't change a holographic item's form..."))
+		to_chat(user, SPAN_NOTICE("You can't change this item's form!"))
 		return
 
 	if(use_check_and_message(user, USE_FORCE_SRC_IN_USER))
 		return
 
-	var/picked = tgui_input_list(user, "What form would you like your obsidian relic to take?", "Reassembling your obsidian relic", nullchoices)
+	var/mob/living/carbon/human/H = user
+	if(istype(H))
+		var/datum/religion/R = SSrecords.religions[H.religion]
+		if(R.nulloptions)
+			null_choices.Add(R.nulloptions)
+
+	var/picked = tgui_input_list(user, "What form would you like your obsidian relic to take?", "Reassembling your obsidian relic", null_choices)
 
 	if(use_check_and_message(user, USE_FORCE_SRC_IN_USER))
 		return
-	if(!ispath(nullchoices[picked]))
+	if(!ispath(null_choices[picked]))
 		return
 
 	to_chat(user, SPAN_NOTICE("You start reassembling your obsidian relic."))
 	if(!do_after(user, 2 SECONDS))
 		return
 
-	var/obj/item/nullrod/chosenitem = nullchoices[picked]
-	new chosenitem(get_turf(user))
+	var/nullrodpath = null_choices[picked]
+	var/obj/item/nullrod/chosenitem = new nullrodpath(get_turf(user))
 	qdel(src)
 	user.put_in_hands(chosenitem)
 
diff --git a/code/modules/background/religion/human.dm b/code/modules/background/religion/human.dm
index 1b6d9ef19bb..4c3a49a310c 100644
--- a/code/modules/background/religion/human.dm
+++ b/code/modules/background/religion/human.dm
@@ -49,6 +49,7 @@
 	Tribunal priests agree that all three are equally important, and that malign spirits can be attracted by an imbalance in the Great Three. Priests often stress the importance \
 	of balance, both in matters of spirit, in society, and in personal life."
 	book_name = "tribunal codex"
+	nulloptions = list("Tribunal Rod" = /obj/item/nullrod/dominia)
 
 /datum/religion/trinary
 	name = RELIGION_TRINARY
diff --git a/code/modules/background/religion/religion.dm b/code/modules/background/religion/religion.dm
index ab3cfb98b70..d2ca4d9967d 100644
--- a/code/modules/background/religion/religion.dm
+++ b/code/modules/background/religion/religion.dm
@@ -3,6 +3,7 @@
 	var/description
 	var/book_name = "bible"
 	var/book_sprite = "holybook"
+	var/list/nulloptions //religion-specific nullrod options
 
 /datum/religion/proc/get_records_name()
 	return name
diff --git a/code/modules/background/religion/tajara.dm b/code/modules/background/religion/tajara.dm
index 1f8454322b4..a3996758d54 100644
--- a/code/modules/background/religion/tajara.dm
+++ b/code/modules/background/religion/tajara.dm
@@ -5,6 +5,9 @@
 	eventually transforming into what it is today. The religion holds onto very traditional values, promoting collectivism, sharing, helping those in need."
 	book_name = "holy scrolls"
 	book_sprite = "holylight"
+	nulloptions = list(
+		"Tajaran charm" = /obj/item/nullrod/charm
+	)
 
 /datum/religion/matake
 	name = RELIGION_MATAKE
@@ -14,6 +17,14 @@
 	understanding and kindness. He is upheld to be the ultimate Tajara- powerful, wise, and magnanimous. Followers of Mata'ke himself endeavor to emulate his grandeur, while others \
 	attempt to emulate the other gods."
 	book_name = "ma'ta'ke legends"
+	nulloptions = list(
+		"Tajaran charm" = /obj/item/nullrod/charm,
+		"Mata'ke Sword" = /obj/item/nullrod/matake,
+		"Rredouane Sword" = /obj/item/nullrod/rredouane,
+		"Shumaila Hammer" = /obj/item/nullrod/shumaila,
+		"Zhukamir Ladle" = /obj/item/nullrod/zhukamir,
+		"Azubarre Torch" = /obj/item/nullrod/azubarre
+	)
 
 /datum/religion/raskara
 	name = RELIGION_RASKARA
@@ -21,6 +32,9 @@
 	members have been recorded. While Raskara may seem like a single deity it is in fact split into three aspects, each one leading down a different path and seemingly every path \
 	subverting something S'rendarr and Messa stands for."
 	book_name = "ma'ta'ke legends"
+	nulloptions = list(
+		"Tajaran charm" = /obj/item/nullrod/charm
+	)
 
 /datum/religion/raskara/get_records_name()
 	return RELIGION_MATAKE
diff --git a/code/modules/background/religion/unathi.dm b/code/modules/background/religion/unathi.dm
index 25bcb343d6d..6966f420862 100644
--- a/code/modules/background/religion/unathi.dm
+++ b/code/modules/background/religion/unathi.dm
@@ -4,6 +4,9 @@
 	in tandem with the material world. These spirits exist in objects and nature - bringing either good luck or sorrow. The supernatural and afterlife are taken at face value by Th'akh. \
 	It is a very decentralized religion, with the Akhandi Order of monks being the closet thing it has to a church."
 	book_name = "assorted Th'akh fables"
+	nulloptions = list(
+		"Shaman Staff" = /obj/item/nullrod/shaman
+	)
 
 /datum/religion/skakh
 	name = RELIGION_SKAKH
@@ -14,6 +17,12 @@
 	important aspects of Unathi society. It is said that all three are equally important, and that disasters are caused by an imbalance in the Great Three. Priests often stress the \
 	importance of balance, both in matters of spirit as well as in society and personal life. "
 	book_name = "Sk'akh legends"
+	nulloptions = list(
+		"Shaman Staff" = /obj/item/nullrod/shaman,
+		"Warrior's Sword" = /obj/item/nullrod/skakh_warrior,
+		"Healer's Staff" = /obj/item/nullrod/skakh_healer,
+		"Fisher's Sickle" = /obj/item/nullrod/skakh_fisher
+	)
 
 /datum/religion/siakh
 	name = RELIGION_SIAKH
@@ -24,6 +33,9 @@
 	church due to Si'akh claiming it to be completely illegitimate. Its followers are ruthlessly hunted down by the Maraziite Order and many of its followers are fleeing into human \
 	space as they try to find personal salvation. It is treated as a Sk'akh heresy or a fanatical doomsday cult by orthodox Unathi. "
 	book_name = "transcripts from Si'akh"
+	nulloptions = list(
+		"Shaman Staff" = /obj/item/nullrod/shaman
+	)
 
 /datum/religion/autakh
 	name = RELIGION_AUTAKH
@@ -35,3 +47,6 @@
 	anger, or other emotional vices. Aut'akh preach that the Contact War was the result of sinta being so misled by evil spirits that they brought the world to ruin, and all power, whether a government, \
 	religion, or corporation, is inherently corrupt due to the influence of evil spirits."
 	book_name = "Rituals and Regiments of the Ancient Mador"
+	nulloptions = list(
+		"Shaman Staff" = /obj/item/nullrod/shaman
+	)
diff --git a/code/modules/client/preference_setup/loadout/items/religion.dm b/code/modules/client/preference_setup/loadout/items/religion.dm
index 5c9bec30f8d..01e1128b9f1 100644
--- a/code/modules/client/preference_setup/loadout/items/religion.dm
+++ b/code/modules/client/preference_setup/loadout/items/religion.dm
@@ -3,11 +3,6 @@
 	sort_category = "Religion"
 	flags = GEAR_HAS_DESC_SELECTION
 
-/datum/gear/religion/shaman_staff
-	display_name = "shaman staff"
-	path = /obj/item/cane/shaman
-	slot = slot_l_hand
-
 /datum/gear/religion/trinary
 	abstract_type = /datum/gear/religion/trinary
 
diff --git a/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm b/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm
index 613266fa929..4caff3ee4ff 100644
--- a/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm
+++ b/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm
@@ -369,12 +369,12 @@
 	augs["eye flashlight"] = /obj/item/organ/internal/augment/eye_flashlight
 	gear_tweaks += new /datum/gear_tweak/path(augs)
 
-/datum/gear/religion/shaman_staff
-	display_name = "shaman staff"
-	path = /obj/item/cane/shaman
-	sort_category = "Xenowear - Unathi"
-	origin_restriction = list(/singleton/origin_item/origin/heartland_upper, /singleton/origin_item/origin/trad_nobles, /singleton/origin_item/origin/tza_upper, /singleton/origin_item/origin/southlands_upper, /singleton/origin_item/origin/zazalai_upper, /singleton/origin_item/origin/broken_nobles, /singleton/origin_item/origin/torn_cities, /singleton/origin_item/origin/ouerea)
-	whitelisted = list(SPECIES_UNATHI)
+/datum/gear/augment/autakh/nullrod
+	display_name = "blessed prosthesis"
+	description = "A prosthetic limb, blessed with sacred Aut'akh rituals and ancient Mador runes. This augment can act as a chaplain's nullrod."
+	path = /obj/item/organ/external/hand/right/autakh/tool/nullrod
+	allowed_roles = list("Chaplain")
+	cost = 2
 
 /datum/gear/suit/maxtlatl
 	display_name = "Thakhist maxtlatl"
@@ -382,7 +382,6 @@
 	cost = 1
 	whitelisted = list(SPECIES_UNATHI)
 	allowed_roles = list("Chaplain")
-	origin_restriction = list(/singleton/origin_item/origin/heartland_upper, /singleton/origin_item/origin/trad_nobles, /singleton/origin_item/origin/tza_upper, /singleton/origin_item/origin/southlands_upper, /singleton/origin_item/origin/zazalai_upper, /singleton/origin_item/origin/broken_nobles, /singleton/origin_item/origin/torn_cities, /singleton/origin_item/origin/ouerea)
 	sort_category = "Xenowear - Unathi"
 	flags = GEAR_HAS_DESC_SELECTION
 
@@ -390,7 +389,6 @@
 	display_name = "Thakhist wristguards"
 	path = /obj/item/clothing/wrists/unathi/maxtlatl
 	whitelisted = list(SPECIES_UNATHI)
-	origin_restriction = list(/singleton/origin_item/origin/heartland_upper, /singleton/origin_item/origin/trad_nobles, /singleton/origin_item/origin/tza_upper, /singleton/origin_item/origin/southlands_upper, /singleton/origin_item/origin/zazalai_upper, /singleton/origin_item/origin/broken_nobles, /singleton/origin_item/origin/torn_cities, /singleton/origin_item/origin/ouerea)
 	allowed_roles = list("Chaplain")
 	sort_category = "Xenowear - Unathi"
 	flags = GEAR_HAS_DESC_SELECTION
@@ -399,7 +397,6 @@
 	display_name = "Thakhist headgear"
 	path = /obj/item/clothing/head/unathi/maxtlatl
 	whitelisted = list(SPECIES_UNATHI)
-	origin_restriction = list(/singleton/origin_item/origin/heartland_upper, /singleton/origin_item/origin/trad_nobles, /singleton/origin_item/origin/tza_upper, /singleton/origin_item/origin/southlands_upper, /singleton/origin_item/origin/zazalai_upper, /singleton/origin_item/origin/broken_nobles, /singleton/origin_item/origin/torn_cities, /singleton/origin_item/origin/ouerea)
 	allowed_roles = list("Chaplain")
 	sort_category = "Xenowear - Unathi"
 	flags = GEAR_HAS_DESC_SELECTION
@@ -460,3 +457,20 @@
 	cards["hegemony passcard"] = /obj/item/clothing/accessory/badge/passcard/hegemony
 	cards["ouerea passcard"] = /obj/item/clothing/accessory/badge/passcard/ouerea
 	gear_tweaks += new /datum/gear_tweak/path(cards)
+
+/datum/gear/uniform/skakh
+	display_name = "sk'akh robes selection"
+	path = /obj/item/clothing/under/unathi/skakh
+	cost = 1
+	whitelisted = list(SPECIES_UNATHI)
+	sort_category = "Xenowear - Unathi"
+	allowed_roles = list("Chaplain")
+
+/datum/gear/uniform/skakh/New()
+	..()
+	var/list/skakh = list()
+	skakh["Sk'akh priest's robes"] = /obj/item/clothing/under/unathi/skakh
+	skakh["Sk'akh fisher's robes"] = /obj/item/clothing/under/unathi/skakh/fisher
+	skakh["Sk'akh healer's robes"] = /obj/item/clothing/under/unathi/skakh/healer
+	skakh["Sk'akh warrior's robes"] = /obj/item/clothing/under/unathi/skakh/warrior
+	gear_tweaks += new /datum/gear_tweak/path(skakh)
diff --git a/code/modules/clothing/under/xenos/unathi.dm b/code/modules/clothing/under/xenos/unathi.dm
index 475357f2cf6..170b4667c7a 100644
--- a/code/modules/clothing/under/xenos/unathi.dm
+++ b/code/modules/clothing/under/xenos/unathi.dm
@@ -111,3 +111,27 @@
 	desc = "A lightweight red jumpsuit with a brown-orange vest, this uniform is an odd fusion of modern design and traditional Unathi aesthetics. Its golden ornamentation indicates it as belonging to an officer of the Izweski Hegemony's Navy."
 	icon_state = "izweski_officer"
 	item_state = "izweski_officer"
+
+/obj/item/clothing/under/unathi/skakh
+	name = "\improper Sk'akh priest robes"
+	desc = "A simple brown robe with gilded ornamentation, the standard garment for the clergy of the Sk'akh Church. The ornamentation this one bears identifies its wearer as holding the rank of an ordained priest within the Church hierarchy."
+	icon_state = "skakh"
+	item_state = "skakh"
+
+/obj/item/clothing/under/unathi/skakh/fisher
+	name = "\improper Sk'akh fisher robes"
+	desc = "A simple brown and orange robe with gilded ornamentation, identifying its wearer as a member of the Sk'akh Church's clergy. The ornamentation and colors of this one identify its wearer as an Aspect Priest of the Fisher."
+	icon_state = "skakh-fisher"
+	item_state = "skakh-fisher"
+
+/obj/item/clothing/under/unathi/skakh/healer
+	name = "\improper Sk'akh healer robes"
+	desc = "A simple brown and green robe with gilded ornamentation, identifying its wearer as a member of the Sk'akh Church's clergy. The ornamentation and colors of this one identify its wearer as an Aspect Priest of the Healer."
+	icon_state = "skakh-healer"
+	item_state = "skakh-healer"
+
+/obj/item/clothing/under/unathi/skakh/warrior
+	name = "\improper Sk'akh warrior robes"
+	desc = "A simple brown and red robe with gilded ornamentation, identifying its wearer as a member of the Sk'akh Church's clergy. The ornamentation and colors of this one identify its wearer as an Aspect Priest of the Warrior."
+	icon_state = "skakh-warrior"
+	item_state = "skakh-warrior"
diff --git a/code/modules/organs/subtypes/autakh.dm b/code/modules/organs/subtypes/autakh.dm
index 5c320ce2480..bb6ff34053c 100644
--- a/code/modules/organs/subtypes/autakh.dm
+++ b/code/modules/organs/subtypes/autakh.dm
@@ -320,7 +320,7 @@
 	action_button_name = "Deploy Mounted Drill"
 	augment_type = /obj/item/pickaxe/drill/integrated
 
-/obj/item/organ/external/hand/right/autakh/mining/refresh_action_button()
+/obj/item/organ/external/hand/right/autakh/tool/mining/refresh_action_button()
 	. = ..()
 	if(.)
 		action.button_icon_state = "drill"
@@ -437,3 +437,15 @@
 
 			owner.visible_message("<span class='danger'>[H] has been prodded with [src] by [owner]!</span>")
 			playsound(get_turf(owner), 'sound/weapons/Egloves.ogg', 50, 1, -1)
+
+/obj/item/organ/external/hand/right/autakh/tool/nullrod
+	name = "blessed prosthesis"
+	action_button_name = "Deploy Blessed Prosthesis"
+	augment_type = /obj/item/nullrod/autakh
+
+/obj/item/organ/external/hand/right/autakh/tool/nullrod/refresh_action_button()
+	. = ..()
+	if(.)
+		action.button_icon_state = "anchor"
+		if(action.button)
+			action.button.update_icon()
diff --git a/html/changelogs/RustingWithYou - praisethethreefold.yml b/html/changelogs/RustingWithYou - praisethethreefold.yml
new file mode 100644
index 00000000000..1601d9214df
--- /dev/null
+++ b/html/changelogs/RustingWithYou - praisethethreefold.yml	
@@ -0,0 +1,44 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: RustingWithYou
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Adds several Sk'akh robes and religious items."
+  - rscadd: "Adds an Aut'akh nullrod augment for chaplains."
+  - tweak: "Nullrod selections can now be restricted by religion."
+  - tweak: "The Unathi shaman staff is now a nullrod."
diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi
index 4ac4c8be9d2..c7948810947 100644
Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ
diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi
index 955b348b246..2724f70e791 100644
Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ
diff --git a/icons/obj/action_buttons/organs.dmi b/icons/obj/action_buttons/organs.dmi
index 6dbb230359a..6927d1c3e93 100644
Binary files a/icons/obj/action_buttons/organs.dmi and b/icons/obj/action_buttons/organs.dmi differ
diff --git a/icons/obj/unathi_items.dmi b/icons/obj/unathi_items.dmi
index d21aeec5530..b8c2134e963 100644
Binary files a/icons/obj/unathi_items.dmi and b/icons/obj/unathi_items.dmi differ
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index f786d31b2e6..c1aec07368e 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ
diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm
index 87cffee8252..766a22766fa 100644
--- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm
+++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm
@@ -1413,7 +1413,7 @@
 "jz" = (
 /obj/structure/closet/cabinet,
 /obj/item/clothing/under/unathi/izharshan,
-/obj/item/cane/shaman,
+/obj/item/nullrod/shaman,
 /obj/item/storage/box/fancy/matches,
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm
index 3716c373497..cae875d8075 100644
--- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm
+++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm
@@ -79,6 +79,7 @@
 	l_ear = /obj/item/device/radio/headset/ship
 
 	backpack_contents = list(
+		/obj/item/storage/box/survival = 1,
 		/obj/item/storage/box/donkpockets = 1
 	)
 
@@ -123,6 +124,12 @@
 
 /obj/outfit/admin/izweski/priest
 	name = "Hegemony Warpriest"
-	uniform = /obj/item/clothing/under/unathi/izweski
+	uniform = /obj/item/clothing/under/unathi/skakh/warrior
+	backpack_contents = list(
+		/obj/item/storage/box/survival = 1,
+		/obj/item/storage/box/donkpockets = 1,
+		/obj/item/device/versebook/skakh = 1
+	)
+
 
 /obj/outfit/admin/izweski/priest/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)