diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index c7d93294aca..e053f3b8ef2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -107,29 +107,29 @@ /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)) - var/obj/item/clothing/under/seromi/undercoat/undercoat_type = undercoat + for(var/undercoat in typesof(/obj/item/clothing/under/seromi/undercoat/standard)) + var/obj/item/clothing/under/seromi/undercoat/standard/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)) - var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/standard)) + var/obj/item/clothing/suit/storage/seromi/cloak/standard/cloak_type = cloak cloaks[initial(cloak_type.name)] = cloak_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) @@ -160,4 +160,203 @@ for(var/cohesionsuit in (typesof(/obj/item/clothing/under/cohesion))) var/obj/item/clothing/under/cohesion/cohesion_type = cohesionsuit cohesionsuits[initial(cohesion_type.name)] = cohesion_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cohesionsuits)) \ No newline at end of file + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cohesionsuits)) + +/datum/gear/uniform/dept + whitelisted = SPECIES_TESHARI + sort_category = "Xenowear" + +/datum/gear/uniform/dept/undercoat/ce + display_name = "Teshari Chief Engineer Undercoat" + path = /obj/item/clothing/under/seromi/undercoat/jobs/ce + allowed_roles = list("Chief Engineer") + +/datum/gear/uniform/dept/undercoat/ce_w + display_name = "Teshari Chief Engineer Undercoat (White)" + path = /obj/item/clothing/under/seromi/undercoat/jobs/ce_w + allowed_roles = list("Chief Engineer") +/* +/datum/gear/uniform/undercoat/rd + display_name = "cloak, research director" + path = /obj/item/clothing/accessory/poncho/roles/cloak/rd + allowed_roles = list("Research Director") +*/ +/datum/gear/uniform/dept/undercoat/qm + display_name = "Teshari Quarter Master Undercoat" + path = /obj/item/clothing/under/seromi/undercoat/jobs/qm + allowed_roles = list("Quartermaster") + +/datum/gear/uniform/dept/undercoat/command + display_name = "Teshari Command Undercoat" + path = /obj/item/clothing/under/seromi/undercoat/jobs/command + allowed_roles = list("Colony Director","Head of Personnel","Head of Security","Chief Engineer","Chief Medical Officer") + +/datum/gear/uniform/dept/undercoat/command_g + display_name = "Teshari Command Undercoat (gold buttons)" + path = /obj/item/clothing/under/seromi/undercoat/jobs/command_g + allowed_roles = list("Colony Director","Head of Personnel","Head of Security","Chief Engineer","Chief Medical Officer") + +/datum/gear/uniform/dept/undercoat/cmo + display_name = "Teshari Chief Medical Officer Undercoat" + path = /obj/item/clothing/under/seromi/undercoat/jobs/cmo + allowed_roles = list("Chief Medical Officer") + +/datum/gear/uniform/dept/undercoat/cargo + display_name = "Teshari Cargo Undercoat" + path = /obj/item/clothing/under/seromi/undercoat/jobs/cargo + allowed_roles = list("Cargo Technician","Quartermaster","Shaft Miner") + +/datum/gear/uniform/dept/undercoat/mining + display_name = "Teshari Mining Undercoat" + path = /obj/item/clothing/accessory/poncho/roles/cloak/mining + allowed_roles = list("Quartermaster","Shaft Miner") + +/datum/gear/uniform/dept/undercoat/security + display_name = "Teshari Security Undercoat" + path = /obj/item/clothing/under/seromi/undercoat/jobs/sec + allowed_roles = list("Head of Security","Detective","Warden","Security Officer",) + +/datum/gear/uniform/dept/undercoat/service + display_name = "Teshari Service Undercoat" + path = /obj/item/clothing/under/seromi/undercoat/jobs/service + allowed_roles = list("Head of Personnel","Bartender","Botanist","Janitor","Chef","Librarian") + +/datum/gear/uniform/dept/undercoat/engineer + display_name = "Teshari Engineer Undercoat" + path = /obj/item/clothing/under/seromi/undercoat/jobs/engineer + allowed_roles = list("Chief Engineer","Station Engineer") + +/datum/gear/uniform/dept/undercoat/atmos + display_name = "Teshari Atmos Tech Undercoat" + path = /obj/item/clothing/under/seromi/undercoat/jobs/atmos + allowed_roles = list("Chief Engineer","Atmospheric Technician") + +/datum/gear/uniform/dept/undercoat/research + display_name = "Teshari Science Undercoat" + path = /obj/item/clothing/under/seromi/undercoat/jobs/sci + allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist") + +/datum/gear/uniform/dept/undercoat/robo + display_name = "Teshari Roboticist Undercoat" + path = /obj/item/clothing/under/seromi/undercoat/jobs/robo + allowed_roles = list("Roboticist") + +/datum/gear/uniform/dept/undercoat/medical + display_name = "Teshari Medical Undercoat" + path = /obj/item/clothing/under/seromi/undercoat/jobs/medical + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") + +/datum/gear/uniform/dept/undercoat/chemistry + display_name = "Teshari Chemistry Undercoat" + path = /obj/item/clothing/under/seromi/undercoat/jobs/chemistry + allowed_roles = list("Chemist") + +/datum/gear/uniform/dept/undercoat/virology + display_name = "Teshari Medical Undercoat" + path = /obj/item/clothing/under/seromi/undercoat/jobs/viro + allowed_roles = list("Medical Doctor") + +/datum/gear/uniform/dept/undercoat/paramedic + display_name = "Teshari Paramedic Undercoat" + path = /obj/item/clothing/under/seromi/undercoat/jobs/para + allowed_roles = list("Paramedic") + +/datum/gear/uniform/dept/undercoat/iaa + display_name = "Teshari IAA Undercoat" + path = /obj/item/clothing/under/seromi/undercoat/jobs/iaa + allowed_roles = list("Internal Affairs Agent") + +/datum/gear/suit/dept/cloak/ + whitelisted = SPECIES_TESHARI + sort_category = "Xenowear" + +/datum/gear/suit/cloak/dept/ce + display_name = "Teshari Chief Engineer Cloak" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/ce + allowed_roles = list("Chief Engineer") +/* +/datum/gear/suit/cloak/rd + display_name = "cloak, research director" + path = /obj/item/clothing/accessory/poncho/roles/cloak/rd + allowed_roles = list("Research Director") +*/ + +/datum/gear/suit/dept/cloak/qm + display_name = "Teshari Quarter Master Cloak" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/qm + allowed_roles = list("Quartermaster") + +/datum/gear/suit/dept/cloak/command + display_name = "Teshari Command Cloak" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/command + allowed_roles = list("Colony Director","Head of Personnel","Head of Security","Chief Engineer","Chief Medical Officer") + +/datum/gear/suit/dept/cloak/cmo + display_name = "Teshari Chief Medical Officer Cloak" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/cmo + allowed_roles = list("Chief Medical Officer") + +/datum/gear/suit/dept/cloak/cargo + display_name = "Teshari Cargo Cloak" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/cargo + allowed_roles = list("Cargo Technician","Quartermaster","Shaft Miner") + +/datum/gear/suit/dept/cloak/mining + display_name = "Teshari Mining Cloak" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/mining + allowed_roles = list("Quartermaster","Shaft Miner") + +/datum/gear/suit/dept/cloak/security + display_name = "Teshari Security Cloak" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/sec + allowed_roles = list("Head of Security","Detective","Warden","Security Officer",) + +/datum/gear/suit/dept/cloak/service + display_name = "Teshari Service Cloak" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/service + allowed_roles = list("Head of Personnel","Bartender","Botanist","Janitor","Chef","Librarian") + +/datum/gear/suit/dept/cloak/engineer + display_name = "Teshari Engineer Cloak" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/eningeer + allowed_roles = list("Chief Engineer","Station Engineer") + +/datum/gear/suit/dept/cloak/atmos + display_name = "Teshari Atmos Tech Cloak" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/atmos + allowed_roles = list("Chief Engineer","Atmospheric Technician") + +/datum/gear/suit/dept/cloak/research + display_name = "Teshari Science Cloak" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/sci + allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist") + +/datum/gear/suit/dept/cloak/robo + display_name = "Teshari Roboticist Cloak" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/robo + allowed_roles = list("Roboticist") + +/datum/gear/suit/dept/cloak/medical + display_name = "Teshari Medical Cloak" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/medical + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") + +/datum/gear/suit/dept/cloak/chemistry + display_name = "Teshari Chemistry Cloak" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/chemistry + allowed_roles = list("Chemist") + +/datum/gear/suit/dept/cloak/virology + display_name = "Teshari Medical Cloak" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/viro + allowed_roles = list("Medical Doctor") + +/datum/gear/suit/dept/cloak/paramedic + display_name = "Teshari Paramedic Cloak" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/para + allowed_roles = list("Paramedic") + +/datum/gear/suit/dept/cloak/iaa + display_name = "Teshari IAA Cloak" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/iaa + allowed_roles = list("Internal Affairs Agent") diff --git a/code/modules/clothing/suits/aliens/seromi.dm b/code/modules/clothing/suits/aliens/seromi.dm index 62a013644f1..4e3e081a7bb 100644 --- a/code/modules/clothing/suits/aliens/seromi.dm +++ b/code/modules/clothing/suits/aliens/seromi.dm @@ -1,5 +1,5 @@ /obj/item/clothing/suit/storage/seromi/cloak - name = "black and orange cloak " + name = "broken cloak" desc = "It drapes over a Teshari's shoulders and closes at the neck with pockets convienently placed inside." icon = 'icons/mob/species/seromi/teshari_cloak.dmi' icon_override = 'icons/mob/species/seromi/teshari_cloak.dmi' @@ -8,127 +8,232 @@ 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" \ No newline at end of file + item_state = "tesh_cloak_brg" + +/obj/item/clothing/suit/storage/seromi/cloak/jobs + icon_override = 'icons/mob/species/seromi/deptcloak.dmi' + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/cargo + name = "Cargo cloak" + desc = "A soft Teshari cloak made for the Cargo department" + icon_state = "tesh_cloak_car" + item_state = "tesh_cloak_car" + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/mining + name = "Mining cloak" + desc = "A soft Teshari cloak made for Mining" + icon_state = "tesh_cloak_mine" + item_state = "tesh_cloak_mine" + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/command + name = "Command cloak" + desc = "A soft Teshari cloak made for the Command department" + icon_state = "tesh_cloak_comm" + item_state = "tesh_cloak_comm" + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/ce + name = "Cheif Engineer's cloak" + desc = "A soft Teshari cloak made the Chief Engineer" + icon_state = "tesh_cloak_ce" + item_state = "tesh_cloak_ce" + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/eningeer + name = "Engineering cloak" + desc = "A soft Teshari cloak made for the Engineering department" + icon_state = "tesh_cloak_engie" + item_state = "tesh_cloak_engie" + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/atmos + name = "Atmos Tech cloak" + desc = "A soft Teshari cloak made for the Atmos Tech" + icon_state = "tesh_cloak_atmos" + item_state = "tesh_cloak_atmos" + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/cmo + name = "Chief Medical Officer cloak" + desc = "A soft Teshari cloak made the Cheif Medical Officer" + icon_state = "tesh_cloak_cmo" + item_state = "tesh_cloak_cmo" + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/medical + name = "Medical cloak" + desc = "A soft Teshari cloak made for the Medical department" + icon_state = "tesh_cloak_doc" + item_state = "tesh_cloak_doc" + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/chemistry + name = "Chemistry cloak" + desc = "A soft Teshari cloak made for the Chemist" + icon_state = "tesh_cloak_chem" + item_state = "tesh_cloak_chem" + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/viro + name = "Virologist cloak" + desc = "A soft Teshari cloak made for the Virologist" + icon_state = "tesh_cloak_viro" + item_state = "tesh_cloak_viro" + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/para + name = "Paramedic cloak" + desc = "A soft Teshari cloak made for the Paramedic" + icon_state = "tesh_cloak_para" + item_state = "tesh_cloak_para" + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/sci + name = "Scientist cloak" + desc = "A soft Teshari cloak made for the Science department" + icon_state = "tesh_cloak_sci" + item_state = "tesh_cloak_sci" + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/robo + name = "Roboticist cloak" + desc = "A soft Teshari cloak made for the Roboticist" + icon_state = "tesh_cloak_robo" + item_state = "tesh_cloak_robo" + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/sec + name = "Security cloak" + desc = "A soft Teshari cloak made for the Security department" + icon_state = "tesh_cloak_sec" + item_state = "tesh_cloak_sec" + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/qm + name = "Quarter master's cloak" + desc = "A soft Teshari cloak made for the Quarter Master (Who is a real head btw)" + icon_state = "tesh_cloak_qm" + item_state = "tesh_cloak_qm" + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/service + name = "Service cloak" + desc = "A soft Teshari cloak made for the Service department" + icon_state = "tesh_uniform_serv" + item_state = "tesh_uniform_serv" + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/iaa + name = "Iaa cloak" + desc = "A soft Teshari cloak made for the Internal Affairs Agent" + icon_state = "tesh_uniform_iaa" + item_state = "tesh_uniform_iaa" \ No newline at end of file diff --git a/code/modules/clothing/under/xenos/seromi.dm b/code/modules/clothing/under/xenos/seromi.dm index 9d6598a5179..2c3d550183c 100644 --- a/code/modules/clothing/under/xenos/seromi.dm +++ b/code/modules/clothing/under/xenos/seromi.dm @@ -34,6 +34,7 @@ icon_state = "seromi_rainbow" /obj/item/clothing/under/seromi/undercoat + name = "Undercoat" desc = "A Teshari traditional garb, with a modern twist! Made of micro and nanofibres to make it light and billowy, perfect for going fast and stylishly!" icon = 'icons/mob/species/seromi/teshari_uniform.dmi' icon_override = 'icons/mob/species/seromi/teshari_uniform.dmi' @@ -41,127 +42,244 @@ 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" \ No newline at end of file + item_state = "tesh_uniform_brg" + +/obj/item/clothing/under/seromi/undercoat/jobs + icon_override = 'icons/mob/species/seromi/deptjacket.dmi' + +/obj/item/clothing/under/seromi/undercoat/jobs/cargo + name = "Cargo undercoat" + desc = "A traditional Teshari garb made for the Cargo department" + icon_state = "tesh_uniform_car" + item_state = "tesh_uniform_car" + +/obj/item/clothing/under/seromi/undercoat/jobs/mining + name = "Mining undercoat" + desc = "A traditional Teshari garb made for Mining" + icon_state = "tesh_uniform_mine" + item_state = "tesh_uniform_mine" + +/obj/item/clothing/under/seromi/undercoat/jobs/command + name = "Command undercoat" + desc = "A traditional Teshari garb made for the Command department" + icon_state = "tesh_uniform_comm" + item_state = "tesh_uniform_comm" + +/obj/item/clothing/under/seromi/undercoat/jobs/command_g + name = "Command undercoat (gold buttons)" + desc = "A traditional Teshari garb made for the Command department" + icon_state = "tesh_uniform_comm_g" + item_state = "tesh_uniform_comm_g" + +/obj/item/clothing/under/seromi/undercoat/jobs/ce + name = "Cheif Engineer's undercoat" + desc = "A traditional Teshari garb made for the Chief Engineer" + icon_state = "tesh_uniform_ce" + item_state = "tesh_uniform_ce" + +/obj/item/clothing/under/seromi/undercoat/jobs/ce_w + name = "Cheif Engineer's undercoat (white)" + desc = "A traditional Teshari garb made for the department" + icon_state = "tesh_uniform_ce_w" + item_state = "tesh_uniform_ce_w" + +/obj/item/clothing/under/seromi/undercoat/jobs/engineer + name = "Engineering undercoat" + desc = "A traditional Teshari garb made for the Engineering department" + icon_state = "tesh_uniform_engie" + item_state = "tesh_uniform_engie" + +/obj/item/clothing/under/seromi/undercoat/jobs/atmos + name = "Atmos Tech undercoat" + desc = "A traditional Teshari garb made for the Atmos Tech" + icon_state = "tesh_uniform_atmos" + item_state = "tesh_uniform_atmos" + +/obj/item/clothing/under/seromi/undercoat/jobs/cmo + name = "Chief Medical Officer undercoat" + desc = "A traditional Teshari garb made for the Cheif Medical Officer" + icon_state = "tesh_uniform_cmo" + item_state = "tesh_uniform_cmo" + +/obj/item/clothing/under/seromi/undercoat/jobs/medical + name = "Medical undercoat" + desc = "A traditional Teshari garb made for the Medical department" + icon_state = "tesh_uniform_doc" + item_state = "tesh_uniform_doc" + +/obj/item/clothing/under/seromi/undercoat/jobs/chemistry + name = "Chemistry undercoat" + desc = "A traditional Teshari garb made for the Chemist" + icon_state = "tesh_uniform_chem" + item_state = "tesh_uniform_chem" + +/obj/item/clothing/under/seromi/undercoat/jobs/viro + name = "Virologist undercoat" + desc = "A traditional Teshari garb made for the Virologist" + icon_state = "tesh_uniform_viro" + item_state = "tesh_uniform_viro" + +/obj/item/clothing/under/seromi/undercoat/jobs/para + name = "Paramedic undercoat" + desc = "A traditional Teshari garb made for the Paramedic" + icon_state = "tesh_uniform_para" + item_state = "tesh_uniform_para" + +/obj/item/clothing/under/seromi/undercoat/jobs/sci + name = "Scientist undercoat" + desc = "A traditional Teshari garb made for the Science department" + icon_state = "tesh_uniform_sci" + item_state = "tesh_uniform_sci" + +/obj/item/clothing/under/seromi/undercoat/jobs/robo + name = "Roboticist undercoat" + desc = "A traditional Teshari garb made for the Roboticist" + icon_state = "tesh_uniform_robo" + item_state = "tesh_uniform_robo" + +/obj/item/clothing/under/seromi/undercoat/jobs/sec + name = "Security undercoat" + desc = "A traditional Teshari garb made for the Security department" + icon_state = "tesh_uniform_sec" + item_state = "tesh_uniform_sec" + +/obj/item/clothing/under/seromi/undercoat/jobs/qm + name = "Quarter master's undercoat" + desc = "A traditional Teshari garb made for the Quarter Master (Who is a real head btw)" + icon_state = "tesh_uniform_qm" + item_state = "tesh_uniform_qm" + +/obj/item/clothing/under/seromi/undercoat/jobs/service + name = "Service undercoat" + desc = "A traditional Teshari garb made for the Service department" + icon_state = "tesh_uniform_serv" + item_state = "tesh_uniform_serv" + +/obj/item/clothing/under/seromi/undercoat/jobs/iaa + name = "IAA undercoat" + desc = "A traditional Teshari garb made for the Internal Affairs Agent" + icon_state = "tesh_uniform_iaa" + item_state = "tesh_uniform_iaa" diff --git a/icons/mob/species/seromi/deptcloak.dmi b/icons/mob/species/seromi/deptcloak.dmi new file mode 100644 index 00000000000..532c208187e Binary files /dev/null and b/icons/mob/species/seromi/deptcloak.dmi differ diff --git a/icons/mob/species/seromi/deptjacket.dmi b/icons/mob/species/seromi/deptjacket.dmi new file mode 100644 index 00000000000..c43e44c1e5c Binary files /dev/null and b/icons/mob/species/seromi/deptjacket.dmi differ