diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index 6f22923f4e..e58fe948c4 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -107,28 +107,28 @@ /datum/gear/uniform/undercoat display_name = "undercoat selection (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat + path = /obj/item/clothing/under/seromi/undercoat/standard whitelisted = SPECIES_TESHARI sort_category = "Xenowear" /datum/gear/uniform/undercoat/New() ..() var/list/undercoats = list() - for(var/undercoat in typesof(/obj/item/clothing/under/seromi/undercoat)) + for(var/undercoat in typesof(/obj/item/clothing/under/seromi/undercoat/standard)) var/obj/item/clothing/under/seromi/undercoat/undercoat_type = undercoat undercoats[initial(undercoat_type.name)] = undercoat_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(undercoats)) /datum/gear/suit/cloak display_name = "cloak selection (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak + path = /obj/item/clothing/suit/storage/seromi/cloak/standard whitelisted = SPECIES_TESHARI sort_category = "Xenowear" /datum/gear/suit/cloak/New() ..() var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak)) + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/standard)) var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) diff --git a/code/modules/clothing/suits/aliens/seromi.dm b/code/modules/clothing/suits/aliens/seromi.dm index 49ca73c842..4f52c4dc42 100644 --- a/code/modules/clothing/suits/aliens/seromi.dm +++ b/code/modules/clothing/suits/aliens/seromi.dm @@ -8,132 +8,132 @@ species_restricted = list(SPECIES_TESHARI) body_parts_covered = UPPER_TORSO|ARMS -/obj/item/clothing/suit/storage/seromi/cloak/black_orange +/obj/item/clothing/suit/storage/seromi/cloak/standard/black_orange name = "black and orange cloak" icon_state = "tesh_cloak_bo" item_state = "tesh_cloak_bo" -/obj/item/clothing/suit/storage/seromi/cloak/black_grey +/obj/item/clothing/suit/storage/seromi/cloak/standard/black_grey name = "black and grey cloak" icon_state = "tesh_cloak_bg" item_state = "tesh_cloak_bg" -/obj/item/clothing/suit/storage/seromi/cloak/black_midgrey +/obj/item/clothing/suit/storage/seromi/cloak/standard/black_midgrey name = "black and medium grey cloak" icon_state = "tesh_cloak_bmg" item_state = "tesh_cloak_bmg" -/obj/item/clothing/suit/storage/seromi/cloak/black_lightgrey +/obj/item/clothing/suit/storage/seromi/cloak/standard/black_lightgrey name = "black and light grey cloak" icon_state = "tesh_cloak_blg" item_state = "tesh_cloak_blg" -/obj/item/clothing/suit/storage/seromi/cloak/black_white +/obj/item/clothing/suit/storage/seromi/cloak/standard/black_white name = "black and white cloak" icon_state = "tesh_cloak_bw" item_state = "tesh_cloak_bw" -/obj/item/clothing/suit/storage/seromi/cloak/black_red +/obj/item/clothing/suit/storage/seromi/cloak/standard/black_red name = "black and red cloak" icon_state = "tesh_cloak_br" item_state = "tesh_cloak_br" -/obj/item/clothing/suit/storage/seromi/cloak/black +/obj/item/clothing/suit/storage/seromi/cloak/standard/black name = "black cloak" icon_state = "tesh_cloak_bn" item_state = "tesh_cloak_bn" -/obj/item/clothing/suit/storage/seromi/cloak/black_yellow +/obj/item/clothing/suit/storage/seromi/cloak/standard/black_yellow name = "black and yellow cloak" icon_state = "tesh_cloak_by" item_state = "tesh_cloak_by" -/obj/item/clothing/suit/storage/seromi/cloak/black_green +/obj/item/clothing/suit/storage/seromi/cloak/standard/black_green name = "black and green cloak" icon_state = "tesh_cloak_bgr" item_state = "tesh_cloak_bgr" -/obj/item/clothing/suit/storage/seromi/cloak/black_blue +/obj/item/clothing/suit/storage/seromi/cloak/standard/black_blue name = "black and blue cloak" icon_state = "tesh_cloak_bbl" item_state = "tesh_cloak_bbl" -/obj/item/clothing/suit/storage/seromi/cloak/black_purple +/obj/item/clothing/suit/storage/seromi/cloak/standard/black_purple name = "black and purple cloak" icon_state = "tesh_cloak_bp" item_state = "tesh_cloak_bp" -/obj/item/clothing/suit/storage/seromi/cloak/black_pink +/obj/item/clothing/suit/storage/seromi/cloak/standard/black_pink name = "black and pink cloak" icon_state = "tesh_cloak_bpi" item_state = "tesh_cloak_bpi" -/obj/item/clothing/suit/storage/seromi/cloak/black_brown +/obj/item/clothing/suit/storage/seromi/cloak/standard/black_brown name = "black and brown cloak" icon_state = "tesh_cloak_bbr" item_state = "tesh_cloak_bbr" -/obj/item/clothing/suit/storage/seromi/cloak/orange_grey +/obj/item/clothing/suit/storage/seromi/cloak/standard/orange_grey name = "orange and grey cloak" icon_state = "tesh_cloak_og" item_state = "tesh_cloak_og" -/obj/item/clothing/suit/storage/seromi/cloak/rainbow +/obj/item/clothing/suit/storage/seromi/cloak/standard/rainbow name = "rainbow cloak" icon_state = "tesh_cloak_rainbow" item_state = "tesh_cloak_rainbow" -/obj/item/clothing/suit/storage/seromi/cloak/lightgrey_grey +/obj/item/clothing/suit/storage/seromi/cloak/standard/lightgrey_grey name = "light grey and grey cloak" icon_state = "tesh_cloak_lgg" item_state = "tesh_cloak_lgg" -/obj/item/clothing/suit/storage/seromi/cloak/white_grey +/obj/item/clothing/suit/storage/seromi/cloak/standard/white_grey name = "white and grey cloak" icon_state = "tesh_cloak_wg" item_state = "tesh_cloak_wg" -/obj/item/clothing/suit/storage/seromi/cloak/red_grey +/obj/item/clothing/suit/storage/seromi/cloak/standard/red_grey name = "red and grey cloak" icon_state = "tesh_cloak_rg" item_state = "tesh_cloak_rg" -/obj/item/clothing/suit/storage/seromi/cloak/orange +/obj/item/clothing/suit/storage/seromi/cloak/standard/orange name = "orange cloak" icon_state = "tesh_cloak_on" item_state = "tesh_cloak_on" -/obj/item/clothing/suit/storage/seromi/cloak/yellow_grey +/obj/item/clothing/suit/storage/seromi/cloak/standard/yellow_grey name = "yellow and grey cloak" icon_state = "tesh_cloak_yg" item_state = "tesh_cloak_yg" -/obj/item/clothing/suit/storage/seromi/cloak/green_grey +/obj/item/clothing/suit/storage/seromi/cloak/standard/green_grey name = "green and grey cloak" icon_state = "tesh_cloak_gg" item_state = "tesh_cloak_gg" -/obj/item/clothing/suit/storage/seromi/cloak/blue_grey +/obj/item/clothing/suit/storage/seromi/cloak/standard/blue_grey name = "blue and grey cloak" icon_state = "tesh_cloak_blug" item_state = "tesh_cloak_blug" -/obj/item/clothing/suit/storage/seromi/cloak/purple_grey +/obj/item/clothing/suit/storage/seromi/cloak/standard/purple_grey name = "purple and grey cloak" icon_state = "tesh_cloak_pg" item_state = "tesh_cloak_pg" -/obj/item/clothing/suit/storage/seromi/cloak/pink_grey +/obj/item/clothing/suit/storage/seromi/cloak/standard/pink_grey name = "pink and grey cloak" icon_state = "tesh_cloak_pig" item_state = "tesh_cloak_pig" -/obj/item/clothing/suit/storage/seromi/cloak/brown_grey +/obj/item/clothing/suit/storage/seromi/cloak/standard/brown_grey name = "brown and grey cloak" icon_state = "tesh_cloak_brg" item_state = "tesh_cloak_brg" -/obj/item/clothing/suit/storage/seromi/cloak/black_glow +/obj/item/clothing/suit/storage/seromi/cloak/standard/black_glow name = "black and glowing cloak" icon_state = "tesh_cloak_bglowing" item_state = "tesh_cloak_bglowing" diff --git a/code/modules/clothing/under/xenos/seromi.dm b/code/modules/clothing/under/xenos/seromi.dm index f3b74dd8ec..e451ae0c40 100644 --- a/code/modules/clothing/under/xenos/seromi.dm +++ b/code/modules/clothing/under/xenos/seromi.dm @@ -41,127 +41,127 @@ item_state = "tesh_uniform_bo" body_parts_covered = UPPER_TORSO|LOWER_TORSO -/obj/item/clothing/under/seromi/undercoat/black_orange +/obj/item/clothing/under/seromi/undercoat/standard/black_orange name = "black and orange undercoat" icon_state = "tesh_uniform_bo" item_state = "tesh_uniform_bo" -/obj/item/clothing/under/seromi/undercoat/black_grey +/obj/item/clothing/under/seromi/undercoat/standard/black_grey name = "black and grey undercoat" icon_state = "tesh_uniform_bg" item_state = "tesh_uniform_bg" -/obj/item/clothing/under/seromi/undercoat/black_midgrey +/obj/item/clothing/under/seromi/undercoat/standard/black_midgrey name = "black and medium grey undercoat" icon_state = "tesh_uniform_bmg" item_state = "tesh_uniform_bmg" -/obj/item/clothing/under/seromi/undercoat/black_lightgrey +/obj/item/clothing/under/seromi/undercoat/standard/black_lightgrey name = "black and light grey undercoat" icon_state = "tesh_uniform_blg" item_state = "tesh_uniform_blg" -/obj/item/clothing/under/seromi/undercoat/black_white +/obj/item/clothing/under/seromi/undercoat/standard/black_white name = "black and white undercoat" icon_state = "tesh_uniform_bw" item_state = "tesh_uniform_bw" -/obj/item/clothing/under/seromi/undercoat/black_red +/obj/item/clothing/under/seromi/undercoat/standard/black_red name = "black and red undercoat" icon_state = "tesh_uniform_br" item_state = "tesh_uniform_br" -/obj/item/clothing/under/seromi/undercoat/black +/obj/item/clothing/under/seromi/undercoat/standard/black name = "black undercoat" icon_state = "tesh_uniform_bn" item_state = "tesh_uniform_bn" -/obj/item/clothing/under/seromi/undercoat/black_yellow +/obj/item/clothing/under/seromi/undercoat/standard/black_yellow name = "black and yellow undercoat" icon_state = "tesh_uniform_by" item_state = "tesh_uniform_by" -/obj/item/clothing/under/seromi/undercoat/black_green +/obj/item/clothing/under/seromi/undercoat/standard/black_green name = "black and green undercoat" icon_state = "tesh_uniform_bgr" item_state = "tesh_uniform_bgr" -/obj/item/clothing/under/seromi/undercoat/black_blue +/obj/item/clothing/under/seromi/undercoat/standard/black_blue name = "black and blue undercoat" icon_state = "tesh_uniform_bbl" item_state = "tesh_uniform_bbl" -/obj/item/clothing/under/seromi/undercoat/black_purple +/obj/item/clothing/under/seromi/undercoat/standard/black_purple name = "black and purple undercoat" icon_state = "tesh_uniform_bp" item_state = "tesh_uniform_bp" -/obj/item/clothing/under/seromi/undercoat/black_pink +/obj/item/clothing/under/seromi/undercoat/standard/black_pink name = "black and pink undercoat" icon_state = "tesh_uniform_bpi" item_state = "tesh_uniform_bpi" -/obj/item/clothing/under/seromi/undercoat/black_brown +/obj/item/clothing/under/seromi/undercoat/standard/black_brown name = "black and brown undercoat" icon_state = "tesh_uniform_bbr" item_state = "tesh_uniform_bbr" -/obj/item/clothing/under/seromi/undercoat/orange_grey +/obj/item/clothing/under/seromi/undercoat/standard/orange_grey name = "orange and grey undercoat" icon_state = "tesh_uniform_og" item_state = "tesh_uniform_og" -/obj/item/clothing/under/seromi/undercoat/rainbow +/obj/item/clothing/under/seromi/undercoat/standard/rainbow name = "rainbow undercoat" icon_state = "tesh_uniform_rainbow" item_state = "tesh_uniform_rainbow" -/obj/item/clothing/under/seromi/undercoat/lightgrey_grey +/obj/item/clothing/under/seromi/undercoat/standard/lightgrey_grey name = "light grey and grey undercoat" icon_state = "tesh_uniform_lgg" item_state = "tesh_uniform_lgg" -/obj/item/clothing/under/seromi/undercoat/white_grey +/obj/item/clothing/under/seromi/undercoat/standard/white_grey name = "white and grey undercoat" icon_state = "tesh_uniform_wg" item_state = "tesh_uniform_wg" -/obj/item/clothing/under/seromi/undercoat/red_grey +/obj/item/clothing/under/seromi/undercoat/standard/red_grey name = "red and grey undercoat" icon_state = "tesh_uniform_rg" item_state = "tesh_uniform_rg" -/obj/item/clothing/under/seromi/undercoat/orange +/obj/item/clothing/under/seromi/undercoat/standard/orange name = "orange undercoat" icon_state = "tesh_uniform_on" item_state = "tesh_uniform_on" -/obj/item/clothing/under/seromi/undercoat/yellow_grey +/obj/item/clothing/under/seromi/undercoat/standard/yellow_grey name = "yellow and grey undercoat" icon_state = "tesh_uniform_yg" item_state = "tesh_uniform_yg" -/obj/item/clothing/under/seromi/undercoat/green_grey +/obj/item/clothing/under/seromi/undercoat/standard/green_grey name = "green and grey undercoat" icon_state = "tesh_uniform_gg" item_state = "tesh_uniform_gg" -/obj/item/clothing/under/seromi/undercoat/blue_grey +/obj/item/clothing/under/seromi/undercoat/standard/blue_grey name = "blue and grey undercoat" icon_state = "tesh_uniform_blug" item_state = "tesh_uniform_blug" -/obj/item/clothing/under/seromi/undercoat/purple_grey +/obj/item/clothing/under/seromi/undercoat/standard/purple_grey name = "purple and grey undercoat" icon_state = "tesh_uniform_pg" item_state = "tesh_uniform_pg" -/obj/item/clothing/under/seromi/undercoat/pink_grey +/obj/item/clothing/under/seromi/undercoat/standard/pink_grey name = "pink and grey undercoat" icon_state = "tesh_uniform_pig" item_state = "tesh_uniform_pig" -/obj/item/clothing/under/seromi/undercoat/brown_grey +/obj/item/clothing/under/seromi/undercoat/standard/brown_grey name = "brown and grey undercoat" icon_state = "tesh_uniform_brg" item_state = "tesh_uniform_brg"