cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-21 12:56:10 +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 22:31:04 +13:00
committed by GitHub
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/modules/client/preference_setup/loadout/items/religion.dm
-5
View File
@@ -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
code/modules/client/preference_setup/loadout/items/xeno/unathi.dm
+23 -9
View File
@@ -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)