From 2c7fe7b8cd456b61fa31da1000518947c44f9794 Mon Sep 17 00:00:00 2001 From: iwishforducks <65363339+iwishforducks@users.noreply.github.com> Date: Mon, 20 May 2024 02:57:24 -0400 Subject: [PATCH] Returns medical jumpsuits for medical doctors and CMO (#83191) ## About The Pull Request Gives medical doctors and CMOs back their jumpsuits. Additionally removes their surgery cap from their starting gear. Surgical scrubs and surgery caps are still available in vending machines and in other places. Coroner still has their scrubs. ## Why It's Good For The Game The scrubs have never made sense to be as part of a medical doctor's starting gear. Scrubs are meant to be put on for one surgery and replaced afterwards, not to be worn 24/7. Also, in my opinion, they look goofy as hell. Especially when doctors are wearing lab coats over them. [_Being a medical doctor does not inherently mean you're doing surgeries either._](https://www.youtube.com/watch?v=8byiwOY5XM0) ## Changelog :cl: image: Medical doctors and CMOs now start with their jumpsuits rather than surgery scrubs and caps. /:cl: --- .../jobs/job_types/chief_medical_officer.dm | 3 +-- code/modules/jobs/job_types/medical_doctor.dm | 3 +-- .../mob_spawn/ghost_roles/mining_roles.dm | 2 +- ...reenshot_humanoids__datum_species_moth.png | Bin 1667 -> 1648 bytes 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm index e20ef7c19ed..3f580b8e932 100644 --- a/code/modules/jobs/job_types/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/chief_medical_officer.dm @@ -56,7 +56,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/scrubs + uniform = /obj/item/clothing/under/rank/medical/chief_medical_officer suit = /obj/item/clothing/suit/toggle/labcoat/cmo suit_store = /obj/item/flashlight/pen/paramedic backpack_contents = list( @@ -64,7 +64,6 @@ ) belt = /obj/item/modular_computer/pda/heads/cmo ears = /obj/item/radio/headset/heads/cmo - head = /obj/item/clothing/head/utility/surgerycap/cmo shoes = /obj/item/clothing/shoes/sneakers/blue l_pocket = /obj/item/laser_pointer/blue r_pocket = /obj/item/pinpointer/crew diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index a0f2971df23..ccfcbae1623 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -44,12 +44,11 @@ jobtype = /datum/job/doctor id_trim = /datum/id_trim/job/medical_doctor - uniform = /obj/item/clothing/under/rank/medical/scrubs/blue + uniform = /obj/item/clothing/under/rank/medical/doctor suit = /obj/item/clothing/suit/toggle/labcoat suit_store = /obj/item/flashlight/pen belt = /obj/item/modular_computer/pda/medical ears = /obj/item/radio/headset/headset_med - head = /obj/item/clothing/head/utility/surgerycap shoes = /obj/item/clothing/shoes/sneakers/white l_hand = /obj/item/storage/medkit/surgery diff --git a/code/modules/mob_spawn/ghost_roles/mining_roles.dm b/code/modules/mob_spawn/ghost_roles/mining_roles.dm index 53fa0010970..5fb3337b911 100644 --- a/code/modules/mob_spawn/ghost_roles/mining_roles.dm +++ b/code/modules/mob_spawn/ghost_roles/mining_roles.dm @@ -34,7 +34,7 @@ if(3) flavour_text += "you were a doctor on one of Nanotrasen's space stations, but you left behind that damn corporation's tyranny and everything it stood for. From a metaphorical hell \ to a literal one, you find yourself nonetheless missing the recycled air and warm floors of what you left behind... but you'd still rather be here than there." - outfit.uniform = /obj/item/clothing/under/rank/medical/scrubs/blue + outfit.uniform = /obj/item/clothing/under/rank/medical/doctor outfit.suit = /obj/item/clothing/suit/toggle/labcoat outfit.back = /obj/item/storage/backpack/medic if(4) 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 ed782c8ec9f6e1a2ad9e042a639cda20952bd908..284205a73ec132117c951f148a2dc7f207e5e6da 100644 GIT binary patch delta 1382 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 Hu0mjf9Wjgj