diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index b03d49fa14d..a36a9c16604 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -20703,7 +20703,6 @@ /area/security/checkpoint/medical) "deC" = ( /obj/structure/closet/secure_closet/chief_medical, -/obj/item/clothing/under/rank/medical/doctor, /obj/item/clothing/head/nursehat, /obj/effect/turf_decal/stripes/line{ dir = 5 diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index a9e42fecf51..127243c58c1 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -8553,7 +8553,6 @@ /obj/structure/grille/broken, /obj/item/clothing/gloves/color/latex, /obj/item/clothing/mask/surgical, -/obj/item/clothing/under/rank/medical/doctor, /turf/open/floor/plating, /area/maintenance/port/greater) "aRQ" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 6c7c478b053..91dfdfa7b6f 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -58683,7 +58683,7 @@ /obj/machinery/camera/directional/south{ c_tag = "Brig - Infirmary" }, -/obj/item/clothing/under/rank/medical/doctor/purple, +/obj/item/clothing/under/rank/medical/scrubs/purple, /obj/item/storage/firstaid/regular, /obj/item/healthanalyzer{ pixel_y = -2 diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index d9dbee32a62..008f22e9d44 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -188,12 +188,10 @@ /obj/item/storage/backpack/medic = 1, /obj/item/storage/backpack/satchel/med = 1, /obj/item/clothing/suit/hooded/wintercoat/medical = 1, - /obj/item/clothing/under/rank/medical/doctor/nurse = 1, /obj/item/clothing/head/nursehat = 1, - /obj/item/clothing/under/rank/medical/doctor/blue = 1, - /obj/item/clothing/under/rank/medical/doctor/green = 1, - /obj/item/clothing/under/rank/medical/doctor/purple = 1, - /obj/item/clothing/under/rank/medical/doctor = 3, + /obj/item/clothing/under/rank/medical/scrubs/blue = 1, + /obj/item/clothing/under/rank/medical/scrubs/green = 1, + /obj/item/clothing/under/rank/medical/scrubs/purple = 1, /obj/item/clothing/suit/toggle/labcoat = 3, /obj/item/clothing/suit/toggle/labcoat/paramedic = 3, /obj/item/clothing/shoes/sneakers/white = 3, diff --git a/code/modules/clothing/under/jobs/medical.dm b/code/modules/clothing/under/jobs/medical.dm index 76f9dd66439..67c70a76b3a 100644 --- a/code/modules/clothing/under/jobs/medical.dm +++ b/code/modules/clothing/under/jobs/medical.dm @@ -4,6 +4,21 @@ permeability_coefficient = 0.5 armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 10, FIRE = 0, ACID = 0) +/obj/item/clothing/under/rank/medical/doctor + desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel." + name = "medical doctor's jumpsuit" + icon_state = "medical" + inhand_icon_state = "w_suit" + +/obj/item/clothing/under/rank/medical/doctor/skirt + name = "medical doctor's jumpskirt" + desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel." + icon_state = "medical_skirt" + inhand_icon_state = "w_suit" + body_parts_covered = CHEST|GROIN|ARMS + dying_key = DYE_REGISTRY_JUMPSKIRT + fitted = FEMALE_UNIFORM_TOP + /obj/item/clothing/under/rank/medical/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" @@ -26,6 +41,7 @@ inhand_icon_state = "b_suit" can_adjust = TRUE alt_covers_chest = TRUE + fitted = FEMALE_UNIFORM_TOP /obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck/skirt name = "chief medical officer's turtleneck skirt" @@ -34,7 +50,6 @@ inhand_icon_state = "b_suit" body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT - fitted = FEMALE_UNIFORM_TOP /obj/item/clothing/under/rank/medical/virologist desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it." @@ -51,47 +66,19 @@ dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP -/obj/item/clothing/under/rank/medical/doctor/nurse - desc = "It's a jumpsuit commonly worn by nursing staff in the medical department." - name = "nurse's suit" - icon_state = "nursesuit" - inhand_icon_state = "w_suit" - body_parts_covered = CHEST|GROIN|ARMS - fitted = NO_FEMALE_UNIFORM - can_adjust = FALSE - -/obj/item/clothing/under/rank/medical/doctor - desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel." - name = "medical doctor's jumpsuit" - icon_state = "medical" - inhand_icon_state = "w_suit" - -/obj/item/clothing/under/rank/medical/doctor/blue +/obj/item/clothing/under/rank/medical/scrubs/blue name = "medical scrubs" desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue." icon_state = "scrubsblue" can_adjust = FALSE -/obj/item/clothing/under/rank/medical/doctor/green - name = "medical scrubs" +/obj/item/clothing/under/rank/medical/scrubs/green desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green." icon_state = "scrubsgreen" - can_adjust = FALSE -/obj/item/clothing/under/rank/medical/doctor/purple - name = "medical scrubs" +/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" - can_adjust = FALSE - -/obj/item/clothing/under/rank/medical/doctor/skirt - name = "medical doctor's jumpskirt" - desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel." - icon_state = "medical_skirt" - inhand_icon_state = "w_suit" - body_parts_covered = CHEST|GROIN|ARMS - dying_key = DYE_REGISTRY_JUMPSKIRT - fitted = FEMALE_UNIFORM_TOP /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." @@ -124,3 +111,12 @@ body_parts_covered = CHEST|GROIN|ARMS dying_key = DYE_REGISTRY_JUMPSKIRT fitted = FEMALE_UNIFORM_TOP + +/obj/item/clothing/under/rank/medical/doctor/nurse + desc = "It's a jumpsuit commonly worn by nursing staff in the medical department." + name = "nurse's suit" + icon_state = "nursesuit" + inhand_icon_state = "w_suit" + body_parts_covered = CHEST|GROIN|ARMS + fitted = NO_FEMALE_UNIFORM + can_adjust = FALSE diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index 0d6910b2392..d70ec02b6cf 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -44,7 +44,7 @@ jobtype = /datum/job/doctor id_trim = /datum/id_trim/job/medical_doctor - uniform = /obj/item/clothing/under/rank/medical/doctor + uniform = /obj/item/clothing/under/rank/medical/scrubs/blue suit = /obj/item/clothing/suit/toggle/labcoat suit_store = /obj/item/flashlight/pen belt = /obj/item/pda/medical diff --git a/code/modules/mafia/outfits.dm b/code/modules/mafia/outfits.dm index 45c28763b6d..a5040c640ba 100644 --- a/code/modules/mafia/outfits.dm +++ b/code/modules/mafia/outfits.dm @@ -38,7 +38,7 @@ /datum/outfit/mafia/md name = "Mafia Medical Doctor" - uniform = /obj/item/clothing/under/rank/medical/doctor + uniform = /obj/item/clothing/under/rank/medical/scrubs/blue shoes = /obj/item/clothing/shoes/sneakers/white suit = /obj/item/clothing/suit/toggle/labcoat diff --git a/code/modules/mob_spawn/corpses/mob_corpses.dm b/code/modules/mob_spawn/corpses/mob_corpses.dm index 9e06c61d924..ebc9b50140b 100644 --- a/code/modules/mob_spawn/corpses/mob_corpses.dm +++ b/code/modules/mob_spawn/corpses/mob_corpses.dm @@ -195,7 +195,7 @@ /datum/outfit/cat_butcher name = "Cat Butcher Uniform" - uniform = /obj/item/clothing/under/rank/medical/doctor/green + uniform = /obj/item/clothing/under/rank/medical/scrubs/green suit = /obj/item/clothing/suit/apron/surgical shoes = /obj/item/clothing/shoes/sneakers/white gloves = /obj/item/clothing/gloves/color/latex/nitrile diff --git a/code/modules/mob_spawn/ghost_roles/mining_roles.dm b/code/modules/mob_spawn/ghost_roles/mining_roles.dm index 698a87c0969..cd1814b8b22 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/doctor + outfit.uniform = /obj/item/clothing/under/rank/medical/scrubs/blue outfit.suit = /obj/item/clothing/suit/toggle/labcoat outfit.back = /obj/item/storage/backpack/medic if(4) diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index 56aa0536188..9842334de7b 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -131,7 +131,8 @@ /obj/item/clothing/suit/changshan_blue = 1, /obj/item/clothing/suit/cheongsam_red = 1, /obj/item/clothing/suit/cheongsam_blue = 1, - /obj/item/gohei = 1 + /obj/item/gohei = 1, + /obj/item/clothing/under/rank/medical/doctor/nurse = 1, ) contraband = list( /obj/item/clothing/suit/judgerobe = 1, diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 7b5aa3ad388..e9196e3cfd8 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -53,14 +53,13 @@ /obj/item/clothing/suit/hooded/wintercoat/medical/paramedic = 4, /obj/item/clothing/under/rank/medical/paramedic = 4, /obj/item/clothing/under/rank/medical/paramedic/skirt = 4, - /obj/item/clothing/under/rank/medical/doctor/nurse = 4, /obj/item/clothing/head/nursehat = 4, /obj/item/clothing/head/beret/medical = 4, - /obj/item/clothing/under/rank/medical/doctor/skirt= 4, - /obj/item/clothing/under/rank/medical/doctor/blue = 4, - /obj/item/clothing/under/rank/medical/doctor/green = 4, - /obj/item/clothing/under/rank/medical/doctor/purple = 4, /obj/item/clothing/under/rank/medical/doctor = 4, + /obj/item/clothing/under/rank/medical/doctor/skirt = 4, + /obj/item/clothing/under/rank/medical/scrubs/blue = 4, + /obj/item/clothing/under/rank/medical/scrubs/green = 4, + /obj/item/clothing/under/rank/medical/scrubs/purple = 4, /obj/item/clothing/suit/toggle/labcoat = 4, /obj/item/clothing/suit/toggle/labcoat/paramedic = 4, /obj/item/clothing/shoes/sneakers/white = 4, diff --git a/icons/mob/clothing/under/medical.dmi b/icons/mob/clothing/under/medical.dmi index cfe8e04a022..5725a8c29c5 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/under/medical.dmi b/icons/obj/clothing/under/medical.dmi index 3f1dce1ee0e..e740c3b94ac 100644 Binary files a/icons/obj/clothing/under/medical.dmi and b/icons/obj/clothing/under/medical.dmi differ diff --git a/tools/UpdatePaths/clothingunderrepath.txt b/tools/UpdatePaths/clothingunderrepath.txt index cde2d182d95..e82dfce3d24 100644 --- a/tools/UpdatePaths/clothingunderrepath.txt +++ b/tools/UpdatePaths/clothingunderrepath.txt @@ -144,12 +144,9 @@ /obj/item/clothing/under/rank/chief_medical_officer : /obj/item/clothing/under/rank/medical/chief_medical_officer /obj/item/clothing/under/rank/chief_medical_officer/skirt : /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt -/obj/item/clothing/under/rank/medical : /obj/item/clothing/under/rank/medical/doctor -/obj/item/clothing/under/rank/medical/blue : /obj/item/clothing/under/rank/medical/doctor/blue -/obj/item/clothing/under/rank/medical/green : /obj/item/clothing/under/rank/medical/doctor/green -/obj/item/clothing/under/rank/medical/purple : /obj/item/clothing/under/rank/medical/doctor/purple -/obj/item/clothing/under/rank/medical/skirt : /obj/item/clothing/under/rank/medical/doctor/skirt -/obj/item/clothing/under/rank/nursesuit : /obj/item/clothing/under/rank/medical/doctor/nurse +/obj/item/clothing/under/rank/medical/doctor/blue : /obj/item/clothing/under/rank/medical/scrubs/blue +/obj/item/clothing/under/rank/medical/doctor/blue : /obj/item/clothing/under/rank/medical/scrubs/green +/obj/item/clothing/under/rank/medical/doctor/blue : /obj/item/clothing/under/rank/medical/scrubs/purple /obj/item/clothing/under/rank/geneticist : /obj/item/clothing/under/rank/rnd/geneticist /obj/item/clothing/under/rank/geneticist/skirt : /obj/item/clothing/under/rank/rnd/geneticist/skirt /obj/item/clothing/under/rank/virologist : /obj/item/clothing/under/rank/medical/virologist