cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 04:22:39 +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/game/objects/items/weapons/chaplain_items.dm
+73 -9
View File
@@ -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)