diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 105c7cb660..9d9ce25dbe 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -70,7 +70,7 @@ new /obj/item/weapon/storage/backpack/dufflebag/med(src) new /obj/item/clothing/under/rank/nursesuit (src) new /obj/item/clothing/head/nursehat (src) - switch(pick("blue", "green", "purple", "black")) + switch(pick("blue", "green", "purple", "black", "navyblue")) if ("blue") new /obj/item/clothing/under/rank/medical/blue(src) new /obj/item/clothing/head/surgery/blue(src) @@ -83,7 +83,10 @@ if ("black") new /obj/item/clothing/under/rank/medical/black(src) new /obj/item/clothing/head/surgery/black(src) - switch(pick("blue", "green", "purple", "black")) + if ("navyblue") + new /obj/item/clothing/under/rank/medical/navyblue(src) + new /obj/item/clothing/head/surgery/navyblue(src) + switch(pick("blue", "green", "purple", "black", "navyblue")) if ("blue") new /obj/item/clothing/under/rank/medical/blue(src) new /obj/item/clothing/head/surgery/blue(src) @@ -96,6 +99,9 @@ if ("black") new /obj/item/clothing/under/rank/medical/black(src) new /obj/item/clothing/head/surgery/black(src) + if ("navyblue") + new /obj/item/clothing/under/rank/medical/navyblue(src) + new /obj/item/clothing/head/surgery/navyblue(src) new /obj/item/clothing/under/rank/medical(src) new /obj/item/clothing/under/rank/nurse(src) new /obj/item/clothing/under/rank/orderly(src) @@ -168,7 +174,7 @@ new /obj/item/clothing/suit/bio_suit/cmo(src) new /obj/item/clothing/head/bio_hood/cmo(src) new /obj/item/clothing/shoes/white(src) - switch(pick("blue", "green", "purple", "black")) + switch(pick("blue", "green", "purple", "black", "navyblue")) if ("blue") new /obj/item/clothing/under/rank/medical/blue(src) new /obj/item/clothing/head/surgery/blue(src) @@ -181,6 +187,9 @@ if ("black") new /obj/item/clothing/under/rank/medical/black(src) new /obj/item/clothing/head/surgery/black(src) + if ("navyblue") + new /obj/item/clothing/under/rank/medical/navyblue(src) + new /obj/item/clothing/head/surgery/navyblue(src) new /obj/item/clothing/under/rank/chief_medical_officer(src) new /obj/item/clothing/under/rank/chief_medical_officer/skirt(src) new /obj/item/clothing/suit/storage/toggle/labcoat/cmo(src) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index aa820a48fa..e7061a2663 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -453,6 +453,8 @@ new /obj/item/clothing/under/rank/medical/green(src) new /obj/item/clothing/under/rank/medical/purple(src) new /obj/item/clothing/under/rank/medical/black(src) + new /obj/item/clothing/under/rank/medical/navyblue(src) + new /obj/item/clothing/head/surgery/navyblue(src) new /obj/item/clothing/head/surgery/purple(src) new /obj/item/clothing/head/surgery/blue(src) new /obj/item/clothing/head/surgery/green(src) diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 927ed31743..950c9adccc 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -412,6 +412,10 @@ display_name = "scrubs, green" path = /obj/item/clothing/under/rank/medical/green +/datum/gear/uniform/scrubs/navyblue + display_name = "scrubs, navy blue" + path = /obj/item/clothing/under/rank/medical/navyblue + /datum/gear/uniform/sundress display_name = "sundress" path = /obj/item/clothing/under/sundress diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index be9abbf920..abee8ea05b 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -123,4 +123,8 @@ /obj/item/clothing/head/surgery/black desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is black." - icon_state = "surgcap_black" \ No newline at end of file + icon_state = "surgcap_black" + +/obj/item/clothing/head/surgery/navyblue + desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is navy blue." + icon_state = "surgcap_navyblue" \ No newline at end of file diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index 057733298e..4b212331be 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -204,6 +204,14 @@ worn_state = "scrubsblack" rolled_sleeves = -1 +/obj/item/clothing/under/rank/medical/navyblue + name = "medical scrubs" + desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in navy blue." + icon_state = "scrubsnavyblue" + item_state = "b_suit" + worn_state = "scrubsnavyblue" + rolled_sleeves = -1 + /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" diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 3ea8a3254c..a3c1bbe37f 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index ca80f8ba10..b3f36c6fe7 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 32b620c75c..fd9c280160 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 04ce2aa9c7..e6094f3bb0 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ