From ffc66111e535766d5bcaa25c1c12b297ccf6bf48 Mon Sep 17 00:00:00 2001 From: alberyk Date: Wed, 29 Dec 2021 23:19:44 -0300 Subject: [PATCH] uniform --- code/game/jobs/jobs.dm | 2 +- .../closets/secure/scientist.dm | 4 - .../crates_lockers/closets/secure/security.dm | 6 - .../crates_lockers/closets/wardrobe.dm | 16 -- code/modules/cargo/random_stock/t3_rare.dm | 1 - .../loadout/loadout_uniform.dm | 38 --- code/modules/clothing/under/jobs/civilian.dm | 24 +- .../clothing/under/jobs/engineering.dm | 7 +- code/modules/clothing/under/jobs/medsci.dm | 239 ++++++++++++------ code/modules/clothing/under/jobs/security.dm | 94 +++++-- .../department_uniforms/command.dmi | Bin 0 -> 2027 bytes .../department_uniforms/medical.dmi | Bin 0 -> 4677 bytes .../department_uniforms/science.dmi | Bin 0 -> 3419 bytes .../department_uniforms/security.dmi | Bin 0 -> 3605 bytes 14 files changed, 249 insertions(+), 182 deletions(-) create mode 100644 icons/obj/contained_items/department_uniforms/command.dmi create mode 100644 icons/obj/contained_items/department_uniforms/medical.dmi create mode 100644 icons/obj/contained_items/department_uniforms/science.dmi create mode 100644 icons/obj/contained_items/department_uniforms/security.dmi 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 0000000000000000000000000000000000000000..5295c9fc12af9da84c9945e6c4c3013b9beea8ec GIT binary patch literal 2027 zcmVc zXP1H5?q*wl5d~xr0yW0v;H$L5hligjDlu7QX--vLHatV|kLZdEX@UR%00DGTPE!Ct z=GbNc007B)R9JLGWpiV4X>fFDZ*Bkpc$}4yy^aDg420{=Q$*0CSZKG|bW?RvZ0AMNI_Hy23eA=zKMn*EsO%0Xi>%Y|toxQqHW zSxHgk#M7w6$(_^0G=U{QNz=4KJ)V00iQ)!-R=&UuZOa}~1D%9J2j>OXnz$f?#79?R z@H$k@7)A(bX`Nk9iMqPYA}Ew5E|*rqdaq%8WVEhFU{8PlIl~)7>Nw#mF}2&{=Jm-3 z*KUw03gOYJ000J>Nkll*O6h4JELN*#wTCmqJb{(LTY&xQWE^*=}Yk=BK zS6j&`0XoD{t)qbs0*sn;yJ$+H*h7)2r7{HVQb`^>wRNH&)gv32?;Wi>D`F9#xd$&F z`5r$WDOun59!ZD}9XkFmQE=kF;g}Szh$R;;17IwWf(xmNv8`74thUdYMsA6d%#}5 zhYuL_Td1HP!TrkmV!wTGB*FX$C_i38OOl_dFLqi7uOygnK>38c?H!L+fBg291gi;@ z_5U?Nza?D5)`<5&QC}P!4+auUtacj{wA(F7ex_cB4jno^jxfs7EruKa4achbSm3)? zAim&Mpx71lzKG*`bU*{wC;EQ@ZkQ6(dxKISuZ>!)o(2Da)i`0cYhuEaQl11RAq>lNMqq*w-vcrntLozfA14HuAY{Hw z|C?v|2S_lk{#VtHt^ZZ^3>5PNOyC0lkVs=c74R|kpT6#Bm~M!Cbr|= zfb|oujZQ$(|1ZqPe!&@vN#R<9-iP(KY3&JmgozYt>|`G>+;;{iw@A25i1A;$g)&mWP0 z`~SiUK>uI#3upTWfdKi3ME?s3^7+At{vqlAhcF=wN1Y!?{ezw#==p)3A0!ESexO5# z4jto%;gG_t1grdm^_-aS->LO?7@olFinF>hUmlLRe^|u+VHWv^{ioqxyP4v>L;CGg zfDO7?veEot^XgSRKVX|BNU$;w-X&;OQe(t$6#X3gS|Bv-Q_77P9 zTTv%M;#edoICBnulgPoCEB-lHaFe?M@XfQ{9`(@*q6iW4OA-dMOJp=JiVo(n3BKvc zJwOBj2R*YhQqGol5=OMryMP8-R2>!^K* z?tvMUy-jjec;}Te0&cjQRC17RY9+XGA z2Ufd<^t*_O88(p-7cu|#qX9P|uABLd)1gC$4jpD&+yd2j4zc&>IXa-Z|McOI)b|Rr z_T4mY?{C~m#c?hK`_C}J&hvZ;*iVO8+@AcA%Kcmje(a(a+2G)pya`_7PVVRV5*Y3m zSWCW$e$Vw+-6BNjMRy3vvu(%;BB9xxJAv4q&za!(QU|x^d#{VRc2*C1B7xW|9y2WD zA9%cp@@)+(o7-a(L?S`nE9i-rsFN>2QG8lwFgVVYK*tA+e*lKPpKxl77SjL#002ov JPDHLkV1gzG(^dcg literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fac12a3d36ffb6297ae20ed341255a931e1b2628 GIT binary patch literal 4677 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0e963f6b676ac17c40fb41ffdb9a145d734afd3e GIT binary patch literal 3419 zcmYk92{0Sl_s0{`SVFYrS*z%#j}mQasdz|jReRAzsjX_4)E0^asl8g&Hma6TiWc#n zrL>la+R7_!d8)R=5>ZM>Vo3x)o%#RY@AsKG_d9p)J?G5anRCwEG<#bMaZ!0u001Cv zdCBz3zS4e~u;Bix!G1BcFIM)}PG)P57M=vCTmk@IrJbGbbI%qPbrBN6iikMFW!&A} zCnqOsYir}<`yn0*vQJ@9b~>y61E~+|(z`JJcT??vDxq0HX4rWjBj{&=NEA-B!1*&1oCaJgIWq z53ACYCLdTKNO(cO#?cLvLpI7FjE;9jUym%6En7zftP3QdH|9MyDjTk1j(oQq4Q>dH ze==*Q{8lVf+OC;%UOCEqW_KP^Z7wFY?c$c$da*@!FG*QmB7E*O$VEUUwoxqXP`P(oscbnxyK;SGGT3hF; z`Wz|2e&E*-RgYDtuYIma^NZkI8BnzE!6lg#@4L5kYHT?}FMHWuTAlDvuhBnrE@cuc za@*&NH>^VP6pDx!dGsnJS^?6GtS6m|Q8v;5ZPnaT?%X@5hs1|0dsldTW$fiGu;*04 z?DRYr>!c1GDADoc;N$m5ISQ@sJR%*d0

bIKi(X&zTW-s}^zQ_S1IHjnYN_?iU_N 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c8ebd37f6b81ce86e682e9e9de51bd7fd4dfed77 GIT binary patch literal 3605 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 literal 0 HcmV?d00001