diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index a03263bc25e..2bbe494b353 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -134,7 +134,7 @@ var/list/nonhuman_positions = list( ) /proc/guest_jobbans(var/job) - return ((job in command_positions) || job == "Corporate Liaison" || job == "Consular Officer" || job != "Bridge Crew") + return ((job in command_positions) || job == "Corporate Liaison" || job == "Consular Officer") /proc/get_job_datums() var/list/occupations = list() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 2c6b36784b0..be59aa853da 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -32,8 +32,6 @@ new /obj/item/clothing/suit/bio_suit/scientist(src) new /obj/item/clothing/head/bio_hood/scientist(src) new /obj/item/clothing/under/rank/research_director(src) - new /obj/item/clothing/under/rank/research_director/rdalt(src) - new /obj/item/clothing/under/rank/research_director/dress_rd(src) new /obj/item/clothing/suit/storage/toggle/labcoat(src) new /obj/item/clothing/shoes/science(src) new /obj/item/clothing/shoes/laceup/brown(src) @@ -61,8 +59,6 @@ /obj/structure/closet/secure_closet/RD2/fill() new /obj/item/clothing/under/rank/research_director(src) - new /obj/item/clothing/under/rank/research_director/rdalt(src) - new /obj/item/clothing/under/rank/research_director/dress_rd(src) new /obj/item/clothing/suit/storage/toggle/labcoat(src) new /obj/item/clothing/shoes/science(src) new /obj/item/clothing/shoes/laceup/brown(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 6ffd6b0731b..7e270d8159e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -129,8 +129,6 @@ new /obj/item/clothing/suit/armor/carrier/hos(src) new /obj/item/clothing/accessory/leg_guard(src) new /obj/item/clothing/accessory/arm_guard(src) - new /obj/item/clothing/under/rank/head_of_security/corp(src) - new /obj/item/clothing/head/beret/security/hos/corp(src) new /obj/item/clothing/head/hos/corp(src) new /obj/item/clothing/head/helmet/hos(src) new /obj/item/clothing/suit/storage/security/hos(src) @@ -180,9 +178,7 @@ new /obj/item/clothing/suit/armor/carrier/hos(src) new /obj/item/clothing/accessory/leg_guard(src) new /obj/item/clothing/accessory/arm_guard(src) - new /obj/item/clothing/under/rank/head_of_security/corp(src) new /obj/item/clothing/head/beret/security/corp(src) - new /obj/item/clothing/head/hos/corp(src) new /obj/item/clothing/head/helmet/hos(src) new /obj/item/clothing/suit/storage/security/hos(src) //Tools @@ -218,7 +214,6 @@ new /obj/item/clothing/suit/armor/carrier/officer(src) new /obj/item/clothing/accessory/arm_guard(src) new /obj/item/clothing/accessory/leg_guard(src) - new /obj/item/clothing/under/rank/warden/corp(src) new /obj/item/clothing/head/beret/security/corp(src) new /obj/item/clothing/head/warden/corp(src) new /obj/item/clothing/head/helmet/security(src) @@ -296,7 +291,6 @@ new /obj/item/clothing/suit/armor/carrier/officer(src) new /obj/item/clothing/accessory/arm_guard(src) new /obj/item/clothing/accessory/leg_guard(src) - new /obj/item/clothing/under/rank/security/corp(src) new /obj/item/clothing/head/beret/security/corp(src) new /obj/item/clothing/head/softcap/security/corp(src) new /obj/item/clothing/head/helmet/security(src) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index b5fe388354a..c4898510f28 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -313,20 +313,6 @@ return -/obj/structure/closet/wardrobe/genetics_white - name = "genetics wardrobe" - icon_state = "white" - icon_closed = "white" - -/obj/structure/closet/wardrobe/genetics_white/fill() - ..() - new /obj/item/clothing/under/rank/geneticist(src) - new /obj/item/clothing/under/rank/geneticist(src) - new /obj/item/clothing/shoes/white(src) - new /obj/item/clothing/shoes/white(src) - return - - /obj/structure/closet/wardrobe/virology_white name = "virology wardrobe" icon_state = "white" @@ -334,8 +320,6 @@ /obj/structure/closet/wardrobe/virology_white/fill() ..() - new /obj/item/clothing/under/rank/virologist(src) - new /obj/item/clothing/under/rank/virologist(src) new /obj/item/clothing/shoes/biochem(src) new /obj/item/clothing/shoes/biochem(src) new /obj/item/clothing/mask/surgical(src) diff --git a/code/modules/cargo/random_stock/t3_rare.dm b/code/modules/cargo/random_stock/t3_rare.dm index 924a1363f6e..1a561e9835f 100644 --- a/code/modules/cargo/random_stock/t3_rare.dm +++ b/code/modules/cargo/random_stock/t3_rare.dm @@ -138,7 +138,6 @@ STOCK_ITEM_RARE(rare_clothing, 1) /obj/item/clothing/under/rank/fatigues/marine, /obj/item/clothing/under/rank/dress/subofficer, /obj/item/clothing/under/dominia/lyodsuit/hoodie, - /obj/item/clothing/under/rank/head_of_security/corp, /obj/item/clothing/shoes/sandal/clogs, /obj/item/clothing/under/lance, /obj/item/clothing/under/dress/lance_dress/male, diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index ea4fe37bba4..448964684f0 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -274,20 +274,6 @@ path = /obj/item/clothing/under/kimono flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION -/datum/gear/uniform/officer - display_name = "uniforms, (Security Officer)" - description = "A selection of officer uniforms." - path = /obj/item/clothing/under/rank/security - allowed_roles = list("Security Officer") - -/datum/gear/uniform/officer/New() - ..() - var/list/uniform = list() - uniform["officer uniform, standard"] = /obj/item/clothing/under/rank/security - uniform["officer uniform, corporate"] = /obj/item/clothing/under/rank/security/corp - uniform["officer uniform, blue"] = /obj/item/clothing/under/rank/security/blue - gear_tweaks += new /datum/gear_tweak/path(uniform) - /datum/gear/uniform/detective display_name = "uniforms, (Investigations)" description = "A selection of Investigations staff uniforms." @@ -303,34 +289,10 @@ uniform["investigator uniform, brown"] = /obj/item/clothing/under/det/classic gear_tweaks += new /datum/gear_tweak/path(uniform) -/datum/gear/uniform/warden - display_name = "uniforms, (Warden)" - description = "A selection of Warden uniforms." - path = /obj/item/clothing/under/rank/warden - allowed_roles = list("Warden") - -/datum/gear/uniform/warden/New() - ..() - var/list/uniform = list() - uniform["warden uniform, standard"] = /obj/item/clothing/under/rank/warden - uniform["warden uniform, corporate"] = /obj/item/clothing/under/rank/warden/corp - uniform["warden uniform, blue"] = /obj/item/clothing/under/rank/warden/blue - gear_tweaks += new /datum/gear_tweak/path(uniform) - -/datum/gear/uniform/hos - display_name = "uniform, corporate (Head of Security)" - path = /obj/item/clothing/under/rank/head_of_security/corp - allowed_roles = list("Head of Security") - /datum/gear/uniform/circuitry display_name = "jumpsuit, circuitry (empty)" path = /obj/item/clothing/under/circuitry -/datum/gear/uniform/science_alt - display_name = "scientist, alt" - path = /obj/item/clothing/under/rank/scientist/science_alt - allowed_roles = list("Scientist", "Xenobiologist") - /datum/gear/uniform/pyjama display_name = "pyjamas" path = /obj/item/clothing/under/pj/blue diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index a417c9a1c1f..6dbd6164e97 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -21,7 +21,6 @@ item_state = "lb_suit" worn_state = "cargo" - /obj/item/clothing/under/rank/cargo/alt desc = "Shooooorts! They're comfy and easy to wear!" icon_state = "cargo_alt" @@ -231,9 +230,9 @@ /obj/item/clothing/under/rank/operations_manager name = "operations manager's jumpsuit" desc = "A uniform worn by the operations manager. It has the SCC insignia on it." - icon_state = "qm" - item_state = "lb_suit" - worn_state = "qm" + icon = 'icons/obj/contained_items/department_uniforms/command.dmi' + icon_state = "operations_manager" + item_state = "operations_manager" /obj/item/clothing/under/rank/hangar_technician name = "hangar technician's jumpsuit" @@ -245,23 +244,26 @@ /obj/item/clothing/under/rank/bridge_crew name = "bridge crew's jumpsuit" desc = "The uniform worn by the SCC's bridge crew." - icon_state = "hop" - item_state = "b_suit" - worn_state = "hop" + icon = 'icons/obj/contained_items/department_uniforms/command.dmi' + icon_state = "bridge_crew" + item_state = "bridge_crew" + contained_sprite = TRUE /obj/item/clothing/under/rank/xo name = "executive officer's jumpsuit" desc = "The uniform worn by the SCC's executive officers." - icon_state = "hop" - item_state = "b_suit" - worn_state = "hop" + icon = 'icons/obj/contained_items/department_uniforms/command.dmi' + icon_state = "executive_officer" + item_state = "executive_officer" + contained_sprite = TRUE /obj/item/clothing/under/rank/service_manager name = "service manager's jumpsuit" desc = "The uniform worn by the managers of the ship service crew." + icon = 'icons/obj/contained_items/department_uniforms/command.dmi' icon_state = "hop" item_state = "b_suit" - worn_state = "hop" + contained_sprite = TRUE /obj/item/clothing/under/rank/machinist name = "Machinist's jumpsuit" diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm index 950500b760d..74b7c4eaa41 100644 --- a/code/modules/clothing/under/jobs/engineering.dm +++ b/code/modules/clothing/under/jobs/engineering.dm @@ -2,9 +2,10 @@ /obj/item/clothing/under/rank/chief_engineer name = "chief engineer's jumpsuit" desc = "It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of \"Chief Engineer\". It has minor radiation shielding." - icon_state = "chiefengineer" - item_state = "g_suit" - worn_state = "chief" + icon = 'icons/obj/contained_items/department_uniforms/command.dmi' + icon_state = "chief_engineer" + item_state = "chief_engineer" + contained_sprite = TRUE armor = list( rad = ARMOR_RAD_MINOR ) diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index 19180b890c4..3025519a88f 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -4,33 +4,14 @@ /obj/item/clothing/under/rank/research_director desc = "It's a jumpsuit worn by those with the know-how to achieve the position of \"Research Director\". Its fabric provides minor protection from biological contaminants." name = "research director's jumpsuit" - icon_state = "rd" - item_state = "lb_suit" - worn_state = "rd" + icon = 'icons/obj/contained_items/department_uniforms/command.dmi' + icon_state = "research_director" + item_state = "research_director" + contained_sprite = TRUE armor = list( bio = ARMOR_BIO_MINOR ) -/obj/item/clothing/under/rank/research_director/rdalt - desc = "A dress suit and slacks stained with hard work and dedication to science. Perhaps other things as well, but mostly hard work and dedication." - name = "head researcher uniform" - icon_state = "rdalt" - item_state = "lb_suit" - worn_state = "rdalt" - armor = list( - bio = ARMOR_BIO_MINOR - ) - -/obj/item/clothing/under/rank/research_director/dress_rd - name = "research director dress uniform" - desc = "Feminine fashion for the style concious RD. Its fabric provides minor protection from biological contaminants." - icon_state = "dress_rd" - item_state = "lb_suit" - worn_state = "dress_rd" - armor = list( - bio = ARMOR_BIO_MINOR - ) - body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS /obj/item/clothing/under/rank/scientist desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist." @@ -42,27 +23,24 @@ armor = list( bio = ARMOR_BIO_MINOR ) -/obj/item/clothing/under/rank/scientist/xenoarcheologist - desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist." - name = "xenoarcheologist's jumpsuit" - icon_state = "xenoarcheology" - item_state = "w_suit" - worn_state = "xenoarcheology" - permeability_coefficient = 0.50 - armor = list( - bio = ARMOR_BIO_MINOR - ) -/obj/item/clothing/under/rank/scientist/science_alt - desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist." - name = "scientist's uniform" - icon_state = "science_alt" - item_state = "w_suit" - worn_state = "science_alt" - permeability_coefficient = 0.50 - armor = list( - bio = ARMOR_BIO_MINOR - ) +/obj/item/clothing/under/rank/scientist/nt + icon = 'icons/obj/contained_items/department_uniforms/science.dmi' + icon_state = "nt_scientist" + item_state = "nt_scientist" + contained_sprite = TRUE + +/obj/item/clothing/under/rank/scientist/zeng + icon = 'icons/obj/contained_items/department_uniforms/science.dmi' + icon_state = "zeng_scientist" + item_state = "zeng_scientist" + contained_sprite = TRUE + +/obj/item/clothing/under/rank/scientist/zavod + icon = 'icons/obj/contained_items/department_uniforms/science.dmi' + icon_state = "zav_scientist" + item_state = "zav_scientist" + contained_sprite = TRUE /obj/item/clothing/under/rank/scientist/botany desc = "It's made of a special fiber that provides minor protection against biohazards. Its colour denotes the wearer as a xenobotanist." @@ -78,16 +56,24 @@ icon_state = "intern_science" worn_state = "intern_science" -/obj/item/clothing/under/rank/pharmacist - desc = "It's made of a special fiber that gives special protection against biohazards. It has a pharmacist rank stripe on it." - name = "pharmacist's jumpsuit" - icon_state = "chemistry" - item_state = "w_suit" - worn_state = "chemistry" - permeability_coefficient = 0.50 - armor = list( - bio = ARMOR_BIO_MINOR - ) +/obj/item/clothing/under/rank/scientist/intern/nt + icon = 'icons/obj/contained_items/department_uniforms/science.dmi' + icon_state = "nt_assistant" + item_state = "nt_assistant" + contained_sprite = TRUE + +/obj/item/clothing/under/rank/scientist/intern/zeng + icon = 'icons/obj/contained_items/department_uniforms/science.dmi' + icon_state = "zeng_assistant" + item_state = "zeng_assistant" + contained_sprite = TRUE + +/obj/item/clothing/under/rank/scientist/intern/zavod + icon = 'icons/obj/contained_items/department_uniforms/science.dmi' + icon_state = "zav_assistant" + item_state = "zav_assistant" + contained_sprite = TRUE + /obj/item/clothing/under/rank/xenoarcheologist desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a xenoarcheologist." @@ -100,37 +86,34 @@ bomb = ARMOR_BOMB_MINOR ) +/obj/item/clothing/under/rank/xenoarcheologist/nt + icon = 'icons/obj/contained_items/department_uniforms/science.dmi' + icon_state = "nt_xenoarch" + item_state = "nt_xenoarch" + contained_sprite = TRUE + +/obj/item/clothing/under/rank/xenoarcheologist/zeng + icon = 'icons/obj/contained_items/department_uniforms/science.dmi' + icon_state = "zeng_xenoarch" + item_state = "zeng_xenoarch" + contained_sprite = TRUE + +/obj/item/clothing/under/rank/xenoarcheologist/zavod + icon = 'icons/obj/contained_items/department_uniforms/science.dmi' + icon_state = "zav_xenoarch" + item_state = "zav_xenoarch" + contained_sprite = TRUE + /* * Medical */ /obj/item/clothing/under/rank/chief_medical_officer desc = "It's a jumpsuit worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection." name = "chief medical officer's jumpsuit" - icon_state = "cmo" - item_state = "w_suit" - worn_state = "cmo" - permeability_coefficient = 0.50 - armor = list( - bio = ARMOR_BIO_MINOR - ) - -/obj/item/clothing/under/rank/geneticist - desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it." - name = "geneticist's jumpsuit" - icon_state = "genetics" - item_state = "w_suit" - worn_state = "geneticswhite" - permeability_coefficient = 0.50 - armor = list( - bio = ARMOR_BIO_MINOR - ) - -/obj/item/clothing/under/rank/virologist - desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it." - name = "virologist's jumpsuit" - icon_state = "virology" - item_state = "w_suit" - worn_state = "virology" + icon = 'icons/obj/contained_items/department_uniforms/command.dmi' + icon_state = "chief_medical_officer" + item_state = "chief_medical_officer" + contained_sprite = TRUE permeability_coefficient = 0.50 armor = list( bio = ARMOR_BIO_MINOR @@ -163,6 +146,24 @@ icon_state = "intern_medical" worn_state = "intern_medical" +/obj/item/clothing/under/rank/medical/intern/zeng + icon = 'icons/obj/contained_items/department_uniforms/medical.dmi' + icon_state = "zeng_intern" + item_state = "zeng_intern" + contained_sprite = TRUE + +/obj/item/clothing/under/rank/medical/intern/nt + icon = 'icons/obj/contained_items/department_uniforms/medical.dmi' + icon_state = "nt_intern" + item_state = "nt_intern" + contained_sprite = TRUE + +/obj/item/clothing/under/rank/medical/intern/pmc + icon = 'icons/obj/contained_items/department_uniforms/medical.dmi' + icon_state = "epmc_intern" + item_state = "epmc_intern" + contained_sprite = TRUE + /obj/item/clothing/under/rank/medical/blue name = "medical scrubs" desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue." @@ -191,6 +192,24 @@ item_state = "bl_suit" worn_state = "scrubsblack" +/obj/item/clothing/under/rank/medical/zeng + icon = 'icons/obj/contained_items/department_uniforms/security.dmi' + icon_state = "zeng_phys" + item_state = "zeng_phys" + contained_sprite = TRUE + +/obj/item/clothing/under/rank/medical/nt + icon = 'icons/obj/contained_items/department_uniforms/medical.dmi' + icon_state = "nt_phys" + item_state = "nt_phys" + contained_sprite = TRUE + +/obj/item/clothing/under/rank/medical/pmc + icon = 'icons/obj/contained_items/department_uniforms/medical.dmi' + icon_state = "epmc_phys" + item_state = "epmc_phys" + contained_sprite = TRUE + /obj/item/clothing/under/rank/medical/first_responder name = "first responder jumpsuit" desc = "A jumpsuit that denotes the wearer as a Nanotrasen First Responder." @@ -200,6 +219,24 @@ item_state = "firstresponderjumpsuit" worn_state = "firstresponderjumpsuit" +/obj/item/clothing/under/rank/medical/first_responder/zeng + icon = 'icons/obj/contained_items/department_uniforms/medical.dmi' + icon_state = "zeng_emt" + item_state = "zeng_emt" + contained_sprite = TRUE + +/obj/item/clothing/under/rank/medical/first_responder/nt + icon = 'icons/obj/contained_items/department_uniforms/medical.dmi' + icon_state = "nt_emt" + item_state = "nt_emt" + contained_sprite = TRUE + +/obj/item/clothing/under/rank/medical/first_responder/pmc + icon = 'icons/obj/contained_items/department_uniforms/medical.dmi' + icon_state = "epmc_emt" + item_state = "epmc_emt" + contained_sprite = TRUE + /obj/item/clothing/under/rank/psych desc = "A basic white jumpsuit. It has turqouise markings that denote the wearer as a psychiatrist." name = "psychiatrist's jumpsuit" @@ -207,13 +244,49 @@ item_state = "w_suit" worn_state = "psych" -/obj/item/clothing/under/rank/biochemist - desc = "Made of a special fiber that gives increased protection against hazards." - name = "chemist's jumpsuit" - icon_state = "virology" +/obj/item/clothing/under/rank/psych/zeng + icon = 'icons/obj/contained_items/department_uniforms/medical.dmi' + icon_state = "zeng_psych" + item_state = "zeng_psych" + contained_sprite = TRUE + +/obj/item/clothing/under/rank/psych/nt + icon = 'icons/obj/contained_items/department_uniforms/medical.dmi' + icon_state = "nt_psych" + item_state = "nt_psych" + contained_sprite = TRUE + +/obj/item/clothing/under/rank/psych/pmc + icon = 'icons/obj/contained_items/department_uniforms/medical.dmi' + icon_state = "epmc_psych" + item_state = "epmc_psych" + contained_sprite = TRUE + +/obj/item/clothing/under/rank/pharmacist + desc = "It's made of a special fiber that gives special protection against biohazards. It has a pharmacist rank stripe on it." + name = "pharmacist's jumpsuit" + icon_state = "chemistry" item_state = "w_suit" - worn_state = "virology" + worn_state = "chemistry" permeability_coefficient = 0.50 armor = list( bio = ARMOR_BIO_MINOR ) + +/obj/item/clothing/under/rank/pharmacist/zeng + icon = 'icons/obj/contained_items/department_uniforms/medical.dmi' + icon_state = "zeng_chemist" + item_state = "zeng_chemist" + contained_sprite = TRUE + +/obj/item/clothing/under/rank/pharmacist/nt + icon = 'icons/obj/contained_items/department_uniforms/medical.dmi' + icon_state = "nt_chemist" + item_state = "nt_chemist" + contained_sprite = TRUE + +/obj/item/clothing/under/rank/pharmacist/pmc + icon = 'icons/obj/contained_items/department_uniforms/medical.dmi' + icon_state = "epmc_chemist" + item_state = "epmc_chemist" + contained_sprite = TRUE \ No newline at end of file diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index a531db20578..cb14432e183 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -19,13 +19,23 @@ ) siemens_coefficient = 0.75 -/obj/item/clothing/under/rank/security/corp - icon_state = "officer_corporate" - worn_state = "officer_corporate" +/obj/item/clothing/under/rank/security/zavod + icon = 'icons/obj/contained_items/department_uniforms/security.dmi' + icon_state = "zav_officer" + item_state = "zav_officer" + contained_sprite = TRUE -/obj/item/clothing/under/rank/security/blue - icon_state = "officer_blue" - worn_state = "officer_blue" +/obj/item/clothing/under/rank/security/idris + icon = 'icons/obj/contained_items/department_uniforms/security.dmi' + icon_state = "idris_officer" + item_state = "idris_officer" + contained_sprite = TRUE + +/obj/item/clothing/under/rank/security/pmc + icon = 'icons/obj/contained_items/department_uniforms/security.dmi' + icon_state = "epmc_officer" + item_state = "epmc_officer" + contained_sprite = TRUE /obj/item/clothing/under/rank/cadet name = "security cadet's uniform" @@ -37,6 +47,24 @@ ) siemens_coefficient = 0.75 +/obj/item/clothing/under/rank/cadet/zavod + icon = 'icons/obj/contained_items/department_uniforms/security.dmi' + icon_state = "zav_cadet" + item_state = "zav_cadet" + contained_sprite = TRUE + +/obj/item/clothing/under/rank/cadet/idris + icon = 'icons/obj/contained_items/department_uniforms/security.dmi' + icon_state = "idris_cadet" + item_state = "idris_cadet" + contained_sprite = TRUE + +/obj/item/clothing/under/rank/cadet/pmc + icon = 'icons/obj/contained_items/department_uniforms/security.dmi' + icon_state = "epmc_cadet" + item_state = "epmc_cadet" + contained_sprite = TRUE + /obj/item/clothing/under/rank/warden name = "warden's uniform" desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. It has the word \"Warden\" written on the shoulders." @@ -47,13 +75,6 @@ ) siemens_coefficient = 0.75 -/obj/item/clothing/under/rank/warden/corp - icon_state = "warden_corporate" - worn_state = "warden_corporate" - -/obj/item/clothing/under/rank/warden/blue - icon_state = "warden_blue" - worn_state = "warden_blue" /obj/item/clothing/under/rank/warden/remote name = "remote warden's uniform" @@ -64,12 +85,30 @@ . = ..() sensor_mode = 0 +/obj/item/clothing/under/rank/warden/zavod + icon = 'icons/obj/contained_items/department_uniforms/security.dmi' + icon_state = "zav_warden" + item_state = "zav_warden" + contained_sprite = TRUE + +/obj/item/clothing/under/rank/warden/idris + icon = 'icons/obj/contained_items/department_uniforms/security.dmi' + icon_state = "idris_warden" + item_state = "idris_warden" + contained_sprite = TRUE + +/obj/item/clothing/under/rank/warden/pmc + icon = 'icons/obj/contained_items/department_uniforms/security.dmi' + icon_state = "epmc_warden" + item_state = "epmc_warden" + contained_sprite = TRUE + /* * Detective / Forensics */ /obj/item/clothing/under/det - name = "tan investigator's uniform" + name = "investigator's uniform" desc = "Someone who wears this means business." icon_state = "detective_standard" worn_state = "detective_standard" @@ -93,22 +132,39 @@ icon_state = "forensic_standard" worn_state = "forensic_standard" +/obj/item/clothing/under/det/zavod + icon = 'icons/obj/contained_items/department_uniforms/security.dmi' + icon_state = "zav_invest" + item_state = "zav_invest" + contained_sprite = TRUE + +/obj/item/clothing/under/det/idris + icon = 'icons/obj/contained_items/department_uniforms/security.dmi' + icon_state = "idris_invest" + item_state = "idris_invest" + contained_sprite = TRUE + +/obj/item/clothing/under/det/pmc + icon = 'icons/obj/contained_items/department_uniforms/security.dmi' + icon_state = "epmc_invest" + item_state = "epmc_invest" + contained_sprite = TRUE + /* * Head of Security */ /obj/item/clothing/under/rank/head_of_security desc = "It's a jumpsuit worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer." name = "head of security's uniform" - icon_state = "hos_standard" - worn_state = "hos_standard" + icon = 'icons/obj/contained_items/department_uniforms/command.dmi' + icon_state = "head_of_security" + item_state = "head_of_security" + contained_sprite = TRUE armor = list( melee = ARMOR_MELEE_SMALL ) siemens_coefficient = 0.75 -/obj/item/clothing/under/rank/head_of_security/corp - icon_state = "hos_corporate" - worn_state = "hos_corporate" /* * Contractors diff --git a/icons/obj/contained_items/department_uniforms/command.dmi b/icons/obj/contained_items/department_uniforms/command.dmi new file mode 100644 index 00000000000..5295c9fc12a Binary files /dev/null and b/icons/obj/contained_items/department_uniforms/command.dmi differ diff --git a/icons/obj/contained_items/department_uniforms/medical.dmi b/icons/obj/contained_items/department_uniforms/medical.dmi new file mode 100644 index 00000000000..fac12a3d36f Binary files /dev/null and b/icons/obj/contained_items/department_uniforms/medical.dmi differ diff --git a/icons/obj/contained_items/department_uniforms/science.dmi b/icons/obj/contained_items/department_uniforms/science.dmi new file mode 100644 index 00000000000..0e963f6b676 Binary files /dev/null and b/icons/obj/contained_items/department_uniforms/science.dmi differ diff --git a/icons/obj/contained_items/department_uniforms/security.dmi b/icons/obj/contained_items/department_uniforms/security.dmi new file mode 100644 index 00000000000..c8ebd37f6b8 Binary files /dev/null and b/icons/obj/contained_items/department_uniforms/security.dmi differ