diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index be2dce91a2..7a0203be7b 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -849,6 +849,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Medbay Treatment Center" icon_state = "exam_room" +/area/medical/paramedic + name = "Paramedic Station" + icon_state = "paramedic" + //Security diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 14fd7fbb6d..cf6b2b4bf4 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -75,6 +75,12 @@ suit_type = /obj/item/clothing/suit/space/hardsuit/medical mask_type = /obj/item/clothing/mask/breath +/obj/machinery/suit_storage_unit/paramedic + name = "paramedic suit storage unit" + suit_type = /obj/item/clothing/suit/space/eva/paramedic + helmet_type = /obj/item/clothing/head/helmet/space/eva/paramedic + mask_type = /obj/item/clothing/mask/breath + /obj/machinery/suit_storage_unit/rd suit_type = /obj/item/clothing/suit/space/hardsuit/rd mask_type = /obj/item/clothing/mask/breath 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 a5857029f5..fae3625ccc 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -216,7 +216,7 @@ for(var/i in 1 to 3) new /obj/item/clothing/suit/toggle/labcoat(src) for(var/i in 1 to 3) - new /obj/item/clothing/suit/toggle/labcoat/emt(src) + new /obj/item/clothing/suit/toggle/labcoat/paramedic(src) for(var/i in 1 to 3) new /obj/item/clothing/shoes/sneakers/white(src) for(var/i in 1 to 3) diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index 1acb7628a3..59747d59ba 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -58,6 +58,12 @@ /obj/item/clothing/shoes/magboots/advance/debug/Initialize() attack_self(src) +/obj/item/clothing/shoes/magboots/paramedic + desc = "A pair of magboots decked in colors matching the equipment of an emergency medical technician." + name = "paramedic magboots" + icon_state = "para_magboots0" + magboot_state = "para_magboots" + /obj/item/clothing/shoes/magboots/syndie desc = "Reverse-engineered magnetic boots that have a heavy magnetic pull. Property of Gorlex Marauders." name = "blood-red magboots" diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index f9e35ca37f..8c39427c49 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -465,3 +465,16 @@ Contains: torn = TRUE playsound(loc, 'sound/weapons/slashmiss.ogg', 50, 1) playsound(loc, 'sound/effects/refill.ogg', 50, 1) + +/obj/item/clothing/suit/space/eva/paramedic + name = "paramedic EVA suit" + icon_state = "paramedic-eva" + item_state = "paramedic-eva" + desc = "A deep blue space suit decorated with red and white crosses to indicate that the wearer is trained emergency medical personnel." + allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/roller) + +/obj/item/clothing/head/helmet/space/eva/paramedic + name = "paramedic EVA helmet" + desc = "A deep blue space helmet with a large red cross on the faceplate to designate the wearer as trained emergency medical personnel." + icon_state = "paramedic-eva-helmet" + item_state = "paramedic-eva-helmet" \ No newline at end of file diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 48fd8ccf1c..efadb8a035 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -195,3 +195,18 @@ body_parts_covered = HEAD flags_inv = HIDEHAIR|HIDEEARS mutantrace_variation = STYLE_MUZZLE + + +//Paramedic + +/obj/item/clothing/suit/toggle/labcoat/paramedic + name = "paramedic vest" + desc = "A dark blue vest with reflective strips for emergency medical technicians." + icon_state = "paramedic-vest" + item_state = "paramedic-vest" + +/obj/item/clothing/suit/toggle/labcoat/emt + name = "emt vest" + desc = "A dark blue vest with reflective strips for emergency medical technicians." + icon_state = "labcoat_emt" + item_state = "labcoat_emt" \ No newline at end of file diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 022bc7c95c..195712b814 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -37,12 +37,6 @@ icon_state = "labcoat_cmo" item_state = "labcoat_cmo" -/obj/item/clothing/suit/toggle/labcoat/emt - name = "\improper EMT's jacket" - desc = "A dark blue jacket with reflective strips for emergency medical technicians." - icon_state = "labcoat_emt" - item_state = "labcoat_cmo" - /obj/item/clothing/suit/toggle/labcoat/mad name = "\proper The Mad's labcoat" desc = "It makes you look capable of konking someone on the noggin and shooting them into space." diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index 971112ac38..3f31fb4717 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -159,22 +159,36 @@ fitted = FEMALE_UNIFORM_TOP /obj/item/clothing/under/rank/medical/paramedic - desc = "It's made of a special fiber that provides minor protection against biohazards. It has a dark blue cross on the chest denoting that the wearer is a trained paramedic." + desc = "It's made of a special fiber that provides minor protection against biohazards. It has a white cross on the chest denoting that the wearer is a trained paramedic." name = "paramedic jumpsuit" - icon_state = "paramedic" + icon_state = "paramedic-dark" item_state = "w_suit" + item_color = "paramedic-dark" permeability_coefficient = 0.5 armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) + can_adjust = FALSE + +/obj/item/clothing/under/rank/medical/paramedic/light + desc = "It's made of a special fiber that provides minor protection against biohazards. It has a dark blue cross on the chest denoting that the wearer is a trained paramedic." + icon_state = "paramedic-light" + item_color = "paramedic-light" + can_adjust = TRUE /obj/item/clothing/under/rank/medical/paramedic/skirt name = "paramedic jumpskirt" - desc = "It's made of a special fiber that provides minor protection against biohazards. It has a dark blue cross on the chest denoting that the wearer is a trained paramedic." - icon_state = "paramedic_skirt" + desc = "It's made of a special fiber that provides minor protection against biohazards. It has a white cross on the chest denoting that the wearer is a trained paramedic." + icon_state = "paramedic-dark_skirt" item_state = "w_suit" + item_color = "paramedic-dark_skirt" body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP +/obj/item/clothing/under/rank/medical/paramedic/skirt/light + desc = "It's made of a special fiber that provides minor protection against biohazards. It has a dark blue cross on the chest denoting that the wearer is a trained paramedic." + icon_state = "paramedic_skirt" + item_color = "paramedic_skirt" + /obj/item/clothing/under/rank/nursesuit desc = "It's a jumpsuit commonly worn by nursing staff in the medical department." name = "nurse's suit" @@ -186,6 +200,7 @@ body_parts_covered = CHEST|GROIN|ARMS fitted = NO_FEMALE_UNIFORM can_adjust = FALSE + /obj/item/clothing/under/rank/medical 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" @@ -194,18 +209,21 @@ item_color = "medical" permeability_coefficient = 0.5 armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) + /obj/item/clothing/under/rank/medical/blue name = "blue 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" item_color = "scrubsblue" can_adjust = FALSE + /obj/item/clothing/under/rank/medical/green name = "green medical scrubs" desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green." icon_state = "scrubsgreen" item_color = "scrubsgreen" can_adjust = FALSE + /obj/item/clothing/under/rank/medical/purple name = "purple medical scrubs" desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple." @@ -221,4 +239,4 @@ item_color = "medical_skirt" body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE - fitted = FEMALE_UNIFORM_TOP + fitted = FEMALE_UNIFORM_TOP \ No newline at end of file diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm index 1ad836f01c..b74f1a1c18 100644 --- a/code/modules/jobs/job_types/paramedic.dm +++ b/code/modules/jobs/job_types/paramedic.dm @@ -12,6 +12,7 @@ outfit = /datum/outfit/job/paramedic access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS) + minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS) display_order = JOB_DISPLAY_ORDER_PARAMEDIC @@ -23,10 +24,10 @@ ears = /obj/item/radio/headset/headset_med gloves = /obj/item/clothing/gloves/color/latex/nitrile uniform = /obj/item/clothing/under/rank/medical/paramedic - mask = /obj/item/clothing/mask/surgical + mask = /obj/item/clothing/mask/cigarette shoes = /obj/item/clothing/shoes/jackboots head = /obj/item/clothing/head/soft/emt - suit = /obj/item/clothing/suit/toggle/labcoat/emt + suit = /obj/item/clothing/suit/toggle/labcoat/paramedic belt = /obj/item/storage/belt/medical l_hand = /obj/item/storage/firstaid/regular suit_store = /obj/item/flashlight/pen @@ -40,6 +41,4 @@ satchel = /obj/item/storage/backpack/satchel/med duffelbag = /obj/item/storage/backpack/duffelbag/med - backpack_contents = list(/obj/item/storage/hypospraykit/regular) - chameleon_extras = /obj/item/gun/syringe diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index d368a9bbca..ba5e511612 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -32,24 +32,29 @@ icon_state = "medidrobe" product_ads = "Make those blood stains look fashionable!!" vend_reply = "Thank you for using the MediDrobe!" - products = list(/obj/item/clothing/accessory/pocketprotector = 3, - /obj/item/clothing/head/beret/med = 3, - /obj/item/storage/backpack/duffelbag/med = 3, - /obj/item/storage/backpack/medic = 3, - /obj/item/storage/backpack/satchel/med = 3, - /obj/item/clothing/suit/hooded/wintercoat/medical = 3, - /obj/item/clothing/under/rank/nursesuit = 3, - /obj/item/clothing/head/nursehat = 3, + products = list(/obj/item/clothing/accessory/pocketprotector = 5, + /obj/item/clothing/head/beret/med = 5, + /obj/item/storage/backpack/duffelbag/med = 5, + /obj/item/storage/backpack/medic = 5, + /obj/item/storage/backpack/satchel/med = 5, + /obj/item/clothing/suit/hooded/wintercoat/medical = 5, + /obj/item/clothing/under/rank/nursesuit = 5, + /obj/item/clothing/head/nursehat = 5, /obj/item/clothing/under/rank/medical/skirt= 5, - /obj/item/clothing/under/rank/medical/blue = 2, - /obj/item/clothing/under/rank/medical/green = 2, - /obj/item/clothing/under/rank/medical/purple = 2, + /obj/item/clothing/under/rank/medical/blue = 5, + /obj/item/clothing/under/rank/medical/green = 5, + /obj/item/clothing/under/rank/medical/purple = 5, /obj/item/clothing/under/rank/medical = 5, + /obj/item/clothing/under/rank/medical/paramedic = 5, + /obj/item/clothing/under/rank/medical/paramedic/light = 5, + /obj/item/clothing/under/rank/medical/paramedic/skirt = 5, + /obj/item/clothing/under/rank/medical/paramedic/skirt/light = 5, /obj/item/clothing/suit/toggle/labcoat = 5, + /obj/item/clothing/suit/toggle/labcoat/paramedic = 5, /obj/item/clothing/suit/toggle/labcoat/emt = 5, /obj/item/clothing/shoes/sneakers/white = 5, /obj/item/clothing/head/soft/emt = 5, - /obj/item/clothing/suit/apron/surgical = 3, + /obj/item/clothing/suit/apron/surgical = 5, /obj/item/clothing/mask/surgical = 5) refill_canister = /obj/item/vending_refill/wardrobe/medi_wardrobe diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index 1a4b8019cd..b3960f4db6 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/mob/feet_digi.dmi b/icons/mob/feet_digi.dmi index ddc5ff0c5f..78f50519fa 100644 Binary files a/icons/mob/feet_digi.dmi and b/icons/mob/feet_digi.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index a5497145ca..be8f7c6c94 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/head_muzzled.dmi b/icons/mob/head_muzzled.dmi index 5430f07726..4b8263469f 100644 Binary files a/icons/mob/head_muzzled.dmi and b/icons/mob/head_muzzled.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index d1a012908f..40ebcaeb4c 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/suit_digi.dmi b/icons/mob/suit_digi.dmi index da51f9e621..8bea32eca4 100644 Binary files a/icons/mob/suit_digi.dmi and b/icons/mob/suit_digi.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index bcde4d84f7..e675a8d647 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/mob/uniform_digi.dmi b/icons/mob/uniform_digi.dmi index 0b8c495c5a..82dc09e43e 100644 Binary files a/icons/mob/uniform_digi.dmi and b/icons/mob/uniform_digi.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 6139db328b..2afeb5f19b 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index 3c8a1332a9..1105e30ae7 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index c461273780..ebd0e725e8 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 0881a2c289..090003011b 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi index a35837eedd..4856eefa3e 100644 Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ