diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index 9b700e1c0f3..045f2aad45b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -50,44 +50,63 @@ ..() gear_tweaks = list(gear_tweak_free_color_choice) -//skrell items +//skrell -/datum/gear/ears/f_skrell - display_name = "headtail-wear, female (Skrell)" +/datum/gear/ears/skrell/chains //Chains + display_name = "headtail chain selection (Skrell)" path = /obj/item/clothing/ears/skrell/chain sort_category = "Xenowear" whitelisted = list("Skrell") -/datum/gear/ears/f_skrell/New() +/datum/gear/ears/skrell/chains/New() ..() - var/f_chains = list() - f_chains["headtail chains"] = /obj/item/clothing/ears/skrell/chain - f_chains["headtail cloth"] = /obj/item/clothing/ears/skrell/cloth_female - f_chains["red-jeweled chain"] = /obj/item/clothing/ears/skrell/redjewel_chain - f_chains["ebony chain"] = /obj/item/clothing/ears/skrell/ebony_chain - f_chains["blue-jeweled chain"] = /obj/item/clothing/ears/skrell/bluejeweled_chain - f_chains["silver chain"] = /obj/item/clothing/ears/skrell/silver_chain - f_chains["blue cloth"] = /obj/item/clothing/ears/skrell/blue_skrell_cloth_band_female - gear_tweaks += new/datum/gear_tweak/path(f_chains) + var/list/chaintypes = list() + for(var/chain_style in typesof(/obj/item/clothing/ears/skrell/chain)) + var/obj/item/clothing/ears/skrell/chain/chain = chain_style + chaintypes[initial(chain.name)] = chain + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(chaintypes)) -/datum/gear/ears/m_skrell - display_name = "headtail-wear, male (Skrell)" +/datum/gear/ears/skrell/bands + display_name = "headtail band selection (Skrell)" path = /obj/item/clothing/ears/skrell/band sort_category = "Xenowear" whitelisted = list("Skrell") -/datum/gear/ears/m_skrell/New() +/datum/gear/ears/skrell/bands/New() ..() - var/m_chains = list() - m_chains["headtail bands"] = /obj/item/clothing/ears/skrell/band - m_chains["headtail cloth"] = /obj/item/clothing/ears/skrell/cloth_male - m_chains["red-jeweled bands"] = /obj/item/clothing/ears/skrell/redjeweled_band - m_chains["ebony bands"] = /obj/item/clothing/ears/skrell/ebony_band - m_chains["blue-jeweled bands"] = /obj/item/clothing/ears/skrell/bluejeweled_band - m_chains["silver bands"] = /obj/item/clothing/ears/skrell/silver_band - m_chains["blue cloth"] = /obj/item/clothing/ears/skrell/blue_skrell_cloth_band_male - m_chains["purple cloth"] = /obj/item/clothing/ears/skrell/purple_skrell_cloth_male - gear_tweaks += new/datum/gear_tweak/path(m_chains) + var/list/bandtypes = list() + for(var/band_style in typesof(/obj/item/clothing/ears/skrell/band)) + var/obj/item/clothing/ears/skrell/band/band = band_style + bandtypes[initial(band.name)] = band + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(bandtypes)) + +/datum/gear/ears/skrell/cloth/short + display_name = "short headtail cloth (Skrell)" + path = /obj/item/clothing/ears/skrell/cloth_short/black + sort_category = "Xenowear" + whitelisted = list("Skrell") + +/datum/gear/ears/skrell/cloth/short/New() + ..() + var/list/shorttypes = list() + for(var/short_style in typesof(/obj/item/clothing/ears/skrell/cloth_short)) + var/obj/item/clothing/ears/skrell/cloth_short/short = short_style + shorttypes[initial(short.name)] = short + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(shorttypes)) + +/datum/gear/ears/skrell/cloth/average + display_name = "average headtail cloth (Skrell)" + path = /obj/item/clothing/ears/skrell/cloth_average/black + sort_category = "Xenowear" + whitelisted = list("Skrell") + +/datum/gear/ears/skrell/cloth/average/New() + ..() + var/list/averagetypes = list() + for(var/average_style in typesof(/obj/item/clothing/ears/skrell/cloth_average)) + var/obj/item/clothing/ears/skrell/cloth_average/average = average_style + averagetypes[initial(average.name)] = average + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(averagetypes)) //vaurca items diff --git a/code/modules/clothing/ears/skrell.dm b/code/modules/clothing/ears/skrell.dm index 5dc258a4dad..e787b42119c 100644 --- a/code/modules/clothing/ears/skrell.dm +++ b/code/modules/clothing/ears/skrell.dm @@ -1,7 +1,3 @@ -/* - Skrell tentacle wear -*/ - /obj/item/clothing/ears/skrell name = "skrell tentacle wear" desc = "Some stuff worn by skrell to adorn their head tentacles." @@ -11,91 +7,213 @@ species_restricted = list("Skrell") /obj/item/clothing/ears/skrell/chain - name = "skrell headtail chains" - desc = "A delicate golden chain worn by female skrell to decorate their head tails." + name = "gold headtail chains" + desc = "A delicate golden chain worn by skrell to decorate their head tails." icon_state = "skrell_chain" item_state = "skrell_chain" +/obj/item/clothing/ears/skrell/chain/silver + name = "silver headtail chains" + desc = "A delicate silver chain worn by skrell to decorate their head tails." + icon_state = "skrell_chain_sil" + item_state = "skrell_chain_sil" + +/obj/item/clothing/ears/skrell/chain/bluejewels + name = "blue jeweled golden headtail chains" + desc = "A delicate golden chain adorned with blue jewels worn by skrell to decorate their head tails." + icon_state = "skrell_chain_bjewel" + item_state = "skrell_chain_bjewel" + +/obj/item/clothing/ears/skrell/chain/redjewels + name = "red jeweled golden headtail chains" + desc = "A delicate golden chain adorned with red jewels worn by skrell to decorate their head tails." + icon_state = "skrell_chain_rjewel" + item_state = "skrell_chain_rjewel" + +/obj/item/clothing/ears/skrell/chain/ebony + name = "ebony headtail chains" + desc = "A delicate ebony chain worn by skrell to decorate their head tails." + icon_state = "skrell_chain_ebony" + item_state = "skrell_chain_ebony" + +/obj/item/clothing/ears/skrell/chain/goldshort + name = "skrell short gold headdress" + desc = "An elaborate golden headdress worn by skrell around their head tails." + icon_state = "male_golddia" + item_state = "male_golddia" + +/obj/item/clothing/ears/skrell/chain/goldaverage + name = "skrell average gold headdress" + desc = "An elaborate golden headdress worn by skrell around their head tails." + icon_state = "female_golddia" + item_state = "female_golddia" + +/obj/item/clothing/ears/skrell/chain/goldlong + name = "skrell very long gold headdress" + desc = "An elaborate golden headdress worn by skrell around their head tails." + icon_state = "verylong_golddia" + item_state = "verylong_golddia" + +/obj/item/clothing/ears/skrell/chain/goldshort + name = "skrell very short gold headdress" + desc = "An elaborate golden headdress worn by skrell around their head tails." + icon_state = "veryshort_golddia" + item_state = "veryshort_golddia" + +/obj/item/clothing/ears/skrell/chain/silvershort + name = "skrell short silver headdress" + desc = "A jeweled silver headdress worn by skrell around their head tails." + icon_state = "male_silvdia" + item_state = "male_silvdia" + +/obj/item/clothing/ears/skrell/chain/silveraverage + name = "skrell average silver headdress" + desc = "A jeweled silver headdress worn by skrell around their head tails." + icon_state = "female_silvdia" + item_state = "female_silvdia" + +/obj/item/clothing/ears/skrell/chain/silverlong + name = "skrell very long silver headdress" + desc = "A jeweled silver headdress worn by skrell around their head tails." + icon_state = "verylong_silvdia" + item_state = "verylong_silvdia" + +/obj/item/clothing/ears/skrell/chain/festiveaverage + name = "skrell average festive headdress" + desc = "An elaborate golden headdress worn by skrell around their head tails." + icon_state = "female_fest" + item_state = "female_fest" + +/obj/item/clothing/ears/skrell/chain/festivelong + name = "skrell very long festive headdress" + desc = "An elaborate golden headdress worn by skrell around their head tails." + icon_state = "verylong_fest" + item_state = "verylong_fest" + +/obj/item/clothing/ears/skrell/chain/festiveshort + name = "skrell short festive headdress" + desc = "An elaborate golden headdress worn by skrell around their head tails." + icon_state = "male_fest" + item_state = "male_fest" + +/obj/item/clothing/ears/skrell/chain/festiveveryshort + name = "skrell very short festive headdress" + desc = "An elaborate golden headdress worn by skrell around their head tails." + icon_state = "veryshort_fest" + item_state = "veryshort_fest" + +/obj/item/clothing/ears/skrell/chain/blackshort + name = "skrell short ebony headdress" + desc = "An elaborate ebony jeweled headdress worn by skrell around their head tails." + icon_state = "male_blackdia" + item_state = "male_blackdia" + +/obj/item/clothing/ears/skrell/chain/blackaverage + name = "skrell average ebony headdress" + desc = "An elaborate ebony jeweled headdress worn by skrell around their head tails." + icon_state = "female_blackdia" + item_state = "skrell_chain_ebony" + +/obj/item/clothing/ears/skrell/chain/blacklong + name = "skrell long ebony headdress" + desc = "An elaborate ebony jeweled headdress worn by skrell around their head tails." + icon_state = "verylong_blackdia" + item_state = "verylong_blackdia" + /obj/item/clothing/ears/skrell/band - name = "skrell headtail bands" - desc = "Golden metallic bands worn by male skrell to adorn their head tails." + name = "gold headtail bands" + desc = "Golden metallic bands worn by skrell to adorn their head tails." icon_state = "skrell_band" item_state = "skrell_band" -/obj/item/clothing/ears/skrell/cloth_female - name = "skrell headtail cloth" - desc = "A cloth shawl worn by female skrell draped around their head tails." +/obj/item/clothing/ears/skrell/band/silver + name = "silver headtail bands" + desc = "Silver metallic bands worn by skrell to adorn their head tails." + icon_state = "skrell_band_sil" + item_state = "skrell_band_sil" + +/obj/item/clothing/ears/skrell/band/bluejewels + name = "blue jeweled golden headtail bands" + desc = "Golden metallic bands adorned with blue jewels worn by skrell to adorn their head tails." + icon_state = "skrell_band_bjewel" + item_state = "skrell_band_bjewel" + +/obj/item/clothing/ears/skrell/band/redjewels + name = "red jeweled golden headtail bands" + desc = "Golden metallic bands adorned with red jewels worn by skrell to adorn their head tails." + icon_state = "skrell_band_rjewel" + item_state = "skrell_band_rjewel" + +/obj/item/clothing/ears/skrell/band/ebony + name = "ebony headtail bands" + desc = "Ebony bands worn by skrell to adorn their head tails." + icon_state = "skrell_band_ebony" + item_state = "skrell_band_ebony" + +/obj/item/clothing/ears/skrell/cloth_average + name = "red headtail cloth" + desc = "A cloth shawl worn by skrell draped around their head tails." icon_state = "skrell_cloth_female" item_state = "skrell_cloth_female" -/obj/item/clothing/ears/skrell/cloth_male - name = "skrell headtail cloth" - desc = "A cloth band worn by male skrell around their head tails." +/obj/item/clothing/ears/skrell/cloth_average/black + name = "black headtail cloth" + icon_state = "skrell_cloth_black_female" + item_state = "skrell_cloth_black_female" + +/obj/item/clothing/ears/skrell/cloth_average/blue + name = "blue headtail cloth" + icon_state = "skrell_cloth_blue_female" + item_state = "skrell_cloth_blue_female" + +/obj/item/clothing/ears/skrell/cloth_average/green + name = "green headtail cloth" + icon_state = "skrell_cloth_green_female" + item_state = "skrell_cloth_green_female" + +/obj/item/clothing/ears/skrell/cloth_average/pink + name = "pink headtail cloth" + icon_state = "skrell_cloth_pink_female" + item_state = "skrell_cloth_pink_female" + +/obj/item/clothing/ears/skrell/cloth_average/lightblue + name = "light blue headtail cloth" + icon_state = "skrell_cloth_lblue_female" + item_state = "skrell_cloth_lblue_female" + +/obj/item/clothing/ears/skrell/cloth_short + name = "red headtail cloth" + desc = "A cloth band worn by skrell around their head tails." icon_state = "skrell_cloth_male" item_state = "skrell_cloth_male" -/obj/item/clothing/ears/skrell/redjewel_chain - name = "skrell red-jeweled headtail chains" - desc = "A delicate golden chain, decorated with red jewels, worn by female skrell to decorate their head tails." - icon_state = "redjewel_chain" - item_state = "redjewel_chain" +/obj/item/clothing/ears/skrell/cloth_short/black + name = "black headtail cloth" + icon_state = "skrell_cloth_black_male" + item_state = "skrell_cloth_black_male" -/obj/item/clothing/ears/skrell/ebony_chain - name = "skrell ebony headtail chains" - desc = "A delicate ebony chain worn by female skrell to decorate their head tails." - icon_state = "ebony_chain" - item_state = "ebony_chain" +/obj/item/clothing/ears/skrell/cloth_short/blue + name = "blue headtail cloth" + icon_state = "skrell_cloth_blue_male" + item_state = "skrell_cloth_blue_male" -/obj/item/clothing/ears/skrell/redjeweled_band - name = "skrell red-jeweled headtail bands" - desc = "Golden metallic bands, decorated with red jewels, worn by male skrell to adorn their head tails." - icon_state = "redjeweled_band" - item_state = "redjeweled_band" +/obj/item/clothing/ears/skrell/cloth_short/green + name = "green headtail cloth" + icon_state = "skrell_cloth_green_male" + item_state = "skrell_cloth_green_male" -/obj/item/clothing/ears/skrell/ebony_band - name = "skrell ebony headtail bands" - desc = "Ebony metallic bands, decorated with red jewels, worn by male skrell to adorn their head tails." - icon_state = "ebony_band" - item_state = "ebony_band" +/obj/item/clothing/ears/skrell/cloth_short/pink + name = "pink headtail cloth" + icon_state = "skrell_cloth_pink_male" + item_state = "skrell_cloth_pink_male" -/obj/item/clothing/ears/skrell/bluejeweled_chain - name = "skrell blue-jeweled headtail chains" - desc = "A delicate golden chain, decorated with blue jewels, worn by female skrell to decorate their head tails." - icon_state = "bluejeweled_chain" - item_state = "bluejeweled_chain" +/obj/item/clothing/ears/skrell/cloth_short/lightblue + name = "light blue headtail cloth" + icon_state = "skrell_cloth_lblue_male" + item_state = "skrell_cloth_lblue_male" -/obj/item/clothing/ears/skrell/bluejeweled_band - name = "skrell blue-jeweled headtail bands" - desc = "Golden metallic bands, decorated with blue jewels, worn by male skrell to adorn their head tails." - icon_state = "bluejeweled_band" - item_state = "bluejeweled_band" - -/obj/item/clothing/ears/skrell/silver_chain - name = "skrell silver headtail chains" - desc = "A delicate silver chain worn by female skrell to decorate their head tails." - icon_state = "silver_chain" - item_state = "silver_chain" - -/obj/item/clothing/ears/skrell/silver_band - name = "skrell silver headtail bands" - desc = "Silver metallic bands, decorated with blue jewels, worn by male skrell to adorn their head tails." - icon_state = "silver_band" - item_state = "silver_band" - -/obj/item/clothing/ears/skrell/blue_skrell_cloth_band_male - name = "skrell blue headtail cloth" - desc = "A blue cloth band worn by male skrell around their head tails." - icon_state = "blue_skrell_cloth_band_male" - item_state = "blue_skrell_cloth_band_male" - -/obj/item/clothing/ears/skrell/blue_skrell_cloth_band_female - name = "skrell blue headtail cloth" - desc = "A blue cloth band worn by female skrell around their head tails." - icon_state = "blue_skrell_cloth_band_female" - item_state = "blue_skrell_cloth_band_female" - -/obj/item/clothing/ears/skrell/purple_skrell_cloth_male +/obj/item/clothing/ears/skrell/cloth_short/purple name = "skrell purple head cloth" - desc = "A purple cloth band worn by male skrell around their head tails." - icon_state = "purple_skrell_cloth_male" - item_state = "purple_skrell_cloth_male" + desc = "A purple cloth band worn by skrell around their head tails." + icon_state = "skrell_cloth_purple_male" + item_state = "skrell_cloth_purple_male" \ No newline at end of file diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index 3170848dca2..64027447d11 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -977,15 +977,22 @@ skr_tentacle_m icon = 'icons/mob/human_face/skrell_hair.dmi' - name = "Skrell Male Tentacles" + name = "Skrell Short Tentacles" icon_state = "skrell_hair_m" species_allowed = list("Skrell") - gender = MALE skr_tentacle_f - name = "Skrell Female Tentacles" + name = "Skrell Average Tentacles" icon_state = "skrell_hair_f" - gender = FEMALE + + skr_tentacle_short + name = "Skrell Very Short Tentacles" + icon_state = "veryshort_s" + + skr_tentacle_long + name = "Skrell Very Long Tentacles" + icon_state = "verylong_s" + //tajaran hair diff --git a/html/changelogs/paradoxspace-youreakidnow.yml b/html/changelogs/paradoxspace-youreakidnow.yml new file mode 100644 index 00000000000..34fb7baf59e --- /dev/null +++ b/html/changelogs/paradoxspace-youreakidnow.yml @@ -0,0 +1,38 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: ParadoxSpace + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds two new headtail styles, three new headdress garments, and a bunch of cloths/bands." + - bugfix: "Darkens and brings in line the Skrell sprite with every other species sprite. Colors will now be more accurate, and you can now actually find a good green." diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi index b68977129c2..94a3b8c74bd 100644 Binary files a/icons/mob/ears.dmi and b/icons/mob/ears.dmi differ diff --git a/icons/mob/human_face/skrell_hair.dmi b/icons/mob/human_face/skrell_hair.dmi index d6382bf36b0..e0cfd3cf969 100644 Binary files a/icons/mob/human_face/skrell_hair.dmi and b/icons/mob/human_face/skrell_hair.dmi differ diff --git a/icons/mob/human_races/r_skrell.dmi b/icons/mob/human_races/r_skrell.dmi index cf6025879a0..4979f1b62da 100644 Binary files a/icons/mob/human_races/r_skrell.dmi and b/icons/mob/human_races/r_skrell.dmi differ diff --git a/icons/obj/clothing/ears.dmi b/icons/obj/clothing/ears.dmi index 9d2361b0498..c9efbc382bd 100644 Binary files a/icons/obj/clothing/ears.dmi and b/icons/obj/clothing/ears.dmi differ