diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index 80e6bb8ebf..d07e6c5cec 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -39,32 +39,24 @@ gear_tweaks += new/datum/gear_tweak/path(sortAssoc(bandtypes)) /datum/gear/ears/skrell/cloth/male - display_name = "male headtail cloth selection (Skrell)" - path = /obj/item/clothing/ears/skrell/cloth_male + display_name = "male headtail cloth (Skrell)" + path = /obj/item/clothing/ears/skrell/cloth_male/black sort_category = "Xenowear" whitelisted = "Skrell" /datum/gear/ears/skrell/cloth/male/New() ..() - var/list/clothtypes = list() - for(var/cloth_style in typesof(/obj/item/clothing/ears/skrell/cloth_male)) - var/obj/item/clothing/ears/skrell/cloth_male/cloth = cloth_style - clothtypes[initial(cloth.name)] = cloth - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(clothtypes)) + gear_tweaks = list(gear_tweak_free_color_choice) /datum/gear/ears/skrell/cloth/female - display_name = "female headtail cloth selection (Skrell)" - path = /obj/item/clothing/ears/skrell/cloth_female + display_name = "female headtail cloth (Skrell)" + path = /obj/item/clothing/ears/skrell/cloth_female/black sort_category = "Xenowear" whitelisted = "Skrell" /datum/gear/ears/skrell/cloth/female/New() ..() - var/list/clothtypes = list() - for(var/cloth_style in typesof(/obj/item/clothing/ears/skrell/cloth_female)) - var/obj/item/clothing/ears/skrell/cloth_female/cloth = cloth_style - clothtypes[initial(cloth.name)] = cloth - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(clothtypes)) + gear_tweaks = list(gear_tweak_free_color_choice) /datum/gear/ears/skrell/colored/band display_name = "Colored bands (Skrell)" diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index 9e2cdf02e0..ca1e835899 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -715,15 +715,25 @@ species_allowed = list("Unathi") //Skrell 'hairstyles' - skr_tentacle_m - name = "Skrell Male Tentacles" - icon_state = "skrell_hair_m" + skr_tentacle_veryshort + name = "Skrell Very Short Tentacles" + icon_state = "skrell_hair_veryshort" species_allowed = list("Skrell") gender = MALE - skr_tentacle_f - name = "Skrell Female Tentacles" - icon_state = "skrell_hair_f" + skr_tentacle_short + name = "Skrell Short Tentacles" + icon_state = "skrell_hair_short" + species_allowed = list("Skrell") + + skr_tentacle_average + name = "Skrell Average Tentacles" + icon_state = "skrell_hair_average" + species_allowed = list("Skrell") + + skr_tentacle_verylong + name = "Skrell Long Tentacles" + icon_state = "skrell_hair_verylong" species_allowed = list("Skrell") gender = FEMALE diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi index 7326be690e..14823c7801 100644 Binary files a/icons/mob/ears.dmi and b/icons/mob/ears.dmi differ diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index 201a8ffee5..adc3be70c1 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/icons/mob/human_races/r_def_skrell.dmi b/icons/mob/human_races/r_def_skrell.dmi index 1dd654054b..77fcb3cdbd 100644 Binary files a/icons/mob/human_races/r_def_skrell.dmi and b/icons/mob/human_races/r_def_skrell.dmi differ diff --git a/icons/mob/human_races/r_skrell.dmi b/icons/mob/human_races/r_skrell.dmi index 131fe57507..e35c2b5ad3 100644 Binary files a/icons/mob/human_races/r_skrell.dmi and b/icons/mob/human_races/r_skrell.dmi differ