Tajaran loadout addons (#21768)

Adds the Adhomian instrument, p'rrama to the game. Turns out it has had
an icon sitting around in the tajara items dmi for years but no actual
code.
Adds the shillelagh (now renmaed to Maikahar) (Adhomian walking stick)
and Tajaran dogtags to the Tajaran loadout section.
Adds the Adhomian hunting coat to the Taj coat selection.

code/defines/obj/weapon.dm

@@ -282,12 +282,12 @@
 	icon_state = "forearm_crutch"
 	item_state = "forearm_crutch"
 
-/obj/item/cane/shillelagh
-	name = "adhomian shillelagh"
-	desc = "A sturdy walking stick made from adhomian wood."
+/obj/item/cane/maikahar
+	name = "adhomian maikahar"
+	desc = "A sturdy walking stick made from Adhomian wood. The name translates roughly to 'Stick of earth walk'."
 	icon = 'icons/obj/tajara_items.dmi'
-	icon_state = "shillelagh"
-	item_state = "shillelagh"
+	icon_state = "maikahar"
+	item_state = "maikahar"
 	contained_sprite = TRUE
 
 /obj/item/cane/telecane

code/modules/client/preference_setup/loadout/items/xeno/tajara.dm

@@ -162,6 +162,7 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara)
 	coat["fine brown coat"] = /obj/item/clothing/suit/storage/tajaran/finecoat
 	coat["fine blue coat"] = /obj/item/clothing/suit/storage/tajaran/finecoat/blue
 	coat["fancy royalist jacket"] = /obj/item/clothing/suit/storage/tajaran/fancy
+	coat["adhomian hunting coat"] = /obj/item/clothing/suit/storage/tajaran/hunting
 	gear_tweaks += new /datum/gear_tweak/path(coat)
 
 /datum/gear/suit/tajaran_labcoat
@@ -568,6 +569,14 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara)
 	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
 	sort_category = "Xenowear - Tajara"
 
+/datum/gear/accessory/tajara_dogtags
+	display_name = "adhomian dogtags"
+	description = "An engraved metal identification tag. The description you assign to the dogtags will carry over to both halves when separated."
+	path = /obj/item/clothing/accessory/dogtags/adhomai
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	sort_category = "Xenowear - Tajara"
+	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
+
 // Hats, masks and earrings
 
 /datum/gear/head/tajara
@@ -759,6 +768,13 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara)
 	sort_category = "Xenowear - Tajara"
 	flags = GEAR_HAS_DESC_SELECTION
 
+/datum/gear/tajara_camera_film
+	display_name = "adhomian film canister"
+	description = "Spare film for the Adhomian camera."
+	path = /obj/item/camera_film/taj_film
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
+
 /datum/gear/typewriter
 	display_name = "adhomian portable typewriter"
 	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
@@ -766,5 +782,20 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara)
 	path = /obj/item/typewriter_case
 	flags = GEAR_HAS_DESC_SELECTION
 
+/datum/gear/prrama
+	display_name = "p'rrama"
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	sort_category = "Xenowear - Tajara"
+	path = /obj/item/synthesized_instrument/guitar/prrama
+	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
+	allowed_roles = list("Off-Duty Crew Member", "Passenger")
+
+/datum/gear/maikahar
+	display_name = "maikahar"
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	sort_category = "Xenowear - Tajara"
+	path = /obj/item/cane/maikahar
+	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
+
 // All the rest
 

code/modules/synthesized_instruments/real_instruments/Guitar/guitar.dm

@@ -18,3 +18,16 @@
 	slot_flags = SLOT_BACK
 	sound_player = /datum/sound_player/synthesizer
 	path = /datum/instrument/guitar
+
+/obj/item/synthesized_instrument/guitar/prrama
+	name = "p'rrama"
+	desc = "A traditional Adhomian string instrument, played with the hands and tail."
+	icon = 'icons/obj/tajara_items.dmi'
+	icon_state = "prrama"
+	item_state = "prrama"
+
+/obj/item/synthesized_instrument/guitar/prrama/interact(mob/user)
+	if(!istajara(user))
+		balloon_alert(user, "not a tajara!")
+		return
+	. = ..()

html/changelogs/Greenjoe - tajloadoutaddons.yml

@@ -0,0 +1,61 @@
+################################
+# 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
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: Greenjoe
+
+# 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, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Adds the Adhomian p'rrama to the game."
+  - rscadd: "Adds Adhomian dogtags and a walking stick (maikahar) to the Tajaran loadout."
+  - rscadd: "Adds the Adhomian hunting coat to the Tajaran coat selection."
+  - rscadd: "The shillelagh is renamed to maikahar."