diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm index df1b9ee2b45..dc6fcc2f8cd 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm @@ -1,9 +1,18 @@ /datum/gear/suit/unathi_mantle - display_name = "hide mantle" + display_name = "hide mantle selection" path = /obj/item/clothing/accessory/poncho/unathimantle cost = 1 whitelisted = list(SPECIES_UNATHI) sort_category = "Xenowear - Unathi" + flags = GEAR_HAS_COLOR_SELECTION + +/datum/gear/suit/unathi_mantle/New() + ..() + var/mantles = list() + mantles["hide mantle, desert"] = /obj/item/clothing/accessory/poncho/unathimantle + mantles["hide mantle, forest"] = /obj/item/clothing/accessory/poncho/unathimantle/forest + mantles["hide mantle, mountain"] = /obj/item/clothing/accessory/poncho/unathimantle/mountain + gear_tweaks += new/datum/gear_tweak/path(mantles) /datum/gear/suit/unathi_robe display_name = "roughspun robe" diff --git a/code/modules/clothing/suits/alien.dm b/code/modules/clothing/suits/alien.dm index ce6fb04afda..4f86054200b 100644 --- a/code/modules/clothing/suits/alien.dm +++ b/code/modules/clothing/suits/alien.dm @@ -14,13 +14,13 @@ /obj/item/clothing/suit/unathi/robe/kilt name = "wasteland kilt" - desc = "A long tunic made of old material that acts as a kilt for the poorest of unathi, who aren't afraid to let the sand and sun strike their scales." + desc = "A long tunic made of old material that acts as a kilt for the poorest of Unathi, who aren't afraid to let the sand and sun strike their scales." icon_state = "wasteland_kilt" item_state = "wasteland_kilt" /obj/item/clothing/suit/unathi/robe/robe_coat //I was at a loss for names under-the-hood. name = "tzirzi robes" - desc = "A casual Moghes-native garment typically worn by Unathi while planet-side." + desc = "A casual garment native to Moghes typically worn by Unathi." icon = 'icons/obj/unathi_items.dmi' icon_state = "robe_coat" item_state = "robe_coat" diff --git a/code/modules/clothing/under/xenos/unathi.dm b/code/modules/clothing/under/xenos/unathi.dm index 512f286c48b..87fd2010ea1 100644 --- a/code/modules/clothing/under/xenos/unathi.dm +++ b/code/modules/clothing/under/xenos/unathi.dm @@ -30,7 +30,7 @@ /obj/item/clothing/under/unathi/zazali name = "zazali garb" - desc = "An old fashioned, extremely striking garb for the Unathi man with pointy shoulders. It's typically worn by those in the warrior caste... Or those with something to prove." + desc = "An old fashioned, extremely striking garb for a Unathi man with pointy shoulders. It's typically worn by those in the warrior caste... Or those with something to prove." icon_state = "zazali" item_state = "zazali" @@ -42,14 +42,14 @@ /obj/item/clothing/under/unathi/zozo name = "zo'zo top" - desc = "A modern blend of Ouerean and Moghean style for the Unathi man on the go. Great for sunbathing." + desc = "A modern blend of Ouerean and Moghean style for anyone on the go. Great for sunbathing!" icon_state = "zozo" item_state = "zozo" /obj/item/clothing/suit/unathi/mantle/wrapping name = "unathi wrappings" desc = "Stitched together clothing with bandages covering them, looks tailored for an unathi." - desc_fluff = "This is a very traditional Sinta wear for Th'akh shamans, most modern Sinta do not wear these." + desc_fluff = "The old-fashioned choice of Sinta wear for Th'akh shamans— most modern Sinta do not wear these." icon = 'icons/obj/unathi_items.dmi' icon_state = "thakh_wrappings" //special thanks to Araskael item_state = "thakh_wrappings" @@ -60,7 +60,7 @@ /obj/item/clothing/mask/gas/wrapping name = "unathi head wrappings" - desc = "A bunch of stitched together bandages with a fibreglass breath mask on it, openings for the eyes. Looks tailored for an unathi." + desc = "A bunch of stitched together bandages on a fibreglass breath mask that also contains openings for the eyes. Looks tailored for a Unathi." desc_fluff = "This is a very traditional Sinta wear for Th'akh shamans, most modern Sinta do not wear these." icon = 'icons/obj/unathi_items.dmi' icon_state = "thakh_mask" //special thanks to Araskael @@ -69,10 +69,25 @@ contained_sprite = TRUE /obj/item/clothing/accessory/poncho/unathimantle - name = "hide mantle" - desc = "A rather grisly selection of cured hides and skin, sewn together to form a ragged mantle." + name = "desert hide mantle" + desc = "The cured hide and skin of a large beast, tapered off with a colorful collar. This one is a popular trophy among Wastelanders: someone's been hunting!" + desc_fluff = "With the expansion of the Touched Lands, the normal beasts that prowl and stalk the dunes have proliferated at unprecedented rates. Those stranded outside of the greenery of the Izweski take up arms to cull the herdes of klazd, and their skins make valuable mantles to protect wearers from the sun." icon = 'icons/obj/unathi_items.dmi' icon_state = "mantle-unathi" item_state = "mantle-unathi" icon_override = null - contained_sprite = TRUE \ No newline at end of file + contained_sprite = TRUE + build_from_parts = TRUE + worn_overlay = "desert" + +/obj/item/clothing/accessory/poncho/unathimantle/forest + name = "forest hide mantle" + desc = "The cured hide and skin of a large beast, tapered off with a colorful collar. These are seen exclusively by warriors, nobles, and those with credits to spare." + desc_fluff = "After the Contact War, the prized horns of the tul quickly vanished from the market. Nobles and wealthy guildsmen were swift to monopolize and purchase all the remaining cloaks; a peasant seen with one of these is likely enough a death sentence." + worn_overlay = "forest" + +/obj/item/clothing/accessory/poncho/unathimantle/mountain + name = "mountain hide mantle" + desc = "The cured hide and skin of a large beast, tapered off with a colorful collar. Mountainous arbek, massive snakes longer than a bus, have a long enough hide for multiple mantles." + desc_fluff = "Hunting an arbek is no easy task. Brave Zo'saa looking to prove themselves in battle and be promoted to Saa rarely understand the gravity of these trials. Serpents large enough to swallow unathi whole, they can live up to half a millenia— should enough foolish adventurers try to slay it, that is." + worn_overlay = "mountain" diff --git a/config/example/admins.txt b/config/example/admins.txt index 7f61dd46c2a..10e0837ef4b 100644 --- a/config/example/admins.txt +++ b/config/example/admins.txt @@ -5,4 +5,4 @@ # Ranks can be anything defined in admin_ranks.json ~Carn # ###################################################################### -# not_a_user - Head Admin/Dev +# not_a_user - Head Admin/Dev \ No newline at end of file diff --git a/html/changelogs/changelog.yml b/html/changelogs/changelog.yml new file mode 100644 index 00000000000..4e052533d90 --- /dev/null +++ b/html/changelogs/changelog.yml @@ -0,0 +1,7 @@ +author: Haydizzle +delete-after: True + +changes: +- rscadd: "Added a colorable version of the hide mantle with three different hides to choose from." +- rscdel: "Replaced the old hide mantle sprite for unathi." +- spellcheck: "Tweaks the wording for unathi clothes descriptions." \ No newline at end of file diff --git a/icons/obj/unathi_items.dmi b/icons/obj/unathi_items.dmi index 59e6dba45cd..355d4c4fa77 100644 Binary files a/icons/obj/unathi_items.dmi and b/icons/obj/unathi_items.dmi differ