diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm index 948ed04200f..750b97437b9 100644 --- a/code/game/objects/items/storage/garment.dm +++ b/code/game/objects/items/storage/garment.dm @@ -163,7 +163,7 @@ new /obj/item/clothing/suit/toggle/labcoat/research_director(src) new /obj/item/clothing/head/playbunnyears/rd(src) new /obj/item/clothing/under/rank/rnd/research_director/bunnysuit(src) - new /obj/item/clothing/suit/jacket/research_director/tailcoat(src) + new /obj/item/clothing/suit/toggle/labcoat/research_director/tailcoat(src) new /obj/item/clothing/neck/tie/bunnytie/rd(src) @@ -187,7 +187,7 @@ new /obj/item/clothing/neck/mantle/cmomantle(src) new /obj/item/clothing/head/playbunnyears/cmo(src) new /obj/item/clothing/under/rank/medical/cmo_bunnysuit(src) - new /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/cmo(src) + new /obj/item/clothing/suit/toggle/labcoat/cmo/doctor_tailcoat(src) new /obj/item/clothing/neck/tie/bunnytie/cmo(src) /obj/item/storage/bag/garment/engineering_chief/PopulateContents() diff --git a/icons/map_icons/clothing/suit/_suit.dmi b/icons/map_icons/clothing/suit/_suit.dmi index 68c1fd0adba..e60e467de3b 100644 Binary files a/icons/map_icons/clothing/suit/_suit.dmi and b/icons/map_icons/clothing/suit/_suit.dmi differ diff --git a/modular_skyrat/master_files/code/modules/clothing/suits/labcoat.dm b/modular_skyrat/master_files/code/modules/clothing/suits/labcoat.dm index 1e20dc0b878..1e92dd8ef1f 100644 --- a/modular_skyrat/master_files/code/modules/clothing/suits/labcoat.dm +++ b/modular_skyrat/master_files/code/modules/clothing/suits/labcoat.dm @@ -32,10 +32,16 @@ icon_state = "labcoat_regular" gets_cropped_on_taurs = FALSE -/obj/item/clothing/suit/toggle/labcoat/skyrat/pharmacist +/obj/item/clothing/suit/toggle/labcoat/chemist/skyrat/pharmacist name = "pharmacist's labcoat" desc = "A standard labcoat for chemistry which protects the wearer from acid spills." icon_state = "labcoat_pharm" + icon = 'modular_skyrat/master_files/icons/obj/clothing/suits/labcoat.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/suits/labcoat.dmi' + post_init_icon_state = null + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null gets_cropped_on_taurs = FALSE /obj/item/clothing/suit/toggle/labcoat/skyrat/highvis diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/suit.dm b/modular_skyrat/master_files/code/modules/loadout/categories/suit.dm index fb989688528..7dc570b75a7 100644 --- a/modular_skyrat/master_files/code/modules/loadout/categories/suit.dm +++ b/modular_skyrat/master_files/code/modules/loadout/categories/suit.dm @@ -122,7 +122,7 @@ /datum/loadout_item/suit/labcoat_pharmacist name = "Pharmacist's Labcoat" - item_path = /obj/item/clothing/suit/toggle/labcoat/skyrat/pharmacist + item_path = /obj/item/clothing/suit/toggle/labcoat/chemist/skyrat/pharmacist /* * PONCHOS @@ -640,7 +640,7 @@ /datum/loadout_item/suit/labcoat/doctor_tailcoat name = "Brig Physician's tailcoat" - item_path = /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/sec + item_path = /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic/doctor_tailcoat restricted_roles = list(JOB_SECURITY_MEDIC) /datum/loadout_item/suit/supply_jacket diff --git a/modular_skyrat/modules/modular_vending/code/wardrobes.dm b/modular_skyrat/modules/modular_vending/code/wardrobes.dm index fde6aeba880..0d419c72eda 100644 --- a/modular_skyrat/modules/modular_vending/code/wardrobes.dm +++ b/modular_skyrat/modules/modular_vending/code/wardrobes.dm @@ -131,7 +131,7 @@ /obj/item/clothing/under/rank/medical/chemist/skyrat/formal/skirt = 2, /obj/item/clothing/under/rank/medical/chemist/skyrat/formal = 2, /obj/item/clothing/under/rank/medical/chemist/skyrat/formal/skirt = 2, - /obj/item/clothing/suit/toggle/labcoat/skyrat/pharmacist = 2, + /obj/item/clothing/suit/toggle/labcoat/chemist/skyrat/pharmacist = 2, /obj/item/clothing/head/beret/medical/chemist = 2, /obj/item/storage/backpack/messenger/chem = 2, ) diff --git a/modular_zubbers/code/modules/clothing/suits/jacket.dm b/modular_zubbers/code/modules/clothing/suits/jacket.dm index 324ac0d1054..ad541fea7dd 100644 --- a/modular_zubbers/code/modules/clothing/suits/jacket.dm +++ b/modular_zubbers/code/modules/clothing/suits/jacket.dm @@ -378,56 +378,99 @@ icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' -/obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/paramedic +/obj/item/clothing/suit/toggle/labcoat/paramedic/doctor_tailcoat name = "paramedic's tailcoat" desc = "A heavy duty coat worn by bunny themed paramedics. Marked with high visibility lines for emergency operations in the dark." icon_state = "paramedic" + icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' -/obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/chemist +/obj/item/clothing/suit/toggle/labcoat/chemist/doctor_tailcoat name = "chemist's tailcoat" desc = "A sterile white and orange coat worn by bunny themed chemists. The open chest isn't the greatest when working with dangerous substances." icon_state = "chem" + icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' + post_init_icon_state = null + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null -/obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/pathologist +/obj/item/clothing/suit/toggle/labcoat/virologist/doctor_tailcoat name = "pathologist's tailcoat" desc = "A sterile white and green coat worn by bunny themed pathologists. The more stylish and ineffective alternative to a biosuit." icon_state = "virologist" + icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' + post_init_icon_state = null + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null -/obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/coroner +/obj/item/clothing/suit/toggle/labcoat/coroner/doctor_tailcoat name = "coroner's tailcoat" desc = "A sterile black and white coat worn by bunny themed coroners. Adorned with a skull on the back." icon_state = "coroner" + icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' + post_init_icon_state = null + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null -/obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/cmo +/obj/item/clothing/suit/toggle/labcoat/cmo/doctor_tailcoat name = "chief medical officer's tailcoat" desc = "A sterile blue coat worn by bunny themed chief medical officers. The blue helps both the wearer and bloodstains stand out from other, lower ranked, and cleaner doctors." icon_state = "cmo" + icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' //SCIENCE -/obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/science +/obj/item/clothing/suit/toggle/labcoat/science/doctor_tailcoat name = "scientist's tailcoat" desc = "A smart white coat worn by bunny themed scientists. Decent protection against slimes." icon_state = "science" + icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' + post_init_icon_state = null + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null -/obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/science/robotics +/obj/item/clothing/suit/toggle/labcoat/roboticist/doctor_tailcoat name = "roboticist's tailcoat" desc = "A smart white coat with red pauldrons worn by bunny themed roboticists. Looks surprisingly good with oil stains on it." icon_state = "roboticist" + icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' + post_init_icon_state = null + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null -/obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/science/genetics +/obj/item/clothing/suit/toggle/labcoat/genetics/doctor_tailcoat name = "geneticist's tailcoat" desc = "A smart white and blue coat worn by bunny themed geneticists. Nearly looks like a real doctor's lab coat." icon_state = "genetics" + icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' + post_init_icon_state = null + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null -/obj/item/clothing/suit/jacket/research_director/tailcoat +/obj/item/clothing/suit/toggle/labcoat/research_director/tailcoat name = "research director's tailcoat" desc = "A smart purple coat worn by bunny themed head researchers. Created from captured abductor technology, what looks like a coat is actually an advanced hologram emitted from the pauldrons. Feels exactly like the real thing, too." icon_state = "rd" icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' - body_parts_covered = CHEST|ARMS|GROIN + post_init_icon_state = null + greyscale_config = null + greyscale_config_worn = null + greyscale_colors = null //SECURITY @@ -454,10 +497,14 @@ desc = "A reinforced tailcoat worn by bunny themed wardens. Stylishly holds hidden flak plates." icon_state = "warden" -/obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/sec +/obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic/doctor_tailcoat name = "brig physician's tailcoat" desc = "A mostly sterile red and grey coat worn by bunny themed brig physicians. It lacks the padding of the \"standard\" security tailcoat." icon_state = "brig_phys" + icon = 'modular_zubbers/icons/obj/clothing/suits/jacket.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/suits/jacket.dmi' + blood_overlay_type = "coat" + /obj/item/clothing/suit/jacket/det_suit/tailcoat name = "detective's tailcoat" diff --git a/modular_zubbers/code/modules/vending/comdrobe.dm b/modular_zubbers/code/modules/vending/comdrobe.dm index 25df456fb19..fc3e040031f 100644 --- a/modular_zubbers/code/modules/vending/comdrobe.dm +++ b/modular_zubbers/code/modules/vending/comdrobe.dm @@ -40,14 +40,14 @@ access_lists["[ACCESS_CMO]"] += list( /obj/item/clothing/head/playbunnyears/cmo = 1, /obj/item/clothing/under/rank/medical/cmo_bunnysuit = 1, - /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/cmo = 1, + /obj/item/clothing/suit/toggle/labcoat/cmo/doctor_tailcoat = 1, /obj/item/clothing/neck/tie/bunnytie/cmo = 1, ) access_lists["[ACCESS_RD]"] += list( /obj/item/clothing/head/playbunnyears/rd = 1, /obj/item/clothing/under/rank/rnd/research_director/bunnysuit = 1, - /obj/item/clothing/suit/jacket/research_director/tailcoat = 1, + /obj/item/clothing/suit/toggle/labcoat/research_director/tailcoat = 1, /obj/item/clothing/neck/tie/bunnytie/rd = 1, ) diff --git a/modular_zubbers/code/modules/vending/multisec.dm b/modular_zubbers/code/modules/vending/multisec.dm index af7523cf3d3..7389d27d9a2 100644 --- a/modular_zubbers/code/modules/vending/multisec.dm +++ b/modular_zubbers/code/modules/vending/multisec.dm @@ -98,7 +98,7 @@ /obj/item/clothing/head/beret/sec/peacekeeper/security_medic = 3, /obj/item/clothing/head/playbunnyears/brig_phys = 3, /obj/item/clothing/under/rank/security/brig_phys_bunnysuit = 3, - /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/sec = 3, + /obj/item/clothing/suit/toggle/labcoat/skyrat/security_medic/doctor_tailcoat = 3, /obj/item/clothing/neck/tie/bunnytie/brig_phys = 3, /obj/item/clothing/under/rank/medical/scrubs/skyrat/red/sec = 3, /obj/item/clothing/under/rank/security/peacekeeper/security_medic/alternate = 3, diff --git a/modular_zubbers/code/modules/vending/wardrobe.dm b/modular_zubbers/code/modules/vending/wardrobe.dm index a8898a1d009..76478e256a4 100644 --- a/modular_zubbers/code/modules/vending/wardrobe.dm +++ b/modular_zubbers/code/modules/vending/wardrobe.dm @@ -92,7 +92,7 @@ /obj/item/clothing/neck/tie/bunnytie/doctor = 3, /obj/item/clothing/head/playbunnyears/paramedic = 3, /obj/item/clothing/under/rank/medical/paramedic_bunnysuit = 3, - /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/paramedic = 3, + /obj/item/clothing/suit/toggle/labcoat/paramedic/doctor_tailcoat = 3, /obj/item/clothing/neck/tie/bunnytie/paramedic = 3, /obj/item/clothing/head/playbunnyears/psychologist = 3, /obj/item/clothing/under/rank/civilian/psychologist_bunnysuit = 3, @@ -103,7 +103,7 @@ zubbers_products = list( /obj/item/clothing/head/playbunnyears/chemist = 2, /obj/item/clothing/under/rank/medical/chemist/bunnysuit = 2, - /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/chemist = 2, + /obj/item/clothing/suit/toggle/labcoat/chemist/doctor_tailcoat = 2, /obj/item/clothing/neck/tie/bunnytie/chemist = 2, ) @@ -111,7 +111,7 @@ zubbers_products = list( /obj/item/clothing/head/playbunnyears/pathologist = 2, /obj/item/clothing/under/rank/medical/pathologist_bunnysuit = 2, - /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/pathologist = 2, + /obj/item/clothing/suit/toggle/labcoat/virologist/doctor_tailcoat = 2, /obj/item/clothing/neck/tie/bunnytie/pathologist = 2, ) @@ -119,7 +119,7 @@ zubbers_products = list( /obj/item/clothing/head/playbunnyears/coroner = 2, /obj/item/clothing/under/rank/medical/coroner_bunnysuit = 2, - /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/coroner = 2, + /obj/item/clothing/suit/toggle/labcoat/coroner/doctor_tailcoat = 2, /obj/item/clothing/neck/tie/bunnytie/coroner = 2, ) @@ -128,7 +128,7 @@ zubbers_products = list( /obj/item/clothing/head/playbunnyears/scientist = 3, /obj/item/clothing/under/rank/rnd/scientist/bunnysuit = 3, - /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/science = 3, + /obj/item/clothing/suit/toggle/labcoat/science/doctor_tailcoat = 3, /obj/item/clothing/neck/tie/bunnytie/scientist = 3, /obj/item/storage/bag/xeno = 3, ) @@ -138,7 +138,7 @@ /obj/item/clothing/glasses/welding/steampunk_goggles = 2, /obj/item/clothing/head/playbunnyears/roboticist = 2, /obj/item/clothing/under/rank/rnd/scientist/roboticist_bunnysuit = 2, - /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/science/robotics = 2, + /obj/item/clothing/suit/toggle/labcoat/roboticist/doctor_tailcoat = 2, /obj/item/clothing/neck/tie/bunnytie/roboticist = 2, ) @@ -146,7 +146,7 @@ zubbers_products = list( /obj/item/clothing/head/playbunnyears/geneticist = 2, /obj/item/clothing/under/rank/rnd/geneticist/bunnysuit = 2, - /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/science/genetics = 2, + /obj/item/clothing/suit/toggle/labcoat/genetics/doctor_tailcoat = 2, /obj/item/clothing/neck/tie/bunnytie/geneticist = 2, )