diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index a26878762b8..e2a8d6df159 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -530,6 +530,7 @@ /obj/item/modular_computer/pda/mime = list(REGION_GENERAL), \ /obj/item/modular_computer/pda/medical = list(REGION_MEDBAY), \ /obj/item/modular_computer/pda/viro = list(REGION_MEDBAY), \ + /obj/item/modular_computer/pda/coroner = list(REGION_MEDBAY), \ /obj/item/modular_computer/pda/engineering = list(REGION_ENGINEERING), \ /obj/item/modular_computer/pda/security = list(REGION_SECURITY), \ /obj/item/modular_computer/pda/detective = list(REGION_SECURITY), \ diff --git a/code/game/objects/items/storage/medkit.dm b/code/game/objects/items/storage/medkit.dm index 08ae3fd6b5e..71664151a5c 100644 --- a/code/game/objects/items/storage/medkit.dm +++ b/code/game/objects/items/storage/medkit.dm @@ -66,7 +66,7 @@ name = "surgical medkit" icon_state = "medkit_surgery" inhand_icon_state = "medkit" - desc = "A high capacity aid kit for doctors, full of medical supplies and basic surgical equipment" + desc = "A high capacity aid kit for doctors, full of medical supplies and basic surgical equipment." /obj/item/storage/medkit/surgery/Initialize(mapload) . = ..() @@ -320,6 +320,56 @@ ) generate_items_inside(items_inside,src) +/obj/item/storage/medkit/coroner + name = "compact coroner's medkit" + desc = "A smaller medical kit designed primarily for assisting in dissecting the deceased, rather than treating the living." + icon = 'icons/obj/storage/medkit.dmi' + icon_state = "compact_coronerkit" + inhand_icon_state = "coronerkit" + var/max_slots = 6 + var/max_total_storage = 6 + +/obj/item/storage/medkit/coroner/Initialize(mapload) + . = ..() + atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL //lowering this so it can't hold the autopsy scanner + atom_storage.max_slots = max_slots + atom_storage.max_total_storage = max_total_storage + +/obj/item/storage/medkit/coroner/PopulateContents() + if(empty) + return + var/static/items_inside = list( + /obj/item/reagent_containers/cup/bottle/formaldehyde = 1, + /obj/item/reagent_containers/medigel/sterilizine = 1, + /obj/item/reagent_containers/blood = 1, + /obj/item/bodybag = 2, + /obj/item/reagent_containers/syringe = 1, + ) + generate_items_inside(items_inside,src) + +/obj/item/storage/medkit/coroner/large + name = "coroner's medkit" + desc = "A medical kit designed primarily for assisting in dissecting the deceased, rather than treating the living." + icon = 'icons/obj/storage/medkit.dmi' + icon_state = "coronerkit" + inhand_icon_state = "coronerkit" + max_slots = 12 + max_total_storage = 24 + +/obj/item/storage/medkit/coroner/large/PopulateContents() + if(empty) + return + var/static/items_inside = list( + /obj/item/reagent_containers/cup/bottle/formaldehyde = 1, + /obj/item/reagent_containers/medigel/sterilizine = 1, + /obj/item/toy/crayon/white = 1, + /obj/item/reagent_containers/blood = 1, + /obj/item/bodybag = 2, + /obj/item/reagent_containers/syringe = 1, + /obj/item/folder/white = 1,//for storing autopsy reports from the scanner + ) + generate_items_inside(items_inside,src) + //medibot assembly /obj/item/storage/medkit/attackby(obj/item/bodypart/bodypart, mob/user, params) if((!istype(bodypart, /obj/item/bodypart/arm/left/robot)) && (!istype(bodypart, /obj/item/bodypart/arm/right/robot))) diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm index a039d36ecf5..bc615a197a2 100644 --- a/code/modules/cargo/packs/medical.dm +++ b/code/modules/cargo/packs/medical.dm @@ -37,8 +37,7 @@ cost = CARGO_CRATE_VALUE * 2.5 contains = list( /obj/item/autopsy_scanner = 1, - /obj/item/reagent_containers/cup/bottle/formaldehyde = 1, - /obj/item/storage/box/bodybags = 1, + /obj/item/storage/medkit/coroner = 1, ) crate_name = "autopsy kit crate" diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 1c02a8785f1..24387971d15 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -411,6 +411,11 @@ icon_state = "surgicalcapcmo" desc = "The CMO's medical surgery cap to prevent their hair from entering the insides of the patient!" +/obj/item/clothing/head/utility/surgerycap/black + name = "black surgery cap" + icon_state = "surgicalcapblack" + desc = "A black medical surgery cap to prevent the surgeon's hair from entering the insides of the patient!" + //Engineering /obj/item/clothing/head/beret/engi name = "engineering beret" diff --git a/code/modules/clothing/under/jobs/medical.dm b/code/modules/clothing/under/jobs/medical.dm index 8d21aba5b0e..55370bc8200 100644 --- a/code/modules/clothing/under/jobs/medical.dm +++ b/code/modules/clothing/under/jobs/medical.dm @@ -94,6 +94,22 @@ desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple." icon_state = "scrubswine" +/obj/item/clothing/under/rank/medical/coroner + desc = "It's made of a special fiber that provides minor protection against biohazards. It has a white cross turned sideways on the chest, denoting that the wearer is a trained coroner." + name = "coroner jumpsuit" + icon_state = "coroner" + inhand_icon_state = "w_suit" + +/obj/item/clothing/under/rank/medical/coroner/skirt + name = "coroner jumpskirt" + desc = "It's made of a special fiber that provides minor protection against biohazards. It has a white cross turned sideways on the chest, denoting that the wearer is a trained coroner." + icon_state = "coroner_skirt" + inhand_icon_state = "w_suit" + body_parts_covered = CHEST|GROIN|ARMS + dying_key = DYE_REGISTRY_JUMPSKIRT + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON + /obj/item/clothing/under/rank/medical/scrubs/coroner name = "coroner scrubs" desc = "It's made of a special fiber that provides minor protection against biohazards. This one is as dark as an emo's poetry." diff --git a/code/modules/jobs/job_types/coroner.dm b/code/modules/jobs/job_types/coroner.dm index e213c6f6d87..0894b5907ae 100644 --- a/code/modules/jobs/job_types/coroner.dm +++ b/code/modules/jobs/job_types/coroner.dm @@ -47,14 +47,15 @@ backpack_contents = list( /obj/item/storage/box/bodybags = 1, /obj/item/autopsy_scanner = 1, - /obj/item/reagent_containers/cup/bottle/formaldehyde = 1, - /obj/item/reagent_containers/dropper = 1, + /obj/item/storage/medkit/coroner/large = 1, ) - belt = /obj/item/modular_computer/pda/medical + belt = /obj/item/modular_computer/pda/coroner ears = /obj/item/radio/headset/headset_srvmed gloves = /obj/item/clothing/gloves/latex/coroner - l_pocket = /obj/item/toy/crayon/white + head = /obj/item/clothing/head/utility/surgerycap/black + l_pocket = /obj/item/clipboard //good for storing autopsy reports and taking notes + r_pocket = /obj/item/reagent_containers/dropper mask = /obj/item/clothing/mask/surgical shoes = /obj/item/clothing/shoes/sneakers/black suit = /obj/item/clothing/suit/toggle/labcoat/coroner diff --git a/code/modules/modular_computers/computers/item/role_tablet_presets.dm b/code/modules/modular_computers/computers/item/role_tablet_presets.dm index 64fa163a5e4..e77f587d65c 100644 --- a/code/modules/modular_computers/computers/item/role_tablet_presets.dm +++ b/code/modules/modular_computers/computers/item/role_tablet_presets.dm @@ -231,6 +231,15 @@ greyscale_config = /datum/greyscale_config/tablet/stripe_thick greyscale_colors = "#FAFAFA#355FAC#EA6400" +/obj/item/modular_computer/pda/coroner + name = "coroner PDA" + greyscale_config = /datum/greyscale_config/tablet/stripe_thick + greyscale_colors = "#FAFAFA#000099#1f2026" + starting_programs = list( + /datum/computer_file/program/records/medical, + /datum/computer_file/program/crew_manifest, + ) + /** * Supply */ diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index aca33b763b2..3b39229a4e7 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -285,13 +285,17 @@ vend_reply = "Don't forget your \"Buy one get one free\" burial deal!" products = list( /obj/item/storage/box/bodybags = 3, + /obj/item/storage/medkit/coroner = 1, /obj/item/toy/crayon/white = 2, /obj/item/clothing/mask/surgical = 1, /obj/item/clothing/shoes/sneakers/black = 1, /obj/item/clothing/suit/toggle/labcoat/coroner = 1, /obj/item/clothing/suit/apron/surgical = 1, /obj/item/clothing/gloves/latex/coroner = 1, + /obj/item/clothing/head/utility/surgerycap/black = 1, /obj/item/clothing/under/rank/medical/scrubs/coroner = 1, + /obj/item/clothing/under/rank/medical/coroner = 1, + /obj/item/clothing/under/rank/medical/coroner/skirt = 1, /obj/item/storage/backpack/coroner = 1, /obj/item/storage/backpack/satchel/coroner = 1, /obj/item/storage/backpack/duffelbag/coroner = 1, diff --git a/icons/mob/clothing/head/utility.dmi b/icons/mob/clothing/head/utility.dmi index 24036e71d59..58f9ab613d4 100644 Binary files a/icons/mob/clothing/head/utility.dmi and b/icons/mob/clothing/head/utility.dmi differ diff --git a/icons/mob/clothing/under/medical.dmi b/icons/mob/clothing/under/medical.dmi index 4bcc5f2c473..e551d2d5234 100644 Binary files a/icons/mob/clothing/under/medical.dmi and b/icons/mob/clothing/under/medical.dmi differ diff --git a/icons/mob/inhands/equipment/medical_lefthand.dmi b/icons/mob/inhands/equipment/medical_lefthand.dmi index 2f20fa16d4b..384517b431e 100644 Binary files a/icons/mob/inhands/equipment/medical_lefthand.dmi and b/icons/mob/inhands/equipment/medical_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/medical_righthand.dmi b/icons/mob/inhands/equipment/medical_righthand.dmi index e2947f29de6..000ab7ae1e1 100644 Binary files a/icons/mob/inhands/equipment/medical_righthand.dmi and b/icons/mob/inhands/equipment/medical_righthand.dmi differ diff --git a/icons/obj/clothing/head/utility.dmi b/icons/obj/clothing/head/utility.dmi index 4946264173e..26b9cf9b036 100644 Binary files a/icons/obj/clothing/head/utility.dmi and b/icons/obj/clothing/head/utility.dmi differ diff --git a/icons/obj/clothing/under/medical.dmi b/icons/obj/clothing/under/medical.dmi index a45ba900378..84ffbd8692e 100644 Binary files a/icons/obj/clothing/under/medical.dmi and b/icons/obj/clothing/under/medical.dmi differ diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index 3dfce2301b4..5067052940d 100644 Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ diff --git a/icons/obj/storage/medkit.dmi b/icons/obj/storage/medkit.dmi index 2c6acc808bb..439bb2b86b7 100644 Binary files a/icons/obj/storage/medkit.dmi and b/icons/obj/storage/medkit.dmi differ