diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index 9dcafa3e4f3..26be8d99163 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -14008,6 +14008,10 @@ /obj/structure/closet/wardrobe/xenos, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) +"aXx" = ( +/obj/structure/closet/wardrobe/grey, +/turf/simulated/floor/mineral/titanium/blue, +/area/shuttle/arrival/station) "aXA" = ( /obj/structure/cable{ icon_state = "1-2" @@ -24396,13 +24400,13 @@ }, /area/station/medical/paramedic) "bHL" = ( -/obj/structure/closet/paramedic, /obj/machinery/light, /obj/machinery/light_switch{ dir = 8; name = "east bump"; pixel_x = 24 }, +/obj/structure/closet/secure_closet/paramedic, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" @@ -58845,13 +58849,7 @@ /turf/simulated/floor/plasteel, /area/station/command/bridge) "jje" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "arrival" - }, +/turf/simulated/wall, /area/station/hallway/secondary/entry/south) "jjs" = ( /obj/effect/decal/cleanable/ash, @@ -60753,6 +60751,15 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) +"kfG" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "arrival" + }, +/area/station/hallway/secondary/entry/south) "kgc" = ( /obj/item/reagent_containers/drinks/cans/badminbrew, /turf/simulated/floor/plating, @@ -67130,7 +67137,6 @@ }, /area/station/science/break_room) "nmO" = ( -/obj/structure/closet/secure_closet/paramedic, /obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "whitehall" @@ -70230,9 +70236,6 @@ icon_state = "dark" }, /area/station/science/server) -"oID" = ( -/turf/simulated/wall, -/area/station/hallway/secondary/entry/south) "oJc" = ( /obj/structure/chair/stool{ dir = 8 @@ -77057,10 +77060,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/engine, /area/station/engineering/control) -"rXn" = ( -/obj/structure/closet/wardrobe/grey, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/arrival/station) "rYm" = ( /obj/structure/girder, /turf/simulated/floor/plasteel, @@ -97670,7 +97669,7 @@ aab aaa cqY aXu -rXn +aXx pYy jyO uWH @@ -101799,7 +101798,7 @@ eBd bMb pNe jXy -jje +kfG qJd vwz bDC @@ -102836,7 +102835,7 @@ bnS bnS wDj blQ -oID +jje hTL hgO ukh diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 02a3770e018..87b49023003 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -7595,6 +7595,22 @@ icon_state = "asteroidplating" }, /area/station/maintenance/fore) +"bkg" = ( +/obj/item/radio/intercom{ + name = "east bump"; + pixel_x = 28 + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + color = "#505050" + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutralcorner" + }, +/area/station/hallway/secondary/entry/north) "bkh" = ( /obj/structure/cable{ icon_state = "2-4" @@ -10952,7 +10968,7 @@ autolink_id = "engsm_btn_int"; name = "Supermatter Access Button"; pixel_y = 24; - req_one_access = list(10, 24) + req_one_access = list(10,24) }, /obj/machinery/computer/sm_monitor, /obj/structure/disposalpipe/segment{ @@ -18791,6 +18807,21 @@ icon_state = "bar" }, /area/station/service/theatre) +"cJW" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + color = "#505050" + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutralcorner" + }, +/area/station/hallway/secondary/entry/north) "cKa" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, @@ -22571,6 +22602,15 @@ }, /turf/simulated/wall, /area/station/hallway/primary/fore/north) +"dnc" = ( +/obj/structure/disposalpipe/segment{ + color = "#505050"; + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/secondary/entry/north) "dnw" = ( /obj/structure/chair{ dir = 1 @@ -27329,7 +27369,7 @@ autolink_id = "engsm_btn_ext"; name = "Supermatter Access Button"; pixel_y = 24; - req_one_access = list(10, 24) + req_one_access = list(10,24) }, /turf/simulated/floor/plasteel{ icon_state = "darkyellow"; @@ -35755,21 +35795,6 @@ }, /turf/simulated/floor/carpet/green, /area/station/service/library) -"ghI" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - color = "#505050" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/station/hallway/secondary/entry/north) "ghT" = ( /obj/machinery/door/poddoor/preopen{ id_tag = "cargolockdown"; @@ -39003,15 +39028,6 @@ icon_state = "asteroidplating" }, /area/station/maintenance/port) -"gUy" = ( -/obj/structure/disposalpipe/segment{ - color = "#505050"; - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/hallway/secondary/entry/north) "gUz" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -42611,15 +42627,6 @@ }, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/fsmaint) -"hHR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/light, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/station/hallway/secondary/entry/east) "hHT" = ( /obj/machinery/light{ dir = 8 @@ -42845,22 +42852,6 @@ icon_state = "dark" }, /area/station/service/hydroponics) -"hJG" = ( -/obj/item/radio/intercom{ - name = "east bump"; - pixel_x = 28 - }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - color = "#505050" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/station/hallway/secondary/entry/north) "hJQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -43567,7 +43558,7 @@ int_door_link_id = "engsm_door_int"; ext_button_link_id = "engsm_btn_ext"; int_button_link_id = "engsm_btn_int"; - req_one_access = list(10, 24) + req_one_access = list(10,24) }, /obj/structure/cable/orange{ icon_state = "1-8" @@ -45750,7 +45741,6 @@ /area/station/maintenance/port) "inW" = ( /obj/machinery/firealarm/directional/east, -/obj/structure/closet/paramedic, /obj/machinery/power/apc/directional/north, /obj/structure/cable/orange{ icon_state = "0-2" @@ -52635,11 +52625,6 @@ icon_state = "whitepurple" }, /area/station/science/hallway) -"jIv" = ( -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/station/public/quantum/docking) "jIw" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -59530,6 +59515,15 @@ }, /turf/simulated/floor/catwalk, /area/station/maintenance/starboard) +"lgt" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/station/hallway/secondary/entry/east) "lgv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -69659,6 +69653,11 @@ icon_state = "darkgreenfull" }, /area/station/service/hydroponics) +"noC" = ( +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/public/quantum/docking) "noD" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -105168,7 +105167,7 @@ autolink_id = "engsm_btn_ext"; name = "Supermatter Access Button"; pixel_y = -24; - req_one_access = list(10, 24) + req_one_access = list(10,24) }, /obj/structure/cable/orange{ icon_state = "4-8" @@ -108733,6 +108732,20 @@ icon_state = "escape" }, /area/station/hallway/secondary/exit) +"vLS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/orange{ + icon_state = "2-8" + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/secondary/entry/north) "vLT" = ( /obj/structure/cable{ icon_state = "1-8" @@ -116442,20 +116455,6 @@ dir = 8 }, /area/station/hallway/primary/port/north) -"xrK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/orange{ - icon_state = "2-8" - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/hallway/secondary/entry/north) "xrZ" = ( /turf/simulated/wall, /area/station/security/interrogation) @@ -165372,7 +165371,7 @@ cJi kUj roh wlD -xrK +vLS kUL onN aOR @@ -165628,7 +165627,7 @@ pQa pQa pQa dPF -gUy +dnc jLe pHf pQa @@ -165881,8 +165880,8 @@ fIL khH khH cvq -hJG -ghI +bkg +cJW tPd aVY lBb @@ -166665,7 +166664,7 @@ rAB wMQ opl djw -hHR +lgt eId hUU hUU @@ -166916,9 +166915,9 @@ lmS lmS uKB vqp -jIv +noC vqp -jIv +noC pLr kQP ckW diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 7b527e5e9e2..3bfae384f92 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -74908,13 +74908,6 @@ /obj/effect/spawner/random/blood, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/apmaint) -"ouu" = ( -/obj/structure/closet/paramedic, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whiteblue" - }, -/area/station/medical/paramedic) "ouE" = ( /obj/machinery/atmospherics/pipe/manifold/visible/purple{ dir = 4 @@ -143466,7 +143459,7 @@ dFO cGF iWE dfv -ouu +nCA nBa shb dfv diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index af8f32a1dda..406c244885a 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -121060,7 +121060,6 @@ name = "south bump"; pixel_y = -24 }, -/obj/structure/closet/paramedic, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" }, diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index b8e61905191..ce09696b334 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -27698,7 +27698,6 @@ }, /area/station/hallway/primary/central/south) "cGZ" = ( -/obj/machinery/iv_drip, /obj/machinery/light, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" @@ -81957,7 +81956,7 @@ name = "west bump"; pixel_x = -28 }, -/obj/structure/closet/paramedic, +/obj/machinery/iv_drip, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteblue" diff --git a/code/datums/dog_fashion.dm b/code/datums/dog_fashion.dm index 3009c339159..207fab3af93 100644 --- a/code/datums/dog_fashion.dm +++ b/code/datums/dog_fashion.dm @@ -320,3 +320,7 @@ /datum/dog_fashion/head/miningsoft name = "Spelunker REAL_NAME" desc = "Legions are just like walking chew toys for him." + +/datum/dog_fashion/head/paramedic + name = "EMT REAL_NAME" + desc = "They will always find help when you need it." diff --git a/code/game/jobs/job/medical_jobs.dm b/code/game/jobs/job/medical_jobs.dm index a78b1e10ac1..0dd046c8486 100644 --- a/code/game/jobs/job/medical_jobs.dm +++ b/code/game/jobs/job/medical_jobs.dm @@ -381,7 +381,7 @@ uniform = /obj/item/clothing/under/rank/medical/paramedic shoes = /obj/item/clothing/shoes/black - head = /obj/item/clothing/head/soft/blue + head = /obj/item/clothing/head/soft/paramedic mask = /obj/item/clothing/mask/cigarette l_ear = /obj/item/radio/headset/headset_med/para id = /obj/item/card/id/paramedic diff --git a/code/game/objects/items/weapons/storage/garment.dm b/code/game/objects/items/weapons/storage/garment.dm index e34aee80eb5..789bacac3a3 100644 --- a/code/game/objects/items/weapons/storage/garment.dm +++ b/code/game/objects/items/weapons/storage/garment.dm @@ -328,9 +328,11 @@ /obj/item/storage/bag/garment/paramedic/populate_contents() new /obj/item/clothing/under/rank/medical/paramedic(src) - new /obj/item/clothing/head/soft/blue(src) + new /obj/item/clothing/under/rank/medical/paramedic/skirt(src) + new /obj/item/clothing/head/soft/paramedic(src) + new /obj/item/clothing/head/beret/paramedic(src) new /obj/item/clothing/suit/storage/labcoat/emt(src) - new /obj/item/clothing/suit/storage/paramedic(src) + new /obj/item/clothing/suit/storage/hazardvest/paramedic(src) new /obj/item/clothing/glasses/hud/health/sunglasses(src) new /obj/item/clothing/gloves/color/latex(src) new /obj/item/clothing/gloves/color/latex/nitrile(src) 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 f30b723471c..9641c45f46a 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -88,31 +88,3 @@ new /obj/item/cartridge/janitor(src) new /obj/item/reagent_containers/glass/bucket(src) new /obj/item/reagent_containers/glass/bucket(src) - -//Paramedic - -/obj/structure/closet/paramedic - name = "paramedic wardrobe" - desc = "It's a storage unit for paramedic equipment." - icon_state = "generic" - closed_door_sprite = "blue" - - - -/obj/structure/closet/paramedic/populate_contents() - new /obj/item/clothing/under/rank/medical/paramedic(src) - new /obj/item/clothing/under/rank/medical/paramedic(src) - new /obj/item/radio/headset/headset_med(src) - new /obj/item/radio/headset/headset_med(src) - new /obj/item/clothing/head/soft/blue(src) - new /obj/item/clothing/head/soft/blue(src) - new /obj/item/clothing/gloves/color/latex(src) - new /obj/item/clothing/gloves/color/latex(src) - new /obj/item/clothing/shoes/black(src) - new /obj/item/clothing/shoes/black(src) - new /obj/item/clothing/suit/storage/paramedic(src) - new /obj/item/clothing/suit/storage/paramedic(src) - new /obj/item/tank/internals/emergency_oxygen/engi(src) - new /obj/item/tank/internals/emergency_oxygen/engi(src) - new /obj/item/clothing/suit/storage/labcoat/emt(src) - new /obj/item/clothing/suit/storage/labcoat/emt(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm index bccd658bfc8..5eaad13500b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm @@ -197,6 +197,8 @@ new /obj/item/key/ambulance(src) new /obj/item/handheld_defibrillator(src) new /obj/item/storage/bag/garment/paramedic(src) + new /obj/item/tank/internals/emergency_oxygen/engi(src) + new /obj/item/tank/internals/emergency_oxygen/engi(src) new /obj/item/defibrillator/loaded(src) new /obj/item/storage/belt/medical(src) new /obj/item/storage/firstaid/adv(src) diff --git a/code/modules/client/preference/character.dm b/code/modules/client/preference/character.dm index a2c0b0f38ca..53d1384e925 100644 --- a/code/modules/client/preference/character.dm +++ b/code/modules/client/preference/character.dm @@ -1376,7 +1376,7 @@ clothes_s = new /icon('icons/mob/clothing/under/medical.dmi', "paramedic_s") clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "black"), ICON_UNDERLAY) clothes_s.Blend(new /icon('icons/mob/clothing/mask.dmi', "cig_off"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/clothing/head/softcap.dmi', "bluesoft"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head/softcap.dmi', "paramedicsoft"), ICON_OVERLAY) switch(backbag) if(2) clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "medicalpack"), ICON_OVERLAY) diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index 49af6d85186..d5b2074027d 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -252,6 +252,11 @@ path = /obj/item/clothing/head/beret/med allowed_roles = list("Chief Medical Officer", "Medical Doctor" , "Virologist", "Geneticist", "Coroner", "Paramedic") +/datum/gear/hat/beret_job/para + display_name = "Beret, EMT" + path = /obj/item/clothing/head/beret/paramedic + allowed_roles = list("Chief Medical Officer", "Paramedic") + /datum/gear/hat/beret_job/cmo display_name = "Beret, chief medical officer" path = /obj/item/clothing/head/beret/cmo diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm index 1a39deef9d0..10a52a79b6d 100644 --- a/code/modules/client/preference/loadout/loadout_uniform.dm +++ b/code/modules/client/preference/loadout/loadout_uniform.dm @@ -272,6 +272,11 @@ path = /obj/item/clothing/under/rank/medical/virologist/skirt allowed_roles = list("Virologist") +/datum/gear/uniform/skirt/job/para + display_name = "Skirt, paramedic" + path = /obj/item/clothing/under/rank/medical/paramedic/skirt + allowed_roles = list("Chief Medical Officer", "Paramedic") + /datum/gear/uniform/skirt/job/med display_name = "Skirt, medical" path = /obj/item/clothing/under/rank/medical/doctor/skirt diff --git a/code/modules/clothing/head/beret.dm b/code/modules/clothing/head/beret.dm index d386ee2c754..cb19769dc6a 100644 --- a/code/modules/clothing/head/beret.dm +++ b/code/modules/clothing/head/beret.dm @@ -199,6 +199,17 @@ desc = "A white beret with a green cross finely threaded into it. It has that sterile smell about it." icon_state = "beret_med" +/obj/item/clothing/head/beret/paramedic + name = "paramedic's beret" + desc = "A blue beret with a white medical insignia emblazoned on it. Save lives with style." + icon_state = "beret_paramedic" + dog_fashion = /datum/dog_fashion/head/paramedic + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head/beret.dmi' + ) + //Cargo /obj/item/clothing/head/beret/qm name = "quartermaster's beret" diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 56cc1ce8760..e0af66549a4 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -139,6 +139,13 @@ item_color = "janitorpurple" dog_fashion = /datum/dog_fashion/head/softcap +/obj/item/clothing/head/soft/paramedic + name = "\improper EMT cap" + desc = "It's a blue baseball hat with a white medical shield." + icon_state = "paramedicsoft" + item_color = "paramedic" + dog_fashion = /datum/dog_fashion/head/paramedic + /obj/item/clothing/head/soft/sec name = "security cap" desc = "It's baseball hat in tasteful red colour." diff --git a/code/modules/clothing/suits/job_suits.dm b/code/modules/clothing/suits/job_suits.dm index 0149b04393d..3ae599e1a3c 100644 --- a/code/modules/clothing/suits/job_suits.dm +++ b/code/modules/clothing/suits/job_suits.dm @@ -1,20 +1,6 @@ /* * Job related */ -//Paramedic -/obj/item/clothing/suit/storage/paramedic - name = "paramedic vest" - desc = "A hazard vest used in the recovery of bodies." - icon_state = "paramedic-vest" - item_state = "paramedic-vest" - allowed = list(/obj/item/stack/medical, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator, /obj/item/reagent_containers/syringe, - /obj/item/healthanalyzer, /obj/item/flashlight, /obj/item/radio, /obj/item/tank/internals/emergency_oxygen) - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 5, FIRE = 50, ACID = 50) - - sprite_sheets = list( - "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' - ) - //Botanist /obj/item/clothing/suit/apron name = "apron" @@ -216,6 +202,12 @@ icon_state = "hazard_staff" allowed = list(/obj/item/flashlight, /obj/item/t_scanner, /obj/item/tank/internals/emergency_oxygen, /obj/item/paper, /obj/item/clipboard, /obj/item/analyzer, /obj/item/screwdriver, /obj/item/radio, /obj/item/wrench, /obj/item/weldingtool, /obj/item/crowbar, /obj/item/wirecutters, /obj/item/rcd, /obj/item/rpd, /obj/item/rcs, /obj/item/dest_tagger) +/obj/item/clothing/suit/storage/hazardvest/paramedic + name = "\improper EMT hazard vest" + desc = "A high-visibility vest used by medical response personnel. Designed to easily identify paramedics." + icon_state = "hazard_paramedic" + allowed = list(/obj/item/flashlight, /obj/item/t_scanner, /obj/item/tank/internals/emergency_oxygen, /obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/robotanalyzer) + /obj/item/clothing/suit/storage/hazardvest/qm name = "warehouse supervisor hazard vest" desc = "A high-visibilty vest used in work zones. Designed to easily identify the supply supervisor." diff --git a/code/modules/clothing/under/jobs/medical_jumpsuits.dm b/code/modules/clothing/under/jobs/medical_jumpsuits.dm index 669f4f86b06..ebb1d2caa5c 100644 --- a/code/modules/clothing/under/jobs/medical_jumpsuits.dm +++ b/code/modules/clothing/under/jobs/medical_jumpsuits.dm @@ -129,13 +129,20 @@ /obj/item/clothing/under/rank/medical/paramedic name = "paramedic's jumpsuit" - desc = "It's made of a special fiber that provides minor protection against biohazards and radiation. It has a cross on the chest denoting that the wearer is trained medical personnel." + desc = "It's made of a special fiber that provides minor protection against biohazards and radiation. It has a cross on the back denoting that the wearer is trained medical personnel." icon_state = "paramedic" item_state = "paramedic" item_color = "paramedic" permeability_coefficient = 0.50 armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 5, FIRE = 0, ACID = 0) +/obj/item/clothing/under/rank/medical/paramedic/skirt + name = "paramedic's jumpskirt" + desc = "It's made of a special fiber that provides minor protection against biohazards and radiation. It has a cross on the back denoting that the wearer is trained medical personnel." + icon_state = "paramedic_skirt" + item_state = "paramedic_skirt" + item_color = "paramedic_skirt" + /obj/item/clothing/under/rank/medical/psych name = "psychiatrist's jumpsuit" desc = "A basic white jumpsuit. It has turqouise markings that denote the wearer as a psychiatrist." diff --git a/icons/mob/clothing/head/beret.dmi b/icons/mob/clothing/head/beret.dmi index 549de094bc0..160b9dbeea3 100644 Binary files a/icons/mob/clothing/head/beret.dmi and b/icons/mob/clothing/head/beret.dmi differ diff --git a/icons/mob/clothing/head/softcap.dmi b/icons/mob/clothing/head/softcap.dmi index 677ee62a9e2..4f4525665a4 100644 Binary files a/icons/mob/clothing/head/softcap.dmi and b/icons/mob/clothing/head/softcap.dmi differ diff --git a/icons/mob/clothing/species/drask/head/beret.dmi b/icons/mob/clothing/species/drask/head/beret.dmi index 7003f13e9e2..537dd06649b 100644 Binary files a/icons/mob/clothing/species/drask/head/beret.dmi and b/icons/mob/clothing/species/drask/head/beret.dmi differ diff --git a/icons/mob/clothing/species/drask/suits/utility.dmi b/icons/mob/clothing/species/drask/suits/utility.dmi index a4ade6172a0..02f24241fe7 100644 Binary files a/icons/mob/clothing/species/drask/suits/utility.dmi and b/icons/mob/clothing/species/drask/suits/utility.dmi differ diff --git a/icons/mob/clothing/species/drask/under/medical.dmi b/icons/mob/clothing/species/drask/under/medical.dmi index 80b18e2d160..d09cda7cf34 100644 Binary files a/icons/mob/clothing/species/drask/under/medical.dmi and b/icons/mob/clothing/species/drask/under/medical.dmi differ diff --git a/icons/mob/clothing/species/grey/suits/utility.dmi b/icons/mob/clothing/species/grey/suits/utility.dmi index 314c21b5efd..5e1f32aadc6 100644 Binary files a/icons/mob/clothing/species/grey/suits/utility.dmi and b/icons/mob/clothing/species/grey/suits/utility.dmi differ diff --git a/icons/mob/clothing/species/grey/under/medical.dmi b/icons/mob/clothing/species/grey/under/medical.dmi index 828667afe77..ef57d89f6c3 100644 Binary files a/icons/mob/clothing/species/grey/under/medical.dmi and b/icons/mob/clothing/species/grey/under/medical.dmi differ diff --git a/icons/mob/clothing/species/kidan/head/beret.dmi b/icons/mob/clothing/species/kidan/head/beret.dmi index b49554d4868..4e4facb6b88 100644 Binary files a/icons/mob/clothing/species/kidan/head/beret.dmi and b/icons/mob/clothing/species/kidan/head/beret.dmi differ diff --git a/icons/mob/clothing/species/kidan/head/softcap.dmi b/icons/mob/clothing/species/kidan/head/softcap.dmi index 4a66a07f59a..29e0e005c8c 100644 Binary files a/icons/mob/clothing/species/kidan/head/softcap.dmi and b/icons/mob/clothing/species/kidan/head/softcap.dmi differ diff --git a/icons/mob/clothing/species/kidan/suits/utility.dmi b/icons/mob/clothing/species/kidan/suits/utility.dmi index 5f0993d1c7f..0acb5b44e56 100644 Binary files a/icons/mob/clothing/species/kidan/suits/utility.dmi and b/icons/mob/clothing/species/kidan/suits/utility.dmi differ diff --git a/icons/mob/clothing/species/kidan/under/medical.dmi b/icons/mob/clothing/species/kidan/under/medical.dmi index 8508d1163f1..fad9f1dd5f8 100644 Binary files a/icons/mob/clothing/species/kidan/under/medical.dmi and b/icons/mob/clothing/species/kidan/under/medical.dmi differ diff --git a/icons/mob/clothing/species/vox/head/beret.dmi b/icons/mob/clothing/species/vox/head/beret.dmi index 5925c2904e7..2fd32f31f07 100644 Binary files a/icons/mob/clothing/species/vox/head/beret.dmi and b/icons/mob/clothing/species/vox/head/beret.dmi differ diff --git a/icons/mob/clothing/species/vox/head/softcap.dmi b/icons/mob/clothing/species/vox/head/softcap.dmi index ed9bf51baa4..5ad21a16c4c 100644 Binary files a/icons/mob/clothing/species/vox/head/softcap.dmi and b/icons/mob/clothing/species/vox/head/softcap.dmi differ diff --git a/icons/mob/clothing/species/vox/suits/utility.dmi b/icons/mob/clothing/species/vox/suits/utility.dmi index 623f76fabea..c33cc802d3c 100644 Binary files a/icons/mob/clothing/species/vox/suits/utility.dmi and b/icons/mob/clothing/species/vox/suits/utility.dmi differ diff --git a/icons/mob/clothing/species/vox/under/medical.dmi b/icons/mob/clothing/species/vox/under/medical.dmi index 85b2dc577d9..ddcf7c1c3a1 100644 Binary files a/icons/mob/clothing/species/vox/under/medical.dmi and b/icons/mob/clothing/species/vox/under/medical.dmi differ diff --git a/icons/mob/clothing/suits/utility.dmi b/icons/mob/clothing/suits/utility.dmi index 2c71dd7f8e3..6a62020e602 100644 Binary files a/icons/mob/clothing/suits/utility.dmi and b/icons/mob/clothing/suits/utility.dmi differ diff --git a/icons/mob/clothing/under/medical.dmi b/icons/mob/clothing/under/medical.dmi index d83ba3067f5..6dbf1d24eb8 100644 Binary files a/icons/mob/clothing/under/medical.dmi and b/icons/mob/clothing/under/medical.dmi differ diff --git a/icons/mob/corgi_head.dmi b/icons/mob/corgi_head.dmi index e5158a6388c..ebd2f4f1149 100644 Binary files a/icons/mob/corgi_head.dmi and b/icons/mob/corgi_head.dmi differ diff --git a/icons/obj/clothing/head/beret.dmi b/icons/obj/clothing/head/beret.dmi index 00f341b791d..6bbe1d91fa7 100644 Binary files a/icons/obj/clothing/head/beret.dmi and b/icons/obj/clothing/head/beret.dmi differ diff --git a/icons/obj/clothing/head/softcap.dmi b/icons/obj/clothing/head/softcap.dmi index 851bef30801..66ab655f000 100644 Binary files a/icons/obj/clothing/head/softcap.dmi and b/icons/obj/clothing/head/softcap.dmi differ diff --git a/icons/obj/clothing/suits/utility.dmi b/icons/obj/clothing/suits/utility.dmi index de46d90ceb0..2cba22979ef 100644 Binary files a/icons/obj/clothing/suits/utility.dmi and b/icons/obj/clothing/suits/utility.dmi differ diff --git a/icons/obj/clothing/under/medical.dmi b/icons/obj/clothing/under/medical.dmi index 34a20b3ca65..1fafda87567 100644 Binary files a/icons/obj/clothing/under/medical.dmi and b/icons/obj/clothing/under/medical.dmi differ diff --git a/tools/UpdatePaths/Scripts/29766_paramedic_drip.txt b/tools/UpdatePaths/Scripts/29766_paramedic_drip.txt new file mode 100644 index 00000000000..bb165415c72 --- /dev/null +++ b/tools/UpdatePaths/Scripts/29766_paramedic_drip.txt @@ -0,0 +1 @@ +/obj/structure/closet/paramedic : @DELETE \ No newline at end of file