diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm index 5de3d487004..c841f5e64f4 100644 --- a/code/game/objects/items/storage/garment.dm +++ b/code/game/objects/items/storage/garment.dm @@ -100,8 +100,10 @@ /obj/item/storage/bag/garment/chief_medical/PopulateContents() new /obj/item/clothing/head/beret/medical/cmo(src) + new /obj/item/clothing/head/surgerycap/cmo(src) new /obj/item/clothing/under/rank/medical/chief_medical_officer(src) new /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt(src) + new /obj/item/clothing/under/rank/medical/chief_medical_officer/scrubs(src) new /obj/item/clothing/suit/toggle/labcoat/cmo(src) new /obj/item/clothing/gloves/color/latex/nitrile(src) new /obj/item/clothing/neck/cloak/cmo(src) diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 7ed8a101b8d..3d148c84951 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -19,7 +19,7 @@ /obj/item/clothing/head/chefhat/Initialize(mapload) . = ..() - + create_storage(type = /datum/storage/pockets/chefhat) /obj/item/clothing/head/chefhat/i_am_assuming_direct_control @@ -312,6 +312,26 @@ desc = "A beret in a distinct surgical turquoise!" greyscale_colors = "#5EB8B8" +/obj/item/clothing/head/surgerycap + name = "blue surgery cap" + icon_state = "surgicalcap" + desc = "A blue medical surgery cap to prevent the surgeon's hair from entering the insides of the patient!" + +/obj/item/clothing/head/surgerycap/purple + name = "burgundy surgery cap" + icon_state = "surgicalcapwine" + desc = "A burgundy medical surgery cap to prevent the surgeon's hair from entering the insides of the patient!" + +/obj/item/clothing/head/surgerycap/green + name = "green surgery cap" + icon_state = "surgicalcapgreen" + desc = "A green medical surgery cap to prevent the surgeon's hair from entering the insides of the patient!" + +/obj/item/clothing/head/surgerycap/cmo + name = "turquoise surgery cap" + icon_state = "surgicalcapcmo" + desc = "The CMO's medical surgery cap to prevent their hair from entering the insides of the patient!" + //Engineering diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 0bfe3ab75aa..d7d08c8e1cc 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -28,10 +28,10 @@ //Standard biosuit, orange stripe /obj/item/clothing/head/bio_hood/general - icon_state = "bio_general" + icon_state = "bio" /obj/item/clothing/suit/bio_suit/general - icon_state = "bio_general" + icon_state = "bio" //Virology biosuit, green stripe diff --git a/code/modules/clothing/under/jobs/medical.dm b/code/modules/clothing/under/jobs/medical.dm index 72b61c2e0a0..5151e97180d 100644 --- a/code/modules/clothing/under/jobs/medical.dm +++ b/code/modules/clothing/under/jobs/medical.dm @@ -35,6 +35,12 @@ female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON +/obj/item/clothing/under/rank/medical/chief_medical_officer/scrubs + name = "chief medical officer's scrubs" + desc = "A distinctive set of white and turquoise scrubs given to chief medical officers who desire a clinical look." + icon_state = "scrubscmo" + inhand_icon_state = "w_suit" + /obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck name = "chief medical officer's turtleneck" desc = "A light blue turtleneck and tan khakis, for a chief medical officer with a superior sense of style." @@ -84,7 +90,7 @@ /obj/item/clothing/under/rank/medical/scrubs/purple desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple." - icon_state = "scrubspurple" + icon_state = "scrubswine" /obj/item/clothing/under/rank/medical/chemist desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it." diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index f9fb1e67ffe..b5178e574ce 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -93,9 +93,9 @@ /obj/item/clothing/under/syndicate/scrubs name = "tactical scrubs" - desc = "A deep purple set of scrubs, made tactically for tactical reasons." + desc = "A deep burgundy set of scrubs, made tactically for tactical reasons." icon = 'icons/obj/clothing/under/medical.dmi' worn_icon = 'icons/mob/clothing/under/medical.dmi' - icon_state = "scrubspurple" + icon_state = "scrubswine" can_adjust = FALSE armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 50, FIRE = 50, ACID = 40) diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm index dc98f48d5c4..d8c45589d71 100644 --- a/code/modules/jobs/job_types/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/chief_medical_officer.dm @@ -55,7 +55,7 @@ id = /obj/item/card/id/advanced/silver id_trim = /datum/id_trim/job/chief_medical_officer - uniform = /obj/item/clothing/under/rank/medical/chief_medical_officer + uniform = /obj/item/clothing/under/rank/medical/chief_medical_officer/scrubs suit = /obj/item/clothing/suit/toggle/labcoat/cmo suit_store = /obj/item/flashlight/pen/paramedic backpack_contents = list( @@ -63,6 +63,7 @@ ) belt = /obj/item/modular_computer/tablet/pda/heads/cmo ears = /obj/item/radio/headset/heads/cmo + head = /obj/item/clothing/head/surgerycap/cmo shoes = /obj/item/clothing/shoes/sneakers/blue l_pocket = /obj/item/pinpointer/crew l_hand = /obj/item/storage/medkit/surgery diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index 677a273262a..c76fbc86000 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -49,6 +49,7 @@ suit_store = /obj/item/flashlight/pen belt = /obj/item/modular_computer/tablet/pda/medical ears = /obj/item/radio/headset/headset_med + head = /obj/item/clothing/head/surgerycap shoes = /obj/item/clothing/shoes/sneakers/white l_hand = /obj/item/storage/medkit/surgery diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png index 220ad4a5f39..442cfa89584 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_moth.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_moth.png index 7ca184b0f5b..beb0360508d 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_moth.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_moth.png differ diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 61453b53d6e..56ebc486d3d 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -60,6 +60,9 @@ /obj/item/clothing/under/rank/medical/paramedic/skirt = 4, /obj/item/clothing/head/nursehat = 4, /obj/item/clothing/head/beret/medical = 4, + /obj/item/clothing/head/surgerycap = 4, + /obj/item/clothing/head/surgerycap/purple = 4, + /obj/item/clothing/head/surgerycap/green = 4, /obj/item/clothing/mask/bandana/striped/medical = 4, /obj/item/clothing/under/rank/medical/doctor = 4, /obj/item/clothing/under/rank/medical/doctor/skirt = 4, diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index e388bea3b60..7932692f1c2 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suits/bio.dmi b/icons/mob/clothing/suits/bio.dmi index 94740791e66..b2d1359ba83 100644 Binary files a/icons/mob/clothing/suits/bio.dmi and b/icons/mob/clothing/suits/bio.dmi differ diff --git a/icons/mob/clothing/suits/labcoat.dmi b/icons/mob/clothing/suits/labcoat.dmi index 8510d62d63f..b9f6756bf89 100644 Binary files a/icons/mob/clothing/suits/labcoat.dmi and b/icons/mob/clothing/suits/labcoat.dmi differ diff --git a/icons/mob/clothing/under/medical.dmi b/icons/mob/clothing/under/medical.dmi index 5725a8c29c5..d667c98ec74 100644 Binary files a/icons/mob/clothing/under/medical.dmi and b/icons/mob/clothing/under/medical.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index da407947350..acf5315fcba 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 70fb1507223..3491cab7baf 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/under/medical.dmi b/icons/obj/clothing/under/medical.dmi index e740c3b94ac..504a939c19d 100644 Binary files a/icons/obj/clothing/under/medical.dmi and b/icons/obj/clothing/under/medical.dmi differ