From 86ee8d0917c2a35e900fba3e436f56714008f715 Mon Sep 17 00:00:00 2001 From: Cameron! Date: Wed, 31 Jul 2019 18:45:11 -0700 Subject: [PATCH] Fixes Medical Doctors and Quartermasters spawning with the wrong uniforms (#45640) Fixes Medical Doctors and Quartermasters spawning with the wrong uniforms --- code/modules/jobs/job_types/medical_doctor.dm | 2 +- code/modules/jobs/job_types/quartermaster.dm | 2 +- tools/mapmerge2/map_scripts/clothingunderrepath.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index 336dd183710..ae3f382bae0 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -24,7 +24,7 @@ belt = /obj/item/pda/medical ears = /obj/item/radio/headset/headset_med - uniform = /obj/item/clothing/under/rank/medical + uniform = /obj/item/clothing/under/rank/medical/doctor shoes = /obj/item/clothing/shoes/sneakers/white suit = /obj/item/clothing/suit/toggle/labcoat l_hand = /obj/item/storage/firstaid/regular diff --git a/code/modules/jobs/job_types/quartermaster.dm b/code/modules/jobs/job_types/quartermaster.dm index 5ab1131c2a4..643ede96b1c 100644 --- a/code/modules/jobs/job_types/quartermaster.dm +++ b/code/modules/jobs/job_types/quartermaster.dm @@ -24,7 +24,7 @@ belt = /obj/item/pda/quartermaster ears = /obj/item/radio/headset/headset_cargo - uniform = /obj/item/clothing/under/rank/cargo + uniform = /obj/item/clothing/under/rank/cargo/qm shoes = /obj/item/clothing/shoes/sneakers/brown glasses = /obj/item/clothing/glasses/sunglasses l_hand = /obj/item/clipboard diff --git a/tools/mapmerge2/map_scripts/clothingunderrepath.txt b/tools/mapmerge2/map_scripts/clothingunderrepath.txt index e8ca30935b4..85702146b56 100644 --- a/tools/mapmerge2/map_scripts/clothingunderrepath.txt +++ b/tools/mapmerge2/map_scripts/clothingunderrepath.txt @@ -145,12 +145,12 @@ /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/nurse +/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 +/obj/item/clothing/under/rank/nursesuit : /obj/item/clothing/under/rank/medical/doctor/nurse /obj/item/clothing/under/rank/geneticist : /obj/item/clothing/under/rank/medical/geneticist /obj/item/clothing/under/rank/geneticist/skirt : /obj/item/clothing/under/rank/medical/geneticist/skirt /obj/item/clothing/under/rank/virologist : /obj/item/clothing/under/rank/medical/virologist