diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 965e3599b5e..58da31bd14d 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -234,6 +234,7 @@ r_hand = /obj/item/weapon/reagent_containers/hypospray belt = /obj/item/weapon/storage/belt/medical/emt pda = /obj/item/device/pda/medical + head = /obj/item/clothing/head/hardhat/emt backpack = /obj/item/weapon/storage/backpack/medic satchel = /obj/item/weapon/storage/backpack/satchel_med diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 857f7372e8e..7f44683123b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -84,6 +84,8 @@ new /obj/item/clothing/shoes/medical(src) new /obj/item/device/radio/headset/headset_med(src) new /obj/item/clothing/glasses/hud/health/aviator(src) + new /obj/item/clothing/glasses/eyepatch/hud/medical(src) + new /obj/item/clothing/suit/storage/medical_chest_rig(src) /obj/structure/closet/secure_closet/CMO diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 7b597eedb1a..0f725a72601 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -35,3 +35,11 @@ max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + 15000 icon_state = "atmos_fire" item_state = "atmos_fire" + +/obj/item/clothing/head/hardhat/emt + name = "medical helmet" + desc = "A polymer helmet worn by EMTs and Paramedics throughout human space to protect their heads. This one comes with an attached flashlight and has green crosses on the sides." + icon_state = "helmet_paramed" + item_state = "helmet_paramed" + light_overlay = "EMS_light" + armor = list(melee = 30, bullet = 15, laser = 20,energy = 10, bomb = 20, bio = 10, rad = 20) \ No newline at end of file diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 63a7d332252..fdd080d0ba6 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -28,7 +28,7 @@ obj/item/clothing/suit/apron/overalls/blue icon_state = "surgeon" item_state = "surgeon" allowed = list(/obj/item/stack/medical, /obj/item/weapon/reagent_containers/dropper, /obj/item/weapon/reagent_containers/hypospray, /obj/item/weapon/reagent_containers/syringe, \ - /obj/item/device/healthanalyzer, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/weapon/tank/emergency_oxygen, /obj/item/device/breath_analyzer) + /obj/item/device/healthanalyzer, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/weapon/tank/emergency_oxygen, /obj/item/device/breath_analyzer, /obj/item/weapon/reagent_containers/blood) //Captain /obj/item/clothing/suit/captunic @@ -279,7 +279,7 @@ obj/item/clothing/suit/apron/overalls/blue icon_closed = "fr_jacket" blood_overlay_type = "armor" allowed = list(/obj/item/stack/medical, /obj/item/weapon/reagent_containers/dropper, /obj/item/weapon/reagent_containers/hypospray, /obj/item/weapon/reagent_containers/syringe, \ - /obj/item/device/healthanalyzer, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/weapon/tank/emergency_oxygen, /obj/item/device/breath_analyzer) + /obj/item/device/healthanalyzer, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/weapon/tank/emergency_oxygen, /obj/item/device/breath_analyzer, /obj/item/weapon/reagent_containers/blood) body_parts_covered = UPPER_TORSO|ARMS /obj/item/clothing/suit/storage/toggle/fr_jacket/ems @@ -290,6 +290,16 @@ obj/item/clothing/suit/apron/overalls/blue icon_open = "ems_jacket_open" icon_closed = "ems_jacket_closed" +/obj/item/clothing/suit/storage/medical_chest_rig + name = "medic chest-rig" + desc = "A white chest-rig with pouches worn by medical first responders, meant to carry their equipment." + icon_state = "paramed_armor" + item_state = "paramed_armor" + blood_overlay_type = "armor" + allowed = list(/obj/item/stack/medical, /obj/item/weapon/reagent_containers/dropper, /obj/item/weapon/reagent_containers/hypospray, /obj/item/weapon/reagent_containers/syringe, \ + /obj/item/device/healthanalyzer, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/weapon/tank/emergency_oxygen, /obj/item/device/breath_analyzer, /obj/item/weapon/reagent_containers/blood) + body_parts_covered = UPPER_TORSO + //Mime /obj/item/clothing/suit/suspenders name = "suspenders" diff --git a/html/changelogs/paradoxspace-medic.yml b/html/changelogs/paradoxspace-medic.yml new file mode 100644 index 00000000000..d37e77f6301 --- /dev/null +++ b/html/changelogs/paradoxspace-medic.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: ParadoxSpace & AmoryBlaine + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds a helmet and a chest-rig for Paramedics and EMTs. Sprites by the ever-loving AmoryBlaine." + - rscadd: "Medical Doctor lockers now contain HUDpatches." + - rscadd: "Chest-rigs and Paramedic jackets can now hold blood bags." diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 6a96d8f94ad..776912e6d29 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/light_overlays.dmi b/icons/mob/light_overlays.dmi index 265d8f8dbd4..22397fc57f2 100644 Binary files a/icons/mob/light_overlays.dmi and b/icons/mob/light_overlays.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index ed8654f6c2e..c900e82d9c8 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index da80dcdba6e..5a69824ebfb 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 29fc0d981ca..1b0c72c3434 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/light_overlays.dmi b/icons/obj/light_overlays.dmi index 602cefda20e..3c3a74853a8 100644 Binary files a/icons/obj/light_overlays.dmi and b/icons/obj/light_overlays.dmi differ