Tajara loadout expansion: far from home edition (Aurorastation#17270)

* A lot of tajaran stuff * Changelog * moved this for better organization * god fix * Update code/modules/clothing/rings/xeno/tajara.dm Co-authored-by: Cody Brittain <[email protected]> * Update code/modules/clothing/under/accessories/xeno/tajara.dm Co-authored-by: Cody Brittain <[email protected]> * Update code/modules/clothing/under/accessories/xeno/tajara.dm Co-authored-by: Cody Brittain <[email protected]> * Update code/modules/clothing/under/accessories/xeno/tajara.dm Co-authored-by: Cody Brittain <[email protected]> * Update code/modules/clothing/under/accessories/xeno/tajara.dm Co-authored-by: Cody Brittain <[email protected]> * Update code/modules/clothing/under/accessories/xeno/tajara.dm Co-authored-by: Cody Brittain <[email protected]> * Flame source * imrpoper * passport * matt fixes * Fixes conflict * fixes * kitchen --------- Co-authored-by: Cody Brittain <[email protected]>
NonQueueingMatt · Sep 21, 2023 · 57ad320 · 57ad320
1 parent cb632eb
commit 57ad320
Show file tree

Hide file tree

Showing 16 changed files with 512 additions and 12 deletions.
diff --git a/aurorastation.dme b/aurorastation.dme
@@ -1658,10 +1658,11 @@
 #include "code\modules\clothing\tail_accessory.dm"
 #include "code\modules\clothing\ears\antennae.dm"
 #include "code\modules\clothing\ears\bandanna.dm"
-#include "code\modules\clothing\ears\bulwark.dm"
 #include "code\modules\clothing\ears\earmuffs.dm"
 #include "code\modules\clothing\ears\earrings.dm"
-#include "code\modules\clothing\ears\skrell.dm"
+#include "code\modules\clothing\ears\xeno\bulwark.dm"
+#include "code\modules\clothing\ears\xeno\skrell.dm"
+#include "code\modules\clothing\ears\xeno\tajara.dm"
 #include "code\modules\clothing\factions\dominia.dm"
 #include "code\modules\clothing\factions\einstein.dm"
 #include "code\modules\clothing\factions\elyra.dm"
@@ -1718,6 +1719,7 @@
 #include "code\modules\clothing\masks\xeno\unathi.dm"
 #include "code\modules\clothing\rings\material.dm"
 #include "code\modules\clothing\rings\rings.dm"
+#include "code\modules\clothing\rings\xeno\tajara.dm"
 #include "code\modules\clothing\sets\acting_captain.dm"
 #include "code\modules\clothing\sets\captain.dm"
 #include "code\modules\clothing\sets\infiltrator.dm"
@@ -1819,6 +1821,7 @@
 #include "code\modules\clothing\under\xenos\vaurca.dm"
 #include "code\modules\clothing\wrists\watches.dm"
 #include "code\modules\clothing\wrists\wrists.dm"
+#include "code\modules\clothing\wrists\xeno\tajara.dm"
 #include "code\modules\clothing\wrists\xeno\unathi.dm"
 #include "code\modules\compass\_compass.dm"
 #include "code\modules\compass\compass_holder.dm"

diff --git a/code/game/objects/items/weapons/chaplain_items.dm b/code/game/objects/items/weapons/chaplain_items.dm
@@ -17,7 +17,14 @@
 	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, "Tribunal Rod" = /obj/item/nullrod/dominia, "Tajaran charm" = /obj/item/nullrod/charm)
+	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)
+
+/obj/item/nullrod/obsidianshards
+	name = "obsidian shards"
+	desc = "A loose pile of obsidian shards, waiting to be assembled into a religious focus."
+	icon_state = "nullshards"
+	item_state = "nullshards"
 
 /obj/item/nullrod/dominia
 	name = "tribunalist purification rod"
@@ -67,11 +74,70 @@
 /obj/item/nullrod/charm/get_mask_examine_text(mob/user)
 	return "around [user.get_pronoun("his")] neck"
 
-/obj/item/nullrod/obsidianshards
-	name = "obsidian shards"
-	desc = "A loose pile of obsidian shards, waiting to be assembled into a religious focus."
-	icon_state = "nullshards"
-	item_state = "nullshards"
+/obj/item/nullrod/matake
+	name = "\improper Mata'ke sword"
+	desc = "A ceremonial spear crafted after the image of Mata'ke's holy weapon."
+	icon = 'icons/obj/tajara_items.dmi'
+	icon_state = "matake_spear"
+	item_state = "matake_spear"
+	contained_sprite = TRUE
+	slot_flags = SLOT_BELT | SLOT_BACK
+	w_class = ITEMSIZE_LARGE
+
+/obj/item/nullrod/rredouane
+	name = "\improper Rredouane sword"
+	desc = "A ceremonial sword crafted after the image of Rredouane's holy sword."
+	icon = 'icons/obj/tajara_items.dmi'
+	icon_state = "rredouane_sword"
+	item_state = "rredouane_sword"
+	contained_sprite = TRUE
+
+/obj/item/nullrod/shumaila
+	name = "\improper Shumaila hammer"
+	desc = "A ceremonial hammer carried by the priesthood of Shumaila."
+	icon_state = "shumaila_hammer"
+	item_state = "shumaila_hammer"
+	contained_sprite = TRUE
+
+/obj/item/nullrod/zhukamir
+	name = "\improper Zhukamir ladle"
+	desc = "A golden ladle used by Zhukamir's most faithful worshippers."
+	icon = 'icons/obj/tajara_items.dmi'
+	icon_state = "zhukamir_ladle"
+	item_state = "zhukamir_ladle"
+
+/obj/item/nullrod/azubarre
+	name = "\improper Azubarre torch"
+	desc = "A ceremonial torch used by Azubarre's priesthood in their rituals."
+	icon = 'icons/obj/tajara_items.dmi'
+	icon_state = "azubarre_torch"
+	item_state = "azubarre_torch"
+	contained_sprite = TRUE
+	var/lit = FALSE
+
+/obj/item/nullrod/azubarre/attack_self(mob/user)
+	lit= !lit
+	if(lit)
+		to_chat(user, SPAN_NOTICE("You light \the [src]!"))
+	else
+		to_chat(user, SPAN_NOTICE("You extinguish \the [src]!"))
+
+	update_icon()
+	user.update_inv_l_hand(FALSE)
+	user.update_inv_r_hand()
+
+/obj/item/nullrod/azubarre/update_icon()
+	if(lit)
+		icon_state = "azubarre_torch-on"
+		item_state = "azubarre_torch-on"
+		set_light(3, 1, LIGHT_COLOR_FIRE)
+	else
+		icon_state = "azubarre_torch-empty"
+		icon_state = "azubarre_torch-empty"
+		set_light(0)
+
+/obj/item/nullrod/azubarre/isFlameSource()
+	return lit
 
 /obj/item/nullrod/verb/change(mob/user)
 	set name = "Reassemble Null Item"
@@ -259,3 +325,68 @@
 	else
 		icon_state = "assunzionesheath_empty"
 
+/obj/item/storage/altar
+	name = "altar"
+	desc = "A small portable altar."
+	icon = 'icons/obj/cult.dmi'
+	icon_state = "talismanaltar"
+	can_hold = list(/obj/item/nullrod)
+	storage_slots = 1
+	drop_sound = 'sound/items/drop/axe.ogg'
+	pickup_sound = 'sound/items/pickup/axe.ogg'
+
+/obj/item/storage/altar/attack_hand(mob/user)
+	if(!isturf(loc))
+		..()
+	if(use_check_and_message(user))
+		return FALSE
+	else
+		open(user)
+
+/obj/item/storage/altar/MouseDrop(mob/user as mob)
+	if(use_check_and_message(user))
+		return
+	if(ishuman(user))
+		forceMove(get_turf(usr))
+		usr.put_in_hands(src)
+
+/obj/item/storage/altar/kraszar
+	name = "\improper Kraszar altar"
+	desc = "An altar with a book honoring Kraszar, the Ma'ta'ke deity of joy, stories, and language."
+	icon = 'icons/obj/tajara_items.dmi'
+	icon_state = "kraszar_bookstand"
+	can_hold = list(/obj/item/storage/bible)
+	drop_sound = 'sound/items/drop/wooden.ogg'
+	pickup_sound = 'sound/items/pickup/wooden.ogg'
+
+/obj/item/storage/altar/rredouane
+	name = "\improper Rredouane altar"
+	desc = "An altar honoring Rredouane, the Ma'ta'ke deity of valor, triumph, and victory. It has a slot for a ceremonial sword."
+	icon = 'icons/obj/tajara_items.dmi'
+	icon_state = "rredouane_altar_e"
+	can_hold = list(/obj/item/nullrod/rredouane)
+
+/obj/item/storage/altar/rredouane/update_icon()
+	if(contents.len)
+		icon_state = "rredouane_altar_s"
+	else
+		icon_state = "rredouane_altar_e"
+
+/obj/item/storage/altar/dharmela
+	name = "\improper Dharmela altar"
+	desc = "An anvil-altar honoring Dharmela, the Ma'ta'ke deity of forges, anvils, and craftsmanship."
+	icon = 'icons/obj/tajara_items.dmi'
+	icon_state = "dharmela_anvil"
+	can_hold = list(/obj/item/nullrod/shumaila)
+
+/obj/item/storage/altar/minharzzka
+	name = "\improper Minharzzka altar"
+	desc = "An small altar honoring Minharzzka, the Ma'ta'ke deity of waters and sailors."
+	icon = 'icons/obj/tajara_items.dmi'
+	icon_state = "minharzzka_altar"
+
+/obj/item/storage/altar/marryam
+	name = "\improper Marryam altar"
+	desc = "A poppyvase used as an altar to honor Marryam, the Ma'ta'ke deity of settlements, sleep, and parenthood."
+	icon = 'icons/obj/tajara_items.dmi'
+	icon_state = "marryam_poppyvase"
diff --git a/code/game/objects/structures/flags_banners.dm b/code/game/objects/structures/flags_banners.dm
@@ -11,6 +11,7 @@
 	var/flag_path
 	var/flag_size = FALSE // true if big flag
 	var/obj/structure/sign/flag/flag_structure
+	var/stand_icon = "banner_stand"
 
 // Flag on Wall
 /obj/structure/sign/flag
@@ -29,6 +30,7 @@
 	var/icon/banner_icon
 	var/icon/rolled_outline
 	var/unmovable = FALSE
+	var/stand_icon = "banner_stand"
 
 /obj/structure/sign/flag/New(loc, var/newdir, var/linked_flag_path, var/deploy, var/icon_file, var/item_flag_path)
 	. = ..()
@@ -97,7 +99,7 @@
 			if(istype(A, /obj/structure/window))
 				icon = flag_icon
 				return
-		banner_icon = new('icons/obj/structure/flags.dmi', "banner_stand")
+		banner_icon = new('icons/obj/structure/flags.dmi', stand_icon)
 		flag_icon.Blend(banner_icon, ICON_UNDERLAY)
 		verbs += /obj/structure/sign/flag/proc/toggle
 		icon = flag_icon
@@ -254,7 +256,7 @@
 		shading_icon = new('icons/obj/structure/flags.dmi', "flag")
 
 	flag_icon.Blend(shading_icon, ICON_MULTIPLY)
-	banner_icon = new('icons/obj/structure/flags.dmi', "banner_stand")
+	banner_icon = new('icons/obj/structure/flags.dmi', stand_icon)
 	flag_icon.Blend(banner_icon, ICON_UNDERLAY)
 	icon = flag_icon
 
@@ -2278,3 +2280,156 @@
 
 /obj/structure/sign/flag/imperial_frontier/large/west/New()
 	..(loc, WEST)
+
+
+//tajaran gods
+
+/obj/item/flag/srendarr
+	name = "\improper S'rendarr Banner"
+	desc = "A banner with the symbol of S'rendarr, the Adhomian god of life, fertility, sunlight, youthful energy, and everything associated with the time of summer and daylight."
+	flag_path = "srendarr"
+	flag_structure = /obj/structure/sign/flag/srendarr
+	stand_icon = "wood_stand"
+
+/obj/structure/sign/flag/srendarr
+	name = "\improper S'rendarr Banner"
+	desc = "A banner with the symbol of S'rendarr, the Adhomian god of life, fertility, sunlight, youthful energy, and everything associated with the time of summer and daylight."
+	icon_state = "srendarr"
+	flag_path = "srendarr"
+	flag_item = /obj/item/flag/srendarr
+	stand_icon = "wood_stand"
+
+/obj/item/flag/messa
+	name = "\improper Messa Banner"
+	desc = "A banner with the symbol of Messa, the Adhomian god of life, fertility, sunlight, youthful energy, and everything associated with the time of summer and daylight."
+	flag_path = "messa"
+	flag_structure = /obj/structure/sign/flag/messa
+	stand_icon = "wood_stand"
+
+/obj/structure/sign/flag/messa
+	name = "\improper Messa Banner"
+	desc = "A banner with the symbol of Messa, the Adhomian goddess of inevitability, old age, and winter, but also of guidance, wisdom, protection, and patience."
+	icon_state = "messa"
+	flag_path = "messa"
+	flag_item = /obj/item/flag/messa
+	stand_icon = "wood_stand"
+
+/obj/item/flag/matake
+	name = "\improper Mata'ke Banner"
+	desc = "A banner with the symbol of Mata'ke, the spearhead. Mata'ke is the Ma'ta'ke deity of snow, judgment, practicality, order, and strength."
+	flag_path = "matake"
+	flag_structure = /obj/structure/sign/flag/matake
+	stand_icon = "wood_stand"
+
+/obj/structure/sign/flag/matake
+	name = "\improper Mata'ke Banner"
+	desc = "A banner with the symbol of Mata'ke, the spearhead. Mata'ke is the Ma'ta'ke deity of snow, judgment, practicality, order, and strength."
+	icon_state = "matake"
+	flag_path = "matake"
+	flag_item = /obj/item/flag/matake
+	stand_icon = "wood_stand"
+
+/obj/item/flag/marryam
+	name = "\improper Marryam Banner"
+	desc = "A banner with the symbol of Marryam, the poppy. Marryam is the Ma'ta'ke deity of settlements, sleep, and parenthood."
+	flag_path = "marryam"
+	flag_structure = /obj/structure/sign/flag/marryam
+	stand_icon = "wood_stand"
+
+/obj/structure/sign/flag/marryam
+	name = "\improper Marryam Banner"
+	desc = "A banner with the symbol of Marryam, the poppy. Marryam is the Ma'ta'ke deity of settlements, sleep, and parenthood."
+	icon_state = "marryam"
+	flag_path = "marryam"
+	flag_item = /obj/item/flag/marryam
+	stand_icon = "wood_stand"
+
+/obj/item/flag/rredouane
+	name = "\improper Rredouane Banner"
+	desc = "A banner with the symbol of Rredouane, the dice and blade. Rredouane is the Ma'ta'ke deity of valor, triumph, and victory."
+	flag_path = "rredouane"
+	flag_structure = /obj/structure/sign/flag/rredouane
+	stand_icon = "wood_stand"
+
+/obj/structure/sign/flag/rredouane
+	name = "\improper Rredouane Banner"
+	desc = "A banner with the symbol of Rredouane, the dice and blade. Rredouane is the Ma'ta'ke deity of valor, triumph, and victory."
+	icon_state = "rredouane"
+	flag_path = "rredouane"
+	flag_item = /obj/item/flag/rredouane
+	stand_icon = "wood_stand"
+
+/obj/item/flag/shumaila
+	name = "\improper Shumaila Banner"
+	desc = "A banner with the symbol of Shumaila, the bulwark. Shumaila is the Ma'ta'ke deity of fortification, chastity, and architecture."
+	flag_path = "shumaila"
+	flag_structure = /obj/structure/sign/flag/shumaila
+	stand_icon = "wood_stand"
+
+/obj/structure/sign/flag/shumaila
+	name = "\improper Shumaila Banner"
+	desc = "A banner with the symbol of Shumaila, the bulwark. Shumaila is the Ma'ta'ke deity of fortification, chastity, and architecture."
+	icon_state = "shumaila"
+	flag_path = "shumaila"
+	flag_item = /obj/item/flag/shumaila
+	stand_icon = "wood_stand"
+
+/obj/item/flag/kraszar
+	name = "\improper Kraszar Banner"
+	desc = "A banner with the symbol of Hraszar, the scroll of ages. Kraszar is the Ma'ta'ke deity of joy, stories, and language."
+	flag_path = "kraszar"
+	flag_structure = /obj/structure/sign/flag/kraszar
+	stand_icon = "wood_stand"
+
+/obj/structure/sign/flag/kraszar
+	name = "\improper Kraszar Banner"
+	desc = "A banner with the symbol of Hraszar, the scroll of ages. Kraszar is the Ma'ta'ke deity of joy, stories, and language."
+	icon_state = "kraszar"
+	flag_path = "kraszar"
+	flag_item = /obj/item/flag/kraszar
+	stand_icon = "wood_stand"
+
+/obj/item/flag/dhrarmela
+	name = "\improper Dhrarmela Banner"
+	desc = "A banner with the symbol of Dhrarmela, the divinity anvil. Dhrarmela is the Ma'ta'ke deity of forges, anvils, and craftsmanship."
+	flag_path = "dhrarmela"
+	flag_structure = /obj/structure/sign/flag/dhrarmela
+	stand_icon = "wood_stand"
+
+/obj/structure/sign/flag/dhrarmela
+	name = "\improper Dhrarmela Banner"
+	desc = "A banner with the symbol of Dhrarmela, the divinity anvil. Dhrarmela is the Ma'ta'ke deity of forges, anvils, and craftsmanship."
+	icon_state = "dhrarmela"
+	flag_path = "dhrarmela"
+	flag_item = /obj/item/flag/dhrarmela
+	stand_icon = "wood_stand"
+
+/obj/item/flag/azubarre
+	name = "\improper Azubarre Banner"
+	desc = "A banner with the symbol of Azubarre, the torch of passion. Kraszar is the Ma'ta'ke deity of love, fertility, and marriage."
+	flag_path = "azubarre"
+	flag_structure = /obj/structure/sign/flag/azubarre
+	stand_icon = "wood_stand"
+
+/obj/structure/sign/flag/azubarre
+	name = "\improper Azubarre Banner"
+	desc = "A banner with the symbol of Azubarre, the torch of passion. Kraszar is the Ma'ta'ke deity of love, fertility, and marriage."
+	icon_state = "azubarre"
+	flag_path = "azubarre"
+	flag_item = /obj/item/flag/azubarre
+	stand_icon = "wood_stand"
+
+/obj/item/flag/raskara
+	name = "\improper Raskara Banner"
+	desc = "A banner with the symbol of Raskara, the Moon."
+	flag_path = "raskara"
+	flag_structure = /obj/structure/sign/flag/raskara
+	stand_icon = "wood_stand"
+
+/obj/structure/sign/flag/raskara
+	name = "\improper Raskara Banner"
+	desc = "A banner with the symbol of Raskara, the Moon."
+	icon_state = "raskara"
+	flag_path = "raskara"
+	flag_item = /obj/item/flag/raskara
+	stand_icon = "wood_stand"