diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index cc171a08b19..0d0f392e9a8 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -15,6 +15,18 @@ ..() gear_tweaks += gear_tweak_free_color_choice +/datum/gear/eyes/blindfold + display_name = "blindfold" + path = /obj/item/clothing/glasses/sunglasses/blindfold + +/datum/gear/eyes/whiteblindfold //I may have lost my sight, but at least these folks can see my RAINBOW BLINDFOLD + display_name = "blindfold, white (recolorable)" + path = /obj/item/clothing/glasses/sunglasses/blindfold/whiteblindfold + +/datum/gear/eyes/whiteblindfold/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + /datum/gear/eyes/glasses display_name = "Glasses, prescription" path = /obj/item/clothing/glasses/regular diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index 1bef387bddc..31a497c8977 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -166,36 +166,41 @@ whitelisted = SPECIES_TESHARI sort_category = "Xenowear" +/datum/gear/uniform/dept/undercoat/cap + display_name = "facility director undercoat (Teshari)" + path = /obj/item/clothing/under/seromi/undercoat/jobs/cap + allowed_roles = list("Facility Director") + +/datum/gear/uniform/dept/undercoat/hop + display_name = "head of personnel undercoat (Teshari)" + path = /obj/item/clothing/under/seromi/undercoat/jobs/hop + allowed_roles = list("Head of Personnel") + +/datum/gear/uniform/dept/undercoat/rd + display_name = "research director undercoat (Teshari)" + path = /obj/item/clothing/under/seromi/undercoat/jobs/rd + allowed_roles = list("Research Director") + +/datum/gear/uniform/dept/undercoat/hos + display_name = "head of security undercoat (Teshari)" + path = /obj/item/clothing/under/seromi/undercoat/jobs/hos + allowed_roles = list("Head of Security") + /datum/gear/uniform/dept/undercoat/ce display_name = "chief engineer undercoat (Teshari)" path = /obj/item/clothing/under/seromi/undercoat/jobs/ce allowed_roles = list("Chief Engineer") -/datum/gear/uniform/dept/undercoat/ce_w - display_name = "chief engineer undercoat - white (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/ce_w - allowed_roles = list("Chief Engineer") +/datum/gear/uniform/dept/undercoat/cmo + display_name = "chief medical officer undercoat (Teshari)" + path = /obj/item/clothing/under/seromi/undercoat/jobs/cmo + allowed_roles = list("Chief Medical Officer") /datum/gear/uniform/dept/undercoat/qm display_name = "quartermaster undercoat (Teshari)" path = /obj/item/clothing/under/seromi/undercoat/jobs/qm allowed_roles = list("Quartermaster") -/datum/gear/uniform/dept/undercoat/command - display_name = "command undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/command - allowed_roles = list("Site Manager","Head of Personnel","Head of Security","Chief Engineer","Chief Medical Officer","Research Director") - -/datum/gear/uniform/dept/undercoat/command_g - display_name = "command undercoat - gold buttons (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/command_g - allowed_roles = list("Site Manager","Head of Personnel","Head of Security","Chief Engineer","Chief Medical Officer","Research Director") - -/datum/gear/uniform/dept/undercoat/cmo - display_name = "chief medical officer undercoat (Teshari)" - path = /obj/item/clothing/under/seromi/undercoat/jobs/cmo - allowed_roles = list("Chief Medical Officer") - /datum/gear/uniform/dept/undercoat/cargo display_name = "cargo undercoat (Teshari)" path = /obj/item/clothing/under/seromi/undercoat/jobs/cargo @@ -214,7 +219,7 @@ /datum/gear/uniform/dept/undercoat/service display_name = "service undercoat (Teshari)" path = /obj/item/clothing/under/seromi/undercoat/jobs/service - allowed_roles = list("Head of Personnel","Bartender","Botanist","Janitor","Chef","Librarian") + allowed_roles = list("Head of Personnel","Bartender","Botanist","Janitor","Chef","Librarian","Chaplain") /datum/gear/uniform/dept/undercoat/engineer display_name = "engineering undercoat (Teshari)" @@ -234,122 +239,283 @@ /datum/gear/uniform/dept/undercoat/robo display_name = "roboticist undercoat (Teshari)" path = /obj/item/clothing/under/seromi/undercoat/jobs/robo - allowed_roles = list("Roboticist") + allowed_roles = list("Research Director","Roboticist") /datum/gear/uniform/dept/undercoat/medical display_name = "medical undercoat (Teshari)" path = /obj/item/clothing/under/seromi/undercoat/jobs/medical - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Psychiatrist") /datum/gear/uniform/dept/undercoat/chemistry display_name = "chemist undercoat (Teshari)" path = /obj/item/clothing/under/seromi/undercoat/jobs/chemistry - allowed_roles = list("Chemist") + allowed_roles = list("Chief Medical Officer","Chemist") /datum/gear/uniform/dept/undercoat/virology display_name = "virologist undercoat (Teshari)" path = /obj/item/clothing/under/seromi/undercoat/jobs/viro - allowed_roles = list("Medical Doctor") + allowed_roles = list("Chief Medical Officer","Medical Doctor") + +/datum/gear/uniform/dept/undercoat/psych + display_name = "psychiatrist undercoat (Teshari)" + path = /obj/item/clothing/under/seromi/undercoat/jobs/psych + allowed_roles = list("Chief Medical Officer","Psychiatrist") /datum/gear/uniform/dept/undercoat/paramedic display_name = "paramedic undercoat (Teshari)" path = /obj/item/clothing/under/seromi/undercoat/jobs/para - allowed_roles = list("Paramedic") + allowed_roles = list("Chief Medical Officer","Paramedic") /datum/gear/uniform/dept/undercoat/iaa display_name = "internal affairs undercoat (Teshari)" path = /obj/item/clothing/under/seromi/undercoat/jobs/iaa allowed_roles = list("Internal Affairs Agent") -/datum/gear/suit/dept/cloak/ +/datum/gear/suit/dept/cloak whitelisted = SPECIES_TESHARI sort_category = "Xenowear" +/datum/gear/suit/dept/cloak/cap + display_name = "facility director cloak (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs + allowed_roles = list("Facility Director") + +/datum/gear/suit/dept/cloak/hop + display_name = "head of personnel cloak (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/hop + allowed_roles = list("Head of Personnel") + +/datum/gear/suit/dept/cloak/rd + display_name = "research director cloak (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/rd + allowed_roles = list("Research Director") + +/datum/gear/suit/dept/cloak/hos + display_name = "head of security cloak (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/hos + allowed_roles = list("Head of Security") + +/datum/gear/suit/dept/cloak/hos/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/hos,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/hos)) + var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + /datum/gear/suit/cloak/dept/ce display_name = "chief engineer cloak (Teshari)" path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/ce allowed_roles = list("Chief Engineer") -/datum/gear/suit/dept/cloak/qm - display_name = "quartermaster cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/qm - allowed_roles = list("Quartermaster") - -/datum/gear/suit/dept/cloak/command - display_name = "command cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/command - allowed_roles = list("Site Manager","Head of Personnel","Head of Security","Chief Engineer","Chief Medical Officer","Research Director") +/datum/gear/suit/dept/cloak/ce/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/ce,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/ce)) + var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/cmo display_name = "chief medical officer cloak (Teshari)" path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/cmo allowed_roles = list("Chief Medical Officer") +/datum/gear/suit/dept/cloak/cmo/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/cmo,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cmo)) + var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/qm + display_name = "quartermaster cloak (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/qm + allowed_roles = list("Chief Medical Officer") + +/datum/gear/suit/dept/cloak/qm/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/qm,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/qm)) + var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + /datum/gear/suit/dept/cloak/cargo display_name = "cargo cloak (Teshari)" path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/cargo - allowed_roles = list("Cargo Technician","Quartermaster","Shaft Miner") + allowed_roles = list("Quartermaster","Shaft Miner","Cargo Technician") + +/datum/gear/suit/dept/cloak/cargo/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/cargo,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cargo)) + var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/mining display_name = "mining cloak (Teshari)" path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/mining allowed_roles = list("Quartermaster","Shaft Miner") +/datum/gear/suit/dept/cloak/mining/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/mining,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/mining)) + var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + /datum/gear/suit/dept/cloak/security display_name = "security cloak (Teshari)" path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/sec - allowed_roles = list("Head of Security","Detective","Warden","Security Officer",) + allowed_roles = list("Head of Security","Detective","Warden","Security Officer") + +/datum/gear/suit/dept/cloak/security/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/sec,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/sec)) + var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/service display_name = "service cloak (Teshari)" path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/service - allowed_roles = list("Head of Personnel","Bartender","Botanist","Janitor","Chef","Librarian") + allowed_roles = list("Head of Personnel","Bartender","Botanist","Janitor","Chef","Librarian","Chaplain") + +/datum/gear/suit/dept/cloak/service/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/service,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/service)) + var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/engineer display_name = "engineering cloak (Teshari)" - path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/eningeer + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/engineer allowed_roles = list("Chief Engineer","Station Engineer") +/datum/gear/suit/dept/cloak/engineer/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/engineer,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/engineer)) + var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + /datum/gear/suit/dept/cloak/atmos display_name = "atmospherics cloak (Teshari)" path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/atmos allowed_roles = list("Chief Engineer","Atmospheric Technician") +/datum/gear/suit/dept/cloak/atmos/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/atmos,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/atmos)) + var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + /datum/gear/suit/dept/cloak/research display_name = "scientist cloak (Teshari)" path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/sci - allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist") + allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist") + +/datum/gear/suit/dept/cloak/research/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/sci,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/sci)) + var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/robo display_name = "roboticist cloak (Teshari)" path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/robo - allowed_roles = list("Roboticist") + allowed_roles = list("Research Director","Roboticist") + +/datum/gear/suit/dept/cloak/robo/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/robo,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/robo)) + var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/medical display_name = "medical cloak (Teshari)" path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/medical - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist", "Psychiatrist") + +/datum/gear/suit/dept/cloak/medical/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/medical,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/medical)) + var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/chemistry display_name = "chemist cloak (Teshari)" path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/chemistry allowed_roles = list("Chemist") +/datum/gear/suit/dept/cloak/chemistry/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/chemistry,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/chemistry)) + var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + /datum/gear/suit/dept/cloak/virology display_name = "virologist cloak (Teshari)" path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/viro allowed_roles = list("Medical Doctor") +/datum/gear/suit/dept/cloak/virology/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/viro,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/viro)) + var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/dept/cloak/psych + display_name = "psychiatrist cloak (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/psych + allowed_roles = list("Chief Medical Officer","Psychiatrist") + /datum/gear/suit/dept/cloak/paramedic display_name = "paramedic cloak (Teshari)" path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/para - allowed_roles = list("Paramedic") + allowed_roles = list("Chief Medical Officer","Paramedic") + +/datum/gear/suit/dept/cloak/paramedic/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/para,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/para)) + var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) /datum/gear/suit/dept/cloak/iaa display_name = "internal affairs cloak (Teshari)" path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/iaa allowed_roles = list("Internal Affairs Agent") +/datum/gear/suit/dept/cloak/iaa/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/iaa,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/iaa)) + var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + /datum/gear/uniform/smockcolor display_name = "smock, recolorable (Teshari)" path = /obj/item/clothing/under/seromi/smock/white @@ -360,6 +526,73 @@ ..() gear_tweaks += gear_tweak_free_color_choice +/datum/gear/suit/beltcloak + display_name = "belted cloak selection (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/beltcloak/standard + whitelisted = SPECIES_TESHARI + sort_category = "Xenowear" + +/datum/gear/suit/beltcloak/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/beltcloak/standard)) + var/obj/item/clothing/suit/storage/seromi/beltcloak/standard/cloak_type = cloak + cloaks[initial(cloak_type.name)] = cloak_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) + +/datum/gear/suit/beltcloak_color + display_name = "belted cloak, recolorable (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/beltcloak/standard/white_grey + whitelisted = SPECIES_TESHARI + sort_category = "Xenowear" + +/datum/gear/suit/beltcloak_color/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/suit/dept/beltcloak/wrdn + display_name = "warden belted cloak (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/wrdn + allowed_roles = list("Head of Security","Warden") + +/datum/gear/suit/dept/beltcloak/jani + display_name = "janitor belted cloak (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/jani + allowed_roles = list("Janitor") + +/datum/gear/suit/dept/beltcloak/cmd + display_name = "command belted cloak (Teshari)" + path = /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/command + allowed_roles = list("Site Manager","Head of Personnel","Head of Security","Chief Engineer","Chief Medical Officer","Research Director") + +/datum/gear/suit/cloak_hood + display_name = "hooded cloak selection (Teshari)" + path = /obj/item/clothing/suit/storage/hooded/teshari/standard + whitelisted = SPECIES_TESHARI + sort_category = "Xenowear" + +/datum/gear/suit/cloak_hood/New() + ..() + var/list/cloaks = list() + for(var/cloak in typesof(/obj/item/clothing/suit/storage/hooded/teshari/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)) + +/datum/gear/uniform/worksuit + display_name = "worksuit selection (Teshari)" + path = /obj/item/clothing/under/seromi/undercoat/standard/worksuit + whitelisted = SPECIES_TESHARI + sort_category = "Xenowear" + +/datum/gear/uniform/worksuit/New() + ..() + var/list/worksuits = list() + for(var/worksuit in typesof(/obj/item/clothing/under/seromi/undercoat/standard/worksuit)) + var/obj/item/clothing/under/seromi/undercoat/standard/worksuit/worksuit_type = worksuit + worksuits[initial(worksuit_type.name)] = worksuit_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(worksuits)) + /datum/gear/uniform/undercoatcolor display_name = "undercoat, recolorable (Teshari)" path = /obj/item/clothing/under/seromi/undercoat/standard/white_grey diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 01933572248..18a3efe8fa2 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -392,6 +392,11 @@ BLIND // can't see anything drop_sound = 'sound/items/drop/gloves.ogg' pickup_sound = 'sound/items/pickup/gloves.ogg' +/obj/item/clothing/glasses/sunglasses/blindfold/whiteblindfold + name = "white blindfold" + desc = "A white blindfold that covers the eyes, preventing sight." + icon_state = "blindfoldwhite" + /obj/item/clothing/glasses/sunglasses/blindfold/tape name = "length of tape" desc = "It's a robust DIY blindfold!" diff --git a/code/modules/clothing/suits/aliens/seromi.dm b/code/modules/clothing/suits/aliens/seromi.dm index 0bea907fbe1..4ce78dff7b2 100644 --- a/code/modules/clothing/suits/aliens/seromi.dm +++ b/code/modules/clothing/suits/aliens/seromi.dm @@ -1,47 +1,23 @@ +// Standard Cloaks /obj/item/clothing/suit/storage/seromi/cloak - name = "broken cloak" + name = "black 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' - icon_state = "tesh_cloak_bo" - item_state = "tesh_cloak_bo" + icon_state = "tesh_cloak_bn" + item_state = "tesh_cloak_bn" species_restricted = list(SPECIES_TESHARI) body_parts_covered = UPPER_TORSO|ARMS -/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/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/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/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/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/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/standard/black - name = "black cloak" - icon_state = "tesh_cloak_bn" - item_state = "tesh_cloak_bn" +/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/standard/black_yellow name = "black and yellow cloak" @@ -73,20 +49,20 @@ icon_state = "tesh_cloak_bbr" item_state = "tesh_cloak_bbr" -/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/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/standard/rainbow - name = "rainbow cloak" - icon_state = "tesh_cloak_rainbow" - item_state = "tesh_cloak_rainbow" +/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/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/standard/white + name = "white cloak" + icon_state = "tesh_cloak_wn" + item_state = "tesh_cloak_wn" /obj/item/clothing/suit/storage/seromi/cloak/standard/white_grey name = "white and grey cloak" @@ -98,10 +74,10 @@ icon_state = "tesh_cloak_rg" item_state = "tesh_cloak_rg" -/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/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/standard/yellow_grey name = "yellow and grey cloak" @@ -133,10 +109,46 @@ icon_state = "tesh_cloak_brg" item_state = "tesh_cloak_brg" +/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/standard/orange + name = "orange cloak" + icon_state = "tesh_cloak_on" + item_state = "tesh_cloak_on" + +/obj/item/clothing/suit/storage/seromi/cloak/standard/dark_retrowave + name = "dark aesthetic cloak" + icon_state = "tesh_cloak_dretrowave" + item_state = "tesh_cloak_dretrowave" + +/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" + + +// Job Cloaks /obj/item/clothing/suit/storage/seromi/cloak/jobs icon = 'icons/mob/species/seromi/deptcloak.dmi' icon_override = 'icons/mob/species/seromi/deptcloak.dmi' +/obj/item/clothing/suit/storage/seromi/cloak/jobs/cap + name = "facility director cloak" + desc = "A soft Teshari cloak made for the Facility Director" + icon_state = "tesh_cloak_cap" + item_state = "tesh_cloak_cap" + +//Cargo + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/qm + name = "quartermaster cloak" + desc = "A soft Teshari cloak made for the Quartermaster" + icon_state = "tesh_cloak_qm" + item_state = "tesh_cloak_qm" + /obj/item/clothing/suit/storage/seromi/cloak/jobs/cargo name = "cargo cloak" desc = "A soft Teshari cloak made for the Cargo department" @@ -149,11 +161,7 @@ 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" +//Engineering /obj/item/clothing/suit/storage/seromi/cloak/jobs/ce name = "cheif engineer cloak" @@ -161,7 +169,7 @@ icon_state = "tesh_cloak_ce" item_state = "tesh_cloak_ce" -/obj/item/clothing/suit/storage/seromi/cloak/jobs/eningeer +/obj/item/clothing/suit/storage/seromi/cloak/jobs/engineer name = "engineering cloak" desc = "A soft Teshari cloak made for the Engineering department" icon_state = "tesh_cloak_engie" @@ -173,6 +181,8 @@ icon_state = "tesh_cloak_atmos" item_state = "tesh_cloak_atmos" +//Medical + /obj/item/clothing/suit/storage/seromi/cloak/jobs/cmo name = "chief medical officer cloak" desc = "A soft Teshari cloak made the Cheif Medical Officer" @@ -203,6 +213,20 @@ icon_state = "tesh_cloak_para" item_state = "tesh_cloak_para" +/obj/item/clothing/suit/storage/seromi/cloak/jobs/psych + name = " psychiatrist cloak" + desc = "A soft Teshari cloak made for the Psychiatrist" + icon_state = "tesh_cloak_psych" + item_state = "tesh_cloak_psych" + +//Science + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/rd + name = "research director cloak" + desc = "A soft Teshari cloak made for the Research Director" + icon_state = "tesh_cloak_rd" + item_state = "tesh_cloak_rd" + /obj/item/clothing/suit/storage/seromi/cloak/jobs/sci name = "scientist cloak" desc = "A soft Teshari cloak made for the Science department" @@ -215,34 +239,46 @@ icon_state = "tesh_cloak_robo" item_state = "tesh_cloak_robo" +//Security + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/hos + name = "head of security cloak" + desc = "A soft Teshari cloak made for the Head of Security" + icon_state = "tesh_cloak_hos" + item_state = "tesh_cloak_hos" + /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 = "quartermaster cloak" - desc = "A soft Teshari cloak made for the Quartermaster" - 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_cloak_serv" - item_state = "tesh_cloak_serv" - /obj/item/clothing/suit/storage/seromi/cloak/jobs/iaa name = "internal affairs cloak" desc = "A soft Teshari cloak made for the Internal Affairs Agent" icon_state = "tesh_cloak_iaa" item_state = "tesh_cloak_iaa" +//Service + +/obj/item/clothing/suit/storage/seromi/cloak/jobs/hop + name = "head of personnel cloak" + desc = "A soft Teshari cloak made for the Head of Personnel" + icon_state = "tesh_cloak_hop" + item_state = "tesh_cloak_hop" + +/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_cloak_serv" + item_state = "tesh_cloak_serv" + +//Misc + /obj/item/clothing/suit/storage/toggle/labcoat/teshari name = "Teshari labcoat" desc = "A small suit that protects against minor chemical spills. This one is a good fit on Teshari." - icon = 'icons/mob/species/seromi/suit.dmi' + icon = 'icons/obj/clothing/species/seromi/suits.dmi' icon_override = 'icons/mob/species/seromi/suit.dmi' icon_state = "tesh_labcoat" species_restricted = list(SPECIES_TESHARI) @@ -256,7 +292,6 @@ body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS species_restricted = list(SPECIES_TESHARI) - /obj/item/clothing/suit/storage/toggle/tesharicoatwhite name = "small coat" desc = "A coat that seems too small to fit a human." @@ -264,4 +299,567 @@ icon_override = 'icons/mob/species/seromi/suit.dmi' icon_state = "tesharicoatwhite" body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS - species_restricted = list(SPECIES_TESHARI) \ No newline at end of file + species_restricted = list(SPECIES_TESHARI) + +//Hooded teshari cloaks +/obj/item/clothing/suit/storage/hooded/teshari + name = "Hooded Teshari Cloak" + desc = "A soft teshari cloak with an added hood." + icon_override = 'icons/mob/species/seromi/teshari_hood.dmi' + icon = 'icons/mob/species/seromi/teshari_hood.dmi' + icon_state = "tesh_hcloak_bo" + item_state_slots = list(slot_r_hand_str = "tesh_hcloak_bo", slot_l_hand_str = "tesh_hcloak_bo") + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + flags_inv = HIDEHOLSTER|HIDETIE + //hooded = 1 Variable no longer exists, hood is now handled by code/modules/clothing/suit/storage/hooded.dm + action_button_name = "Toggle Cloak Hood" + hoodtype = /obj/item/clothing/head/tesh_hood + allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask) + +/obj/item/clothing/head/tesh_hood + name = "Cloak Hood" + desc = "A hood attached to a teshari cloak." + icon_override = 'icons/mob/species/seromi/teshari_hood.dmi' + icon = 'icons/mob/species/seromi/teshari_hood.dmi' + icon_state = "tesh_hood_bo" + item_state_slots = list(slot_r_hand_str = "tesh_hood_bo", slot_l_hand_str = "tesh_hood_bo") + flags_inv = BLOCKHAIR + body_parts_covered = HEAD + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_orange + name = "black and orange hooded cloak" + icon_state = "tesh_hcloak_bo" + item_state = "tesh_hcloak_bo" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_orange + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_grey + name = "black and grey hooded cloak" + icon_state = "tesh_hcloak_bg" + item_state = "tesh_hcloak_bg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_midgrey + name = "black and medium grey hooded cloak" + icon_state = "tesh_hcloak_bmg" + item_state = "tesh_hcloak_bmg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_midgrey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_lightgrey + name = "black and light grey hooded cloak" + icon_state = "tesh_hcloak_blg" + item_state = "tesh_hcloak_blg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_lightgrey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_white + name = "black and white hooded cloak" + icon_state = "tesh_hcloak_bw" + item_state = "tesh_hcloak_bw" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_white + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_red + name = "black and red hooded cloak" + icon_state = "tesh_hcloak_br" + item_state = "tesh_hcloak_br" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_red + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black + name = "black hooded cloak" + icon_state = "tesh_hcloak_bn" + item_state = "tesh_hcloak_bn" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_yellow + name = "black and yellow hooded cloak" + icon_state = "tesh_hcloak_by" + item_state = "tesh_hcloak_by" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_yellow + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_green + name = "black and green hooded cloak" + icon_state = "tesh_hcloak_bgr" + item_state = "tesh_hcloak_bgr" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_green + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_blue + name = "black and blue hooded cloak" + icon_state = "tesh_hcloak_bbl" + item_state = "tesh_hcloak_bbl" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_blue + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_purple + name = "black and purple hooded cloak" + icon_state = "tesh_hcloak_bp" + item_state = "tesh_hcloak_bp" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_purple + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_pink + name = "black and pink hooded cloak" + icon_state = "tesh_hcloak_bpi" + item_state = "tesh_hcloak_bpi" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_pink + +/obj/item/clothing/suit/storage/hooded/teshari/standard/black_brown + name = "black and brown hooded cloak" + icon_state = "tesh_hcloak_bbr" + item_state = "tesh_hcloak_bbr" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/black_brown + +/obj/item/clothing/suit/storage/hooded/teshari/standard/orange_grey + name = "orange and grey hooded cloak" + icon_state = "tesh_hcloak_og" + item_state = "tesh_hcloak_og" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/orange_grey + +///obj/item/clothing/suit/storage/hooded/teshari/standard/rainbow +// name = "rainbow hooded cloak" +// icon_state = "tesh_hcloak_rainbow" +// item_state = "tesh_hcloak_rainbow" +// hoodtype = /obj/item/clothing/head/tesh_hood/standard/rainbow + +/obj/item/clothing/suit/storage/hooded/teshari/standard/lightgrey_grey + name = "light grey and grey hooded cloak" + icon_state = "tesh_hcloak_lgg" + item_state = "tesh_hcloak_lgg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/lightgrey_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/white_grey + name = "white and grey hooded cloak" + icon_state = "tesh_hcloak_wg" + item_state = "tesh_hcloak_wg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/white_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/red_grey + name = "red and grey hooded cloak" + icon_state = "tesh_hcloak_rg" + item_state = "tesh_hcloak_rg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/red_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/orange + name = "orange hooded cloak" + icon_state = "tesh_hcloak_on" + item_state = "tesh_hcloak_on" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/orange + +/obj/item/clothing/suit/storage/hooded/teshari/standard/yellow_grey + name = "yellow and grey hooded cloak" + icon_state = "tesh_hcloak_yg" + item_state = "tesh_hcloak_yg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/yellow_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/green_grey + name = "green and grey hooded cloak" + icon_state = "tesh_hcloak_gg" + item_state = "tesh_hcloak_gg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/green_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/blue_grey + name = "blue and grey hooded cloak" + icon_state = "tesh_hcloak_blug" + item_state = "tesh_hcloak_blug" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/blue_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/purple_grey + name = "purple and grey hooded cloak" + icon_state = "tesh_hcloak_pg" + item_state = "tesh_hcloak_pg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/purple_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/pink_grey + name = "pink and grey hooded cloak" + icon_state = "tesh_hcloak_pig" + item_state = "tesh_hcloak_pig" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/pink_grey + +/obj/item/clothing/suit/storage/hooded/teshari/standard/brown_grey + name = "brown and grey hooded cloak" + icon_state = "tesh_hcloak_brg" + item_state = "tesh_hcloak_brg" + hoodtype = /obj/item/clothing/head/tesh_hood/standard/brown_grey + +//The actual hoods +/obj/item/clothing/head/tesh_hood/standard/black_orange + name = "black and orange cloak hood" + icon_state = "tesh_hood_bo" + item_state = "tesh_hood_bo" + +/obj/item/clothing/head/tesh_hood/standard/black_grey + name = "black and grey cloak hood" + icon_state = "tesh_hood_bg" + item_state = "tesh_hood_bg" + +/obj/item/clothing/head/tesh_hood/standard/black_midgrey + name = "black and medium grey cloak hood" + icon_state = "tesh_hood_bmg" + item_state = "tesh_hood_bmg" + +/obj/item/clothing/head/tesh_hood/standard/black_lightgrey + name = "black and light grey cloak hood" + icon_state = "tesh_hood_blg" + item_state = "tesh_hood_blg" + +/obj/item/clothing/head/tesh_hood/standard/black_white + name = "black and white cloak hood" + icon_state = "tesh_hood_bw" + item_state = "tesh_hood_bw" + +/obj/item/clothing/head/tesh_hood/standard/black_red + name = "black and red cloak hood" + icon_state = "tesh_hood_br" + item_state = "tesh_hood_br" + +/obj/item/clothing/head/tesh_hood/standard/black + name = "black cloak hood" + icon_state = "tesh_hood_bn" + item_state = "tesh_hood_bn" + +/obj/item/clothing/head/tesh_hood/standard/black_yellow + name = "black and yellow cloak hood" + icon_state = "tesh_hood_by" + item_state = "tesh_hood_by" + +/obj/item/clothing/head/tesh_hood/standard/black_green + name = "black and green cloak hood" + icon_state = "tesh_hood_bgr" + item_state = "tesh_hood_bgr" + +/obj/item/clothing/head/tesh_hood/standard/black_blue + name = "black and blue cloak hood" + icon_state = "tesh_hood_bbl" + item_state = "tesh_hood_bbl" + +/obj/item/clothing/head/tesh_hood/standard/black_purple + name = "black and purple cloak hood" + icon_state = "tesh_hood_bp" + item_state = "tesh_hood_bp" + +/obj/item/clothing/head/tesh_hood/standard/black_pink + name = "black and pink cloak hood" + icon_state = "tesh_hood_bpi" + item_state = "tesh_hood_bpi" + +/obj/item/clothing/head/tesh_hood/standard/black_brown + name = "black and brown cloak hood" + icon_state = "tesh_hood_bbr" + item_state = "tesh_hood_bbr" + +/obj/item/clothing/head/tesh_hood/standard/orange_grey + name = "orange and grey cloak hood" + icon_state = "tesh_hood_og" + item_state = "tesh_hood_og" + +/obj/item/clothing/head/tesh_hood/standard/rainbow + name = "rainbow cloak hood" + icon_state = "tesh_hood_rainbow" + item_state = "tesh_hood_rainbow" + +/obj/item/clothing/head/tesh_hood/standard/lightgrey_grey + name = "light grey and grey cloak hood" + icon_state = "tesh_hood_lgg" + item_state = "tesh_hood_lgg" + +/obj/item/clothing/head/tesh_hood/standard/white_grey + name = "white and grey cloak hood" + icon_state = "tesh_hood_wg" + item_state = "tesh_hood_wg" + +/obj/item/clothing/head/tesh_hood/standard/red_grey + name = "red and grey cloak hood" + icon_state = "tesh_hood_rg" + item_state = "tesh_hood_rg" + +/obj/item/clothing/head/tesh_hood/standard/orange + name = "orange cloak hood" + icon_state = "tesh_hood_on" + item_state = "tesh_hood_on" + +/obj/item/clothing/head/tesh_hood/standard/yellow_grey + name = "yellow and grey cloak hood" + icon_state = "tesh_hood_yg" + item_state = "tesh_hood_yg" + +/obj/item/clothing/head/tesh_hood/standard/green_grey + name = "green and grey cloak hood" + icon_state = "tesh_hood_gg" + item_state = "tesh_hood_gg" + +/obj/item/clothing/head/tesh_hood/standard/blue_grey + name = "blue and grey cloak hood" + icon_state = "tesh_hood_blug" + item_state = "tesh_hood_blug" + +/obj/item/clothing/head/tesh_hood/standard/purple_grey + name = "purple and grey cloak hood" + icon_state = "tesh_hood_pg" + item_state = "tesh_hood_pg" + +/obj/item/clothing/head/tesh_hood/standard/pink_grey + name = "pink and grey cloak hood" + icon_state = "tesh_hood_pig" + item_state = "tesh_hood_pig" + +/obj/item/clothing/head/tesh_hood/standard/brown_grey + name = "brown and grey cloak hood" + icon_state = "tesh_hood_brg" + item_state = "tesh_hood_brg" + +//Belted cloaks +/obj/item/clothing/suit/storage/seromi/beltcloak + name = "belted cloak" + desc = "A more ridged and stylized Teshari cloak." + icon = 'icons/mob/species/seromi/teshari_cloak.dmi' + icon_override = 'icons/mob/species/seromi/teshari_cloak.dmi' + icon_state = "tesh_beltcloak_bo" + item_state = "tesh_beltcloak_bo" + species_restricted = list(SPECIES_TESHARI) + body_parts_covered = UPPER_TORSO|ARMS + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_orange + name = "black belted cloak (orange)" + icon_state = "tesh_beltcloak_bo" + item_state = "tesh_beltcloak_bo" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_grey + name = "black belted cloak" + icon_state = "tesh_beltcloak_bg" + item_state = "tesh_beltcloak_bg" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_midgrey + name = "black belted cloak (medium grey)" + icon_state = "tesh_beltcloak_bmg" + item_state = "tesh_beltcloak_bmg" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_lightgrey + name = "black belted cloak (light grey)" + icon_state = "tesh_beltcloak_blg" + item_state = "tesh_beltcloak_blg" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_white + name = "black belted cloak (white)" + icon_state = "tesh_beltcloak_bw" + item_state = "tesh_beltcloak_bw" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_red + name = "black belted cloak (red)" + icon_state = "tesh_beltcloak_br" + item_state = "tesh_beltcloak_br" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black + name = "black simple belted cloak" + icon_state = "tesh_beltcloak_bn" + item_state = "tesh_beltcloak_bn" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_yellow + name = "black belted cloak (yellow)" + icon_state = "tesh_beltcloak_by" + item_state = "tesh_beltcloak_by" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_green + name = "black belted cloak (green)" + icon_state = "tesh_beltcloak_bgr" + item_state = "tesh_beltcloak_bgr" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_blue + name = "black belted cloak (blue)" + icon_state = "tesh_beltcloak_bbl" + item_state = "tesh_beltcloak_bbl" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_purple + name = "black belted cloak (purple)" + icon_state = "tesh_beltcloak_bp" + item_state = "tesh_beltcloak_bp" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_pink + name = "black belted cloak (pink)" + icon_state = "tesh_beltcloak_bpi" + item_state = "tesh_beltcloak_bpi" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/black_brown + name = "black belted cloak (brown)" + icon_state = "tesh_beltcloak_bbr" + item_state = "tesh_beltcloak_bbr" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/orange_grey + name = "orange belted cloak" + icon_state = "tesh_beltcloak_og" + item_state = "tesh_beltcloak_og" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/rainbow + name = "rainbow belted cloak" + icon_state = "tesh_beltcloak_rainbow" + item_state = "tesh_beltcloak_rainbow" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/lightgrey_grey + name = "light grey belted cloak" + icon_state = "tesh_beltcloak_lgg" + item_state = "tesh_beltcloak_lgg" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/white_grey + name = "white belted cloak" + icon_state = "tesh_beltcloak_wg" + item_state = "tesh_beltcloak_wg" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/red_grey + name = "red belted cloak" + icon_state = "tesh_beltcloak_rg" + item_state = "tesh_beltcloak_rg" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/orange + name = "orange simple belted cloak" + icon_state = "tesh_beltcloak_on" + item_state = "tesh_beltcloak_on" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/yellow_grey + name = "yellow belted cloak" + icon_state = "tesh_beltcloak_yg" + item_state = "tesh_beltcloak_yg" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/green_grey + name = "green belted cloak" + icon_state = "tesh_beltcloak_gg" + item_state = "tesh_beltcloak_gg" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/blue_grey + name = "blue belted cloak" + icon_state = "tesh_beltcloak_blug" + item_state = "tesh_beltcloak_blug" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/purple_grey + name = "purple belted cloak" + icon_state = "tesh_beltcloak_pg" + item_state = "tesh_beltcloak_pg" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/pink_grey + name = "pink belted cloak" + icon_state = "tesh_beltcloak_pig" + item_state = "tesh_beltcloak_pig" + +/obj/item/clothing/suit/storage/seromi/beltcloak/standard/brown_grey + name = "brown belted cloak" + icon_state = "tesh_beltcloak_brg" + item_state = "tesh_beltcloak_brg" + +//Belted job cloaks +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs + icon = 'icons/mob/species/seromi/deptcloak.dmi' + icon_override = 'icons/mob/species/seromi/deptcloak.dmi' + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cargo + name = "cargo belted cloak" + desc = "A soft Teshari cloak made for the Cargo department" + icon_state = "tesh_beltcloak_car" + item_state = "tesh_beltcloak_car" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/mining + name = "mining belted cloak" + desc = "A soft Teshari cloak made for Mining" + icon_state = "tesh_beltcloak_mine" + item_state = "tesh_beltcloak_mine" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/command + name = "command belted cloak" + desc = "A soft Teshari cloak made for the Command department" + icon_state = "tesh_beltcloak_comm" + item_state = "tesh_beltcloak_comm" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/ce + name = "chief engineer belted cloak" + desc = "A soft Teshari cloak made the Chief Engineer" + icon_state = "tesh_beltcloak_ce" + item_state = "tesh_beltcloak_ce" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/engineer + name = "engineering belted cloak" + desc = "A soft Teshari cloak made for the Engineering department" + icon_state = "tesh_beltcloak_engie" + item_state = "tesh_beltcloak_engie" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/atmos + name = "atmospherics belted cloak" + desc = "A soft Teshari cloak made for the Atmospheric Technician" + icon_state = "tesh_beltcloak_atmos" + item_state = "tesh_beltcloak_atmos" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cmo + name = "chief medical officer belted cloak" + desc = "A soft Teshari cloak made the Chief Medical Officer" + icon_state = "tesh_beltcloak_cmo" + item_state = "tesh_beltcloak_cmo" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/medical + name = "medical belted cloak" + desc = "A soft Teshari cloak made for the Medical department" + icon_state = "tesh_beltcloak_doc" + item_state = "tesh_beltcloak_doc" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/chemistry + name = "chemist belted cloak" + desc = "A soft Teshari cloak made for the Chemist" + icon_state = "tesh_beltcloak_vrem" + item_state = "tesh_beltcloak_vrem" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/viro + name = "virologist belted cloak" + desc = "A soft Teshari cloak made for the Virologist" + icon_state = "tesh_beltcloak_viro" + item_state = "tesh_beltcloak_viro" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/para + name = "paramedic belted cloak" + desc = "A soft Teshari cloak made for the Paramedic" + icon_state = "tesh_beltcloak_para" + item_state = "tesh_beltcloak_para" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/sci + name = "scientist belted cloak" + desc = "A soft Teshari cloak made for the Science department" + icon_state = "tesh_beltcloak_sci" + item_state = "tesh_beltcloak_sci" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/robo + name = "roboticist belted cloak" + desc = "A soft Teshari cloak made for the Roboticist" + icon_state = "tesh_beltcloak_robo" + item_state = "tesh_beltcloak_robo" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/sec + name = "security belted cloak" + desc = "A soft Teshari cloak made for the Security department" + icon_state = "tesh_beltcloak_sec" + item_state = "tesh_beltcloak_sec" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/qm + name = "quartermaster belted cloak" + desc = "A soft Teshari cloak made for the Quartermaster" + icon_state = "tesh_beltcloak_qm" + item_state = "tesh_beltcloak_qm" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/service + name = "service belted cloak" + desc = "A soft Teshari cloak made for the Service department" + icon_state = "tesh_beltcloak_serv" + item_state = "tesh_beltcloak_serv" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/iaa + name = "internal affairs belted cloak" + desc = "A soft Teshari cloak made for the Internal Affairs Agent" + icon_state = "tesh_beltcloak_iaa" + item_state = "tesh_beltcloak_iaa" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/wrdn + name = "warden belted cloak" + desc = "A soft Teshari cloak made for the Warden" + icon_state = "tesh_beltcloak_wrdn" + item_state = "tesh_beltcloak_wrdn" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/hos + name = "security chief belted cloak" + desc = "A soft Teshari cloak made for the Head of Security" + icon_state = "tesh_beltcloak_hos" + item_state = "tesh_beltcloak_hos" + +/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/jani + name = "janitor belted cloak" + desc = "A soft Teshari cloak made for the Janitor" + icon_state = "tesh_beltcloak_jani" + item_state = "tesh_beltcloak_jani" + diff --git a/code/modules/clothing/under/xenos/seromi.dm b/code/modules/clothing/under/xenos/seromi.dm index 71f00f293a4..0593f78f72f 100644 --- a/code/modules/clothing/under/xenos/seromi.dm +++ b/code/modules/clothing/under/xenos/seromi.dm @@ -77,6 +77,60 @@ name = "small blue and grey dress" icon_state = "teshari_bluegreydress" +// Worksuits +/obj/item/clothing/under/seromi/undercoat/standard/worksuit + name = "small black and red worksuit" + icon_state = "teshari_black_red_worksuit" + item_state = "teshari_black_red_worksuit" + desc = "A small worksuit designed for a Teshari" + +/obj/item/clothing/under/seromi/undercoat/standard/worksuit/blackpurple + name = "small black and purple worksuit" + icon_state = "teshari_black_purple_worksuit" + item_state = "teshari_black_purple_worksuit" + +/obj/item/clothing/under/seromi/undercoat/standard/worksuit/blackorange + name = "small black and orange worksuit" + icon_state = "teshari_black_orange_worksuit" + item_state = "teshari_black_orange_worksuit" + +/obj/item/clothing/under/seromi/undercoat/standard/worksuit/blackblue + name = "small black and blue worksuit" + icon_state = "teshari_black_blue_worksuit" + item_state = "teshari_black_blue_worksuit" + +/obj/item/clothing/under/seromi/undercoat/standard/worksuit/blackgreen + name = "small black and greeen worksuit" + icon_state = "teshari_black_green_worksuit" + item_state = "teshari_black_green_worksuit" + +/obj/item/clothing/under/seromi/undercoat/standard/worksuit/whitered + name = "small white and red worksuit" + icon_state = "teshari_white_red_worksuit" + item_state = "teshari_white_red_worksuit" + +/obj/item/clothing/under/seromi/undercoat/standard/worksuit/whitepurple + name = "small white and purple worksuit" + icon_state = "teshari_white_purple_worksuit" + item_state = "teshari_white_purple_worksuit" + +/obj/item/clothing/under/seromi/undercoat/standard/worksuit/whiteorange + name = "small white and orange worksuit" + icon_state = "teshari_white_orange_worksuit" + item_state = "teshari_white_orange_worksuit" + +/obj/item/clothing/under/seromi/undercoat/standard/worksuit/whiteblue + name = "small white and blue worksuit" + icon_state = "teshari_white_blue_worksuit" + item_state = "teshari_white_blue_worksuit" + +/obj/item/clothing/under/seromi/undercoat/standard/worksuit/whitegreen + name = "small white and green worksuit" + icon_state = "teshari_white_green_worksuit" + item_state = "teshari_white_green_worksuit" + +//Standard Undercoats + /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!" @@ -96,16 +150,6 @@ icon_state = "tesh_uniform_bg" item_state = "tesh_uniform_bg" -/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/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/standard/black_white name = "black and white undercoat" icon_state = "tesh_uniform_bw" @@ -211,93 +255,23 @@ icon_state = "tesh_uniform_brg" item_state = "tesh_uniform_brg" -/obj/item/clothing/under/seromi/undercoat/standard/blackredworksuit - name = "small black and red worksuit" - icon_state = "teshari_black_red_worksuit" - item_state = "teshari_black_red_worksuit" - desc = "A small worksuit designed for a Teshari" - -/obj/item/clothing/under/seromi/undercoat/standard/blackpurpleworksuit - name = "small black and purple worksuit" - icon_state = "teshari_black_purple_worksuit" - item_state = "teshari_black_purple_worksuit" - desc = "A small worksuit designed for a Teshari" - -/obj/item/clothing/under/seromi/undercoat/standard/blackpurpleworksuit - name = "small black and orange worksuit" - icon_state = "teshari_black_orange_worksuit" - item_state = "teshari_black_orange_worksuit" - desc = "A small worksuit designed for a Teshari" - -/obj/item/clothing/under/seromi/undercoat/standard/blackblueworksuit - name = "small black and blue worksuit" - icon_state = "teshari_black_blue_worksuit" - item_state = "teshari_black_blue_worksuit" - desc = "A small worksuit designed for a Teshari" - -/obj/item/clothing/under/seromi/undercoat/standard/blackgreenworksuit - name = "small black and greeen worksuit" - icon_state = "teshari_black_green_worksuit" - item_state = "teshari_black_green_worksuit" - desc = "A small worksuit designed for a Teshari" - -/obj/item/clothing/under/seromi/undercoat/standard/whiteredworksuit - name = "small white and red worksuit" - icon_state = "teshari_white_red_worksuit" - item_state = "teshari_white_red_worksuit" - desc = "A small worksuit designed for a Teshari" - -/obj/item/clothing/under/seromi/undercoat/standard/whitepurpleworksuit - name = "small white and purple worksuit" - icon_state = "teshari_white_purple_worksuit" - item_state = "teshari_white_purple_worksuit" - desc = "A small worksuit designed for a Teshari" - -/obj/item/clothing/under/seromi/undercoat/standard/whiteorangeworksuit - name = "small white and orange worksuit" - icon_state = "teshari_white_orange_worksuit" - item_state = "teshari_white_orange_worksuit" - desc = "A small worksuit designed for a Teshari" - -/obj/item/clothing/under/seromi/undercoat/standard/whiteblueworksuit - name = "small white and blue worksuit" - icon_state = "teshari_white_blue_worksuit" - item_state = "teshari_white_blue_worksuit" - desc = "A small worksuit designed for a Teshari" - -/obj/item/clothing/under/seromi/undercoat/standard/whitegreenworksuit - name = "small white and green worksuit" - icon_state = "teshari_white_green_worksuit" - item_state = "teshari_white_green_worksuit" - desc = "A small worksuit designed for a Teshari" +//Job Undercoats /obj/item/clothing/under/seromi/undercoat/jobs icon = 'icons/mob/species/seromi/deptjacket.dmi' 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/cap + name = "facility director undercoat" + desc = "A traditional Teshari garb made for the Facility Director" + icon_state = "tesh_uniform_cap" + item_state = "tesh_uniform_cap" -/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" - desc = "A traditional Teshari garb made for the Command department. This one has fancier gold buttons" - icon_state = "tesh_uniform_comm_g" - item_state = "tesh_uniform_comm_g" +/obj/item/clothing/under/seromi/undercoat/jobs/hop + name = "head of personnel undercoat" + desc = "A traditional Teshari garb made for the Head of Personnel" + icon_state = "tesh_uniform_hop" + item_state = "tesh_uniform_hop" /obj/item/clothing/under/seromi/undercoat/jobs/ce name = "cheif engineer undercoat" @@ -305,11 +279,17 @@ icon_state = "tesh_uniform_ce" item_state = "tesh_uniform_ce" -/obj/item/clothing/under/seromi/undercoat/jobs/ce_w - name = "cheif engineer undercoat" - desc = "A traditional Teshari garb made for the Chief Engineer. This one is white" - icon_state = "tesh_uniform_ce_w" - item_state = "tesh_uniform_ce_w" +/obj/item/clothing/under/seromi/undercoat/jobs/hos + name = "head of security undercoat" + desc = "A traditional Teshari garb made for the Head of Security" + icon_state = "tesh_uniform_hos" + item_state = "tesh_uniform_hos" + +/obj/item/clothing/under/seromi/undercoat/jobs/rd + name = "research director undercoat" + desc = "A traditional Teshari garb made for the Research Director" + icon_state = "tesh_uniform_rd" + item_state = "tesh_uniform_rd" /obj/item/clothing/under/seromi/undercoat/jobs/engineer name = "engineering undercoat" @@ -329,6 +309,24 @@ icon_state = "tesh_uniform_cmo" item_state = "tesh_uniform_cmo" +/obj/item/clothing/under/seromi/undercoat/jobs/qm + name = "quartermaster undercoat" + desc = "A traditional Teshari garb made for the Quartermaster" + icon_state = "tesh_uniform_qm" + item_state = "tesh_uniform_qm" + +/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/medical name = "medical undercoat" desc = "A traditional Teshari garb made for the Medical department" @@ -347,6 +345,12 @@ icon_state = "tesh_uniform_viro" item_state = "tesh_uniform_viro" +/obj/item/clothing/under/seromi/undercoat/jobs/psych + name = "psychiatrist undercoat" + desc = "A traditional Teshari garb made for the Psychiatrist" + icon_state = "tesh_uniform_psych" + item_state = "tesh_uniform_psych" + /obj/item/clothing/under/seromi/undercoat/jobs/para name = "paramedic undercoat" desc = "A traditional Teshari garb made for the Paramedic" @@ -371,12 +375,6 @@ icon_state = "tesh_uniform_sec" item_state = "tesh_uniform_sec" -/obj/item/clothing/under/seromi/undercoat/jobs/qm - name = "quartermaster undercoat" - desc = "A traditional Teshari garb made for the Quartermaster" - 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" @@ -387,4 +385,4 @@ name = "internal affairs undercoat" desc = "A traditional Teshari garb made for the Internal Affairs Agent" icon_state = "tesh_uniform_iaa" - item_state = "tesh_uniform_iaa" \ No newline at end of file + item_state = "tesh_uniform_iaa" diff --git a/html/changelogs/KasparoVy - PR - 7760.yml b/html/changelogs/KasparoVy - PR - 7760.yml new file mode 100644 index 00000000000..c4569eead39 --- /dev/null +++ b/html/changelogs/KasparoVy - PR - 7760.yml @@ -0,0 +1,45 @@ +################################ +# 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 +################################# + +# Your name. +author: KasparoVy + +# 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: + - imageadd: Adds orange Teshari goggles, selectable in the loadout. + - imageadd: Adds blindfold & new white (recolorable) blindfold to loadout. + - imageadd: Adds species-fitted Teshari ring sprites. + - imageadd: Adds species-fitted Teshari hudpatches & white blindfold. + - imageadd: Adds full selection of Teshari belted cloaks. + - imageadd: Adds full selection of non-job Teshari hooded cloaks. + - rscadd: Adds a bunch of Teshari worksuits (sprites already existed). + - imageadd: Adds some species-fitted Teshari jacket accessories (tan, charcoal, navy, burgundy, checkered). + - tweak: Updates all Teshari undercoats and cloaks with new sprites from downstreams. + - fix: Fixes Teshari captain glove sprites. diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index 6320593c1a1..0be51e7c5c7 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/icons/mob/species/seromi/deptcloak.dmi b/icons/mob/species/seromi/deptcloak.dmi index 532c208187e..7a9a4128537 100644 Binary files a/icons/mob/species/seromi/deptcloak.dmi and b/icons/mob/species/seromi/deptcloak.dmi differ diff --git a/icons/mob/species/seromi/teshari_cloak.dmi b/icons/mob/species/seromi/teshari_cloak.dmi index 2d7e5c1d499..a222ede26b1 100644 Binary files a/icons/mob/species/seromi/teshari_cloak.dmi and b/icons/mob/species/seromi/teshari_cloak.dmi differ diff --git a/icons/mob/species/seromi/teshari_hood.dmi b/icons/mob/species/seromi/teshari_hood.dmi new file mode 100644 index 00000000000..64ae2eced37 Binary files /dev/null and b/icons/mob/species/seromi/teshari_hood.dmi differ