diff --git a/code/datums/outfits/ert/med_eridani.dm b/code/datums/outfits/ert/med_eridani.dm index c3e4bd5a374..57fa1368d28 100644 --- a/code/datums/outfits/ert/med_eridani.dm +++ b/code/datums/outfits/ert/med_eridani.dm @@ -85,7 +85,7 @@ /datum/outfit/admin/ert/med_eridani/paramedic name = "Eridani Contractor Paramedic" - head = /obj/item/clothing/head/hardhat/emt + head = /obj/item/clothing/head/hardhat/first_responder mask = /obj/item/clothing/mask/balaclava back = /obj/item/storage/backpack/messenger/med glasses = /obj/item/clothing/glasses/hud/health diff --git a/code/game/jobs/access_datum.dm b/code/game/jobs/access_datum.dm index 959b13042cd..02e11cd44e3 100644 --- a/code/game/jobs/access_datum.dm +++ b/code/game/jobs/access_datum.dm @@ -389,10 +389,10 @@ desc = "Medical Equipment" region = ACCESS_REGION_MEDBAY -/var/const/access_emt = 67 -/datum/access/access_emt - id = access_emt - desc = "EMT Equipment" +/var/const/access_first_responder = 67 +/datum/access/access_first_responder + id = access_first_responder + desc = "First Responder Equipment" region = ACCESS_REGION_MEDBAY /var/const/access_detective = 68 diff --git a/code/game/jobs/faction/eridani.dm b/code/game/jobs/faction/eridani.dm index ed134b2b6a3..36788deae9f 100644 --- a/code/game/jobs/faction/eridani.dm +++ b/code/game/jobs/faction/eridani.dm @@ -46,7 +46,7 @@ "Forensic Technician" = /datum/outfit/job/forensics/eridani, "Crime Scene Investigator" = /datum/outfit/job/forensics/eridani, "Paramedic" = /datum/outfit/job/med_tech/paramed/eridani, - "Emergency Medical Technician" = /datum/outfit/job/med_tech/paramed/eridani, + "First Responder" = /datum/outfit/job/med_tech/paramed/eridani, "Corporate Liaison" = /datum/outfit/job/representative/eridani ) diff --git a/code/game/jobs/faction/zeng_hu.dm b/code/game/jobs/faction/zeng_hu.dm index 4accceae590..c989732caef 100644 --- a/code/game/jobs/faction/zeng_hu.dm +++ b/code/game/jobs/faction/zeng_hu.dm @@ -59,7 +59,7 @@ "Psychiatrist" = /datum/outfit/job/psychiatrist/zeng_hu, "Psychologist" = /datum/outfit/job/psychiatrist/zeng_hu, "Paramedic" = /datum/outfit/job/med_tech/paramed/zeng_hu, - "Emergency Medical Technician" = /datum/outfit/job/med_tech/paramed/zeng_hu, + "First Responder" = /datum/outfit/job/med_tech/paramed/zeng_hu, "Roboticist" = /datum/outfit/job/roboticist/zeng_hu, "Biomechanical Engineer" = /datum/outfit/job/roboticist/zeng_hu, "Mechatronic Engineer" = /datum/outfit/job/roboticist/zeng_hu, diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index e317fc84bb1..7e2c9f1cd85 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -16,11 +16,11 @@ access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads, access_pharmacy, access_virology, access_cmo, access_surgery, access_RC_announce, access_engine, access_construction, access_keycard_auth, access_sec_doors, access_psychiatrist, access_eva, access_external_airlocks, access_research, - access_emt, access_maint_tunnels) + access_first_responder, access_maint_tunnels) minimal_access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads, access_pharmacy, access_virology, access_cmo, access_surgery, access_RC_announce, access_engine, access_construction, access_keycard_auth, access_sec_doors, access_psychiatrist, access_eva, access_external_airlocks, access_research, - access_emt, access_maint_tunnels) + access_first_responder, access_maint_tunnels) minimal_player_age = 10 ideal_character_age = 50 @@ -202,7 +202,7 @@ jobtype = /datum/job/psychiatrist /datum/job/med_tech - title = "Emergency Medical Technician" + title = "First Responder" flag = MED_TECH departments = SIMPLEDEPT(DEPARTMENT_MEDICAL) department_flag = MEDSCI @@ -215,29 +215,29 @@ minimum_character_age = 20 - access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_pharmacy, access_virology, access_eva, access_maint_tunnels, access_external_airlocks, access_psychiatrist, access_emt) - minimal_access = list(access_medical, access_medical_equip, access_morgue, access_eva, access_maint_tunnels, access_external_airlocks, access_emt) + access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_pharmacy, access_virology, access_eva, access_maint_tunnels, access_external_airlocks, access_psychiatrist, access_first_responder) + minimal_access = list(access_medical, access_medical_equip, access_morgue, access_eva, access_maint_tunnels, access_external_airlocks, access_first_responder) outfit = /datum/outfit/job/med_tech blacklisted_species = list(SPECIES_DIONA, SPECIES_IPC_G2) /datum/outfit/job/med_tech - name = "Emergency Medical Technician" - base_name = "Emergency Medical Technician" + name = "First Responder" + base_name = "First Responder" jobtype = /datum/job/med_tech - uniform = /obj/item/clothing/under/rank/medical/emt - suit = /obj/item/clothing/suit/storage/toggle/emt_jacket + uniform = /obj/item/clothing/under/rank/medical/first_responder + suit = /obj/item/clothing/suit/storage/toggle/first_responder_jacket shoes = /obj/item/clothing/shoes/jackboots headset = /obj/item/device/radio/headset/headset_med bowman = /obj/item/device/radio/headset/headset_med/alt l_hand = /obj/item/storage/firstaid/adv r_hand = /obj/item/reagent_containers/hypospray - belt = /obj/item/storage/belt/medical/emt + belt = /obj/item/storage/belt/medical/first_responder tab_pda = /obj/item/modular_computer/handheld/pda/medical wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/medical tablet = /obj/item/modular_computer/handheld/preset/medical id = /obj/item/card/id/white - head = /obj/item/clothing/head/hardhat/emt + head = /obj/item/clothing/head/hardhat/first_responder backpack = /obj/item/storage/backpack/medic satchel = /obj/item/storage/backpack/satchel_med diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 0c4eee30f97..a504d40706e 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -77,7 +77,7 @@ var/list/medical_positions = list( "Surgeon", "Psychiatrist", "Pharmacist", - "Emergency Medical Technician", + "First Responder", "Medical Intern" ) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index cd8354fdf4a..e28e5bd4b2c 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -11,7 +11,7 @@ desc = "Emergency air-tight shutter, capable of sealing off breached areas." icon = 'icons/obj/doors/DoorHazard.dmi' icon_state = "door_open" - req_one_access = list(access_atmospherics, access_engine_equip, access_emt) + req_one_access = list(access_atmospherics, access_engine_equip, access_first_responder) opacity = 0 density = 0 layer = DOOR_OPEN_LAYER - 0.01 diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 8e6466e6c6c..677262337da 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -133,8 +133,8 @@ /obj/item/device/radio ) -/obj/item/storage/belt/medical/emt - name = "EMT utility belt" +/obj/item/storage/belt/medical/first_responder + name = "first responder utility belt" desc = "A sturdy black webbing belt with attached pouches." icon_state = "emsbelt" item_state = "emsbelt" diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index dfe4e647d88..5d678364c5e 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -358,7 +358,7 @@ problist = list( /obj/item/storage/belt/utility = 1, /obj/item/storage/belt/medical = 0.4, - /obj/item/storage/belt/medical/emt = 0.4, + /obj/item/storage/belt/medical/first_responder = 0.4, /obj/item/storage/belt/security/tactical = 0.1, /obj/item/storage/belt/military = 0.1, /obj/item/storage/belt/janitor = 0.4 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 660e4511b5b..c5263f700b7 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -86,7 +86,7 @@ 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) - new /obj/item/clothing/suit/storage/medical_chest_rig/emt(src) + new /obj/item/clothing/suit/storage/medical_chest_rig/first_responder(src) /obj/structure/closet/secure_closet/CMO diff --git a/code/game/turfs/flooring/flooring_decals.dm b/code/game/turfs/flooring/flooring_decals.dm index 554040f7f2e..2c27b649634 100644 --- a/code/game/turfs/flooring/flooring_decals.dm +++ b/code/game/turfs/flooring/flooring_decals.dm @@ -605,7 +605,7 @@ /obj/effect/floor_decal/sign/gtr icon_state = "white_gtr" -/obj/effect/floor_decal/sign/emt +/obj/effect/floor_decal/sign/first_responder icon_state = "white_emt" /obj/effect/floor_decal/sign/w diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 8ec690723a1..3474b992ab3 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -40,7 +40,7 @@ armbands["red armband"] = /obj/item/clothing/accessory/armband armbands["security armband"] = /obj/item/clothing/accessory/armband/sec armbands["cargo armband"] = /obj/item/clothing/accessory/armband/cargo - armbands["EMT armband"] = /obj/item/clothing/accessory/armband/medgreen + armbands["first responder armband"] = /obj/item/clothing/accessory/armband/medgreen armbands["medical armband"] = /obj/item/clothing/accessory/armband/med armbands["engineering armband"] = /obj/item/clothing/accessory/armband/engine armbands["hydroponics armband"] = /obj/item/clothing/accessory/armband/hydro @@ -112,7 +112,7 @@ /datum/gear/accessory/white_vest display_name = "webbing, medical" path = /obj/item/clothing/accessory/storage/white_vest - allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Psychiatrist", "Emergency Medical Technician", "Medical Intern") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Psychiatrist", "First Responder", "Medical Intern") /datum/gear/accessory/webbing display_name = "webbing, simple" @@ -132,7 +132,7 @@ /datum/gear/accessory/white_pouches display_name = "drop pouches, medical" path = /obj/item/clothing/accessory/storage/pouches/white - allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Psychiatrist", "Emergency Medical Technician", "Medical Intern") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Psychiatrist", "First Responder", "Medical Intern") /datum/gear/accessory/pouches display_name = "drop pouches, simple" diff --git a/code/modules/client/preference_setup/loadout/loadout_computer.dm b/code/modules/client/preference_setup/loadout/loadout_computer.dm index 9833220e1ca..3b9c43f5bf0 100644 --- a/code/modules/client/preference_setup/loadout/loadout_computer.dm +++ b/code/modules/client/preference_setup/loadout/loadout_computer.dm @@ -26,7 +26,7 @@ /datum/gear/computer/handheld/wristbound/medical display_name = "wristbound computer (Medical)" path = /obj/item/modular_computer/handheld/wristbound/preset/advanced/medical - allowed_roles = list("Physician", "Surgeon", "Medical Intern", "Pharmacist", "Psychiatrist", "Emergency Medical Technician") + allowed_roles = list("Physician", "Surgeon", "Medical Intern", "Pharmacist", "Psychiatrist", "First Responder") /datum/gear/computer/handheld/wristbound/security display_name = "wristbound computer (Security)" diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index a87fd4fa81f..04f7b5a252e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -73,7 +73,7 @@ display_name = "medical HUD selection" description = "A selection of medical HUDs." path = /obj/item/clothing/glasses/hud/health/aviator - allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Emergency Medical Technician", "Psychiatrist", "Medical Intern") + allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern") /datum/gear/eyes/medhuds/New() ..() diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 53f8ef06c8a..f31ec72ddcf 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -245,7 +245,7 @@ /datum/gear/head/surgical display_name = "surgical cap selection" path = /obj/item/clothing/head/surgery/blue - allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Emergency Medical Technician", "Medical Intern", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician") + allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician") /datum/gear/head/surgical/New() ..() @@ -273,7 +273,7 @@ /datum/gear/head/iacberet display_name = "IAC Beret" path = /obj/item/clothing/head/softcap/iac - allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Emergency Medical Technician", "Medical Intern") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern") flags = GEAR_HAS_DESC_SELECTION /datum/gear/head/circuitry diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 225ff3e9485..7f70aea25e1 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -99,13 +99,13 @@ display_name = "surgical apron" path = /obj/item/clothing/suit/apron/surgery cost = 1 - allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Emergency Medical Technician", "Medical Intern", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician") + allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician") /datum/gear/suit/iacvest display_name = "IAC vest" description = "It's a lightweight vest. Made of a dark, navy mesh with highly-reflective white material, designed to be worn by the Interstellar Aid Corps." path = /obj/item/clothing/suit/storage/iacvest - allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Emergency Medical Technician", "Medical Intern") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern") flags = GEAR_HAS_DESC_SELECTION /datum/gear/suit/poncho diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 2f1cd11ef2c..fa9b198c984 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -8,7 +8,7 @@ /datum/gear/uniform/iacjumpsuit display_name = "IAC Jumpsuit" path = /obj/item/clothing/under/rank/iacjumpsuit - allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Emergency Medical Technician", "Medical Intern") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern") /datum/gear/uniform/jumpsuit display_name = "generic jumpsuits" @@ -96,7 +96,7 @@ /datum/gear/uniform/scrubs display_name = "scrubs selection" path = /obj/item/clothing/under/rank/medical/black - allowed_roles = list("Scientist","Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Emergency Medical Technician", "Medical Intern", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician") + allowed_roles = list("Scientist","Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician") /datum/gear/uniform/scrubs/New() ..() diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm index 37d408ef52d..8f67b3c21f0 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm @@ -57,7 +57,7 @@ display_name = "PRA medical coat" path = /obj/item/clothing/suit/storage/toggle/labcoat/tajaran whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) - allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Chemist", "Geneticist", "Emergency Medical Technician", "Medical Intern") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Chemist", "Geneticist", "First Responder", "Medical Intern") sort_category = "Xenowear - Tajara" /datum/gear/suit/tajaran_surgeon diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm index 89ebbadd4c5..f32a298b053 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm @@ -98,7 +98,7 @@ whitelisted = list(SPECIES_UNATHI) sort_category = "Xenowear - Unathi" cost = 3 - allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Emergency Medical Technician", "Medical Intern", "Psychiatrist", "Chemist") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "First Responder", "Medical Intern", "Psychiatrist", "Chemist") flags = GEAR_NO_SELECTION /datum/gear/augment/autakh_security diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 1cd82cbafc0..3de0eb754ac 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -39,9 +39,9 @@ icon_state = "atmos_fire" item_state = "atmos_fire" -/obj/item/clothing/head/hardhat/emt +/obj/item/clothing/head/hardhat/first_responder 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." + desc = "A polymer helmet worn by first responders 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" diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index f5a1878de04..77e8968d771 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -228,7 +228,7 @@ /obj/item/rig/medical/equipped - req_access = list(access_emt) + req_access = list(access_first_responder) initial_modules = list( /obj/item/rig_module/chem_dispenser/injector/paramedic, diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index f3b7a375f9b..7305e3b1b8f 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -290,13 +290,13 @@ obj/item/clothing/suit/apron/overalls/blue /obj/item/device/healthanalyzer, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/tank/emergency_oxygen, /obj/item/device/breath_analyzer, /obj/item/reagent_containers/blood) body_parts_covered = UPPER_TORSO -/obj/item/clothing/suit/storage/medical_chest_rig/emt +/obj/item/clothing/suit/storage/medical_chest_rig/first_responder name = "first responder vest" desc = "A dark green vest adorned with high-visibility stripes. Has pouches to carry equipment with." - icon = 'icons/clothing/kit/emt.dmi' + icon = 'icons/clothing/kit/first_responder.dmi' contained_sprite = TRUE - icon_state = "emtvest" - item_state = "emtvest" + icon_state = "firstrespondervest" + item_state = "firstrespondervest" //Mime /obj/item/clothing/suit/suspenders @@ -307,10 +307,10 @@ obj/item/clothing/suit/apron/overalls/blue blood_overlay_type = "armor" //it's the less thing that I can put here body_parts_covered = 0 -/obj/item/clothing/suit/storage/toggle/emt_jacket +/obj/item/clothing/suit/storage/toggle/first_responder_jacket name = "first responder jacket" desc = "A dark green first responder jacket." - icon = 'icons/clothing/kit/emt.dmi' + icon = 'icons/clothing/kit/first_responder.dmi' contained_sprite = TRUE - icon_state = "emtjacket" - item_state = "emtjacket" + icon_state = "firstresponderjacket" + item_state = "firstresponderjacket" diff --git a/code/modules/clothing/under/accessories/armband.dm b/code/modules/clothing/under/accessories/armband.dm index de2e2240b69..abc23cd9e22 100644 --- a/code/modules/clothing/under/accessories/armband.dm +++ b/code/modules/clothing/under/accessories/armband.dm @@ -36,7 +36,7 @@ icon_state = "med" /obj/item/clothing/accessory/armband/medgreen - name = "EMT armband" + name = "first responder armband" desc = "An armband, worn by the crew to display which department they're assigned to. This one is white and green." icon_state = "medgreen" diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index ccae115cd40..3c48dee42aa 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -164,13 +164,13 @@ item_state = "bl_suit" worn_state = "scrubsblack" -/obj/item/clothing/under/rank/medical/emt +/obj/item/clothing/under/rank/medical/first_responder name = "first responder jumpsuit" desc = "A jumpsuit that denotes the wearer as a Nanotrasen First Responder." - icon = 'icons/clothing/kit/emt.dmi' + icon = 'icons/clothing/kit/first_responder.dmi' contained_sprite = TRUE - icon_state = "emtjumpsuit" - item_state = "emtjumpsuit" + icon_state = "firstresponderjumpsuit" + item_state = "firstresponderjumpsuit" /obj/item/clothing/under/rank/psych desc = "A basic white jumpsuit. It has turqouise markings that denote the wearer as a psychiatrist." diff --git a/config/example/tips.txt b/config/example/tips.txt index a8dc2003b71..3d2d072ce6e 100644 --- a/config/example/tips.txt +++ b/config/example/tips.txt @@ -15,7 +15,7 @@ You can move an item out of the way by dragging it and then clicking on an adjac Maintenance is full of equipment that is randomized every round. Look around and see if anything is worth using. There are many places around the station to hide contraband. A few for starters: linen boxes, toilet cisterns, body bags. Experiment to find more! As the Captain, you are one of the highest priority targets on the station. Everything from revolutions, to mercenaries, to traitors that need to rob you of your antique laser gun or your life are things to worry about. As the Captain, you have absolute access and control over the station, but this does not mean that being a horrible person won't result in mutiny and a ban. -As the Chief Medical Officer, coordinate and communicate with your doctors, chemists, and EMTs during a pirate raid, blob infestation, or some other crisis to keep people alive and fighting. +As the Chief Medical Officer, coordinate and communicate with your doctors, chemists, and first responders during a pirate raid, blob infestation, or some other crisis to keep people alive and fighting. As a Physician, you can attempt to draw blood from a husk with a syringe to determine the cause. If you can extract blood, it was caused by extreme temperatures or lasers, if there is no blood to extract, it was caused by something unnatural. As a Physician, you can surgically implant or extract things from people's chests. This can range from putting in a bomb to pulling out an alien larva. As a Physician, remember to target the correct limb and be on help intent when trying to perform surgery on someone. diff --git a/html/changelogs/geeves-first_responder.yml b/html/changelogs/geeves-first_responder.yml new file mode 100644 index 00000000000..ad406af99c6 --- /dev/null +++ b/html/changelogs/geeves-first_responder.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - tweak: "Emergency Medical Technicians have been renamed to First Responders, their duties remain the same, for now." \ No newline at end of file diff --git a/icons/clothing/kit/emt.dmi b/icons/clothing/kit/first_responder.dmi similarity index 95% rename from icons/clothing/kit/emt.dmi rename to icons/clothing/kit/first_responder.dmi index ca1a21dbdc5..ae2d0c5d9f5 100644 Binary files a/icons/clothing/kit/emt.dmi and b/icons/clothing/kit/first_responder.dmi differ diff --git a/maps/_common/areas/station/medical.dm b/maps/_common/areas/station/medical.dm index 8cf71457cd5..d73cf8b7c28 100644 --- a/maps/_common/areas/station/medical.dm +++ b/maps/_common/areas/station/medical.dm @@ -31,8 +31,8 @@ icon_state = "medbay4" ambience = list('sound/ambience/signal.ogg') -/area/medical/emt - name = "Medical - Emergency Technician Storage" +/area/medical/first_responder + name = "Medical - First Responder Equipment Storage" icon_state = "medbay" /area/medical/temp_morgue diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index 422a0dc66fe..9c75634fbdd 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -21480,22 +21480,22 @@ /obj/item/storage/belt/medical{ pixel_y = -4 }, -/obj/item/storage/belt/medical/emt{ +/obj/item/storage/belt/medical/first_responder{ pixel_y = 4 }, -/obj/item/storage/belt/medical/emt{ +/obj/item/storage/belt/medical/first_responder{ pixel_y = 4 }, -/obj/item/storage/belt/medical/emt{ +/obj/item/storage/belt/medical/first_responder{ pixel_y = 4 }, -/obj/item/storage/belt/medical/emt{ +/obj/item/storage/belt/medical/first_responder{ pixel_y = 4 }, -/obj/item/storage/belt/medical/emt{ +/obj/item/storage/belt/medical/first_responder{ pixel_y = 4 }, -/obj/item/storage/belt/medical/emt{ +/obj/item/storage/belt/medical/first_responder{ pixel_y = 4 }, /obj/item/clothing/accessory/stethoscope, @@ -22536,7 +22536,7 @@ /area/medical/medbay4) "aWF" = ( /obj/effect/landmark/start{ - name = "Emergency Medical Technician" + name = "First Responder" }, /obj/effect/floor_decal/corner_wide/lime{ dir = 5 @@ -22721,7 +22721,7 @@ dir = 4 }, /obj/effect/landmark/start{ - name = "Emergency Medical Technician" + name = "First Responder" }, /obj/structure/bed/chair/plastic{ dir = 8 diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 4cc1c223a6c..f508ee85811 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -42151,14 +42151,14 @@ /area/hallway/primary/central_one) "bwc" = ( /obj/machinery/camera/network/civilian_main{ - c_tag = "Central Corridor - Medical EMT Entrance"; + c_tag = "Central Corridor - Medical First Responder Entrance"; dir = 8 }, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "bwd" = ( /turf/simulated/wall, -/area/medical/emt) +/area/medical/first_responder) "bwe" = ( /obj/effect/floor_decal/corner/grey{ dir = 8 @@ -42974,7 +42974,7 @@ /obj/machinery/disposal, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/emt) +/area/medical/first_responder) "bxv" = ( /obj/structure/sign/nosmoking_1{ pixel_y = 32 @@ -42994,7 +42994,7 @@ /obj/item/storage/firstaid/o2, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/emt) +/area/medical/first_responder) "bxw" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -43010,7 +43010,7 @@ }, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/emt) +/area/medical/first_responder) "bxx" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -43031,7 +43031,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/medical/emt) +/area/medical/first_responder) "bxy" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -43051,7 +43051,7 @@ }, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/emt) +/area/medical/first_responder) "bxz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -43080,7 +43080,7 @@ dir = 6 }, /turf/simulated/floor/tiled, -/area/medical/emt) +/area/medical/first_responder) "bxA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -43104,7 +43104,7 @@ }, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/emt) +/area/medical/first_responder) "bxB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -43126,11 +43126,11 @@ }, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/emt) +/area/medical/first_responder) "bxC" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_medical{ - name = "EMT Quarters"; + name = "First Responder Quarters"; req_access = list(67) }, /obj/structure/cable/green{ @@ -43149,12 +43149,12 @@ }, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled/dark, -/area/medical/emt) +/area/medical/first_responder) "bxD" = ( /obj/effect/floor_decal/corner/grey{ dir = 9 }, -/obj/effect/floor_decal/sign/emt, +/obj/effect/floor_decal/sign/first_responder, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -43697,7 +43697,7 @@ /area/hallway/primary/central_one) "byS" = ( /obj/machinery/door/airlock/glass_medical{ - name = "EMT Quarters"; + name = "First Responder Quarters"; req_access = list(67) }, /obj/machinery/door/firedoor, @@ -43706,14 +43706,14 @@ }, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/emt) +/area/medical/first_responder) "byT" = ( /obj/structure/disposalpipe/junction{ dir = 8 }, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/emt) +/area/medical/first_responder) "byU" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -43721,18 +43721,18 @@ }, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/emt) +/area/medical/first_responder) "byV" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/emt) +/area/medical/first_responder) "byW" = ( /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/emt) +/area/medical/first_responder) "byX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -43753,7 +43753,7 @@ }, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/emt) +/area/medical/first_responder) "byZ" = ( /obj/effect/floor_decal/corner/grey{ dir = 1 @@ -44266,15 +44266,15 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/medical/emt) +/area/medical/first_responder) "bzX" = ( /obj/machinery/door/airlock/glass_medical{ - name = "EMT Garage Access"; + name = "First Responder Garge Access"; req_access = list(67) }, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/emt) +/area/medical/first_responder) "bzY" = ( /obj/structure/window/reinforced, /obj/machinery/door/firedoor, @@ -44289,7 +44289,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/medical/emt) +/area/medical/first_responder) "bzZ" = ( /obj/structure/grille, /obj/structure/window/reinforced{ @@ -44312,24 +44312,24 @@ opacity = 0 }, /turf/simulated/floor/plating, -/area/medical/emt) +/area/medical/first_responder) "bAa" = ( /obj/machinery/firealarm/south, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/emt) +/area/medical/first_responder) "bAb" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/emt) +/area/medical/first_responder) "bAc" = ( /obj/structure/bed/chair/office/light, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/emt) +/area/medical/first_responder) "bAd" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -32 @@ -44646,7 +44646,7 @@ }, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/emt) +/area/medical/first_responder) "bAO" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -44695,14 +44695,14 @@ /obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ dir = 8; - id = "emtshutter"; - name = "EMT Garage Door" + id = "firstrespondershutter"; + name = "First Responder Garge Door" }, /turf/simulated/floor/plating, -/area/medical/emt) +/area/medical/first_responder) "bAV" = ( /turf/simulated/floor/plating, -/area/medical/emt) +/area/medical/first_responder) "bAW" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -44713,7 +44713,7 @@ /obj/machinery/mech_recharger, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, -/area/medical/emt) +/area/medical/first_responder) "bAZ" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/structure/sign/securearea{ @@ -44733,7 +44733,7 @@ }, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/emt) +/area/medical/first_responder) "bBb" = ( /obj/item/device/radio/intercom{ dir = 1; @@ -44743,7 +44743,7 @@ /obj/item/modular_computer/console/preset/medical, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/emt) +/area/medical/first_responder) "bBc" = ( /obj/structure/flora/pottedplant/random, /obj/machinery/alarm{ @@ -44981,11 +44981,11 @@ "bBG" = ( /obj/structure/table/standard, /obj/machinery/camera/network/medbay{ - c_tag = "Medical - EMT Quarters"; + c_tag = "Medical - First Responder Quarters"; dir = 1 }, -/obj/item/storage/belt/medical/emt, -/obj/item/storage/belt/medical/emt, +/obj/item/storage/belt/medical/first_responder, +/obj/item/storage/belt/medical/first_responder, /obj/item/device/gps{ gpstag = "MED1" }, @@ -44994,7 +44994,7 @@ }, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/emt) +/area/medical/first_responder) "bBH" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -45061,7 +45061,7 @@ "bBO" = ( /obj/machinery/light/small, /obj/machinery/button/remote/blast_door{ - id = "emtshutter"; + id = "firstrespondershutter"; name = "Garage Shutters Control"; pixel_y = -26; req_access = list(5) @@ -45070,11 +45070,11 @@ dir = 8 }, /obj/machinery/camera/network/medbay{ - c_tag = "Medical - EMT Garage"; + c_tag = "Medical - First Responder Garge"; dir = 1 }, /turf/simulated/floor/plating, -/area/medical/emt) +/area/medical/first_responder) "bBP" = ( /turf/simulated/wall, /area/crew_quarters/sleep/main) @@ -45436,7 +45436,7 @@ /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/hypospray, /turf/simulated/floor/tiled, -/area/medical/emt) +/area/medical/first_responder) "bCC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, diff --git a/maps/exodus/exodus-1_station.dmm b/maps/exodus/exodus-1_station.dmm index 5cc2fee1799..fb9ea990746 100644 --- a/maps/exodus/exodus-1_station.dmm +++ b/maps/exodus/exodus-1_station.dmm @@ -45387,7 +45387,7 @@ dir = 2; icon_state = "shutter0"; id = "acute1"; - name = "EMT Storage Privacy Shutters"; + name = "First Responder Storage Privacy Shutters"; opacity = 0 }, /turf/simulated/floor/plating, @@ -45399,7 +45399,7 @@ dir = 2; icon_state = "shutter0"; id = "acute1"; - name = "EMT Storage Privacy Shutters"; + name = "First Responder Storage Privacy Shutters"; opacity = 0 }, /obj/effect/floor_decal/corner/paleblue{ @@ -45417,7 +45417,7 @@ dir = 2; icon_state = "shutter0"; id = "acute1"; - name = "EMT Storage Privacy Shutters"; + name = "First Responder Storage Privacy Shutters"; opacity = 0 }, /obj/machinery/light_switch{ @@ -46368,7 +46368,7 @@ "bJS" = ( /obj/machinery/button/remote/blast_door{ id = "acute1"; - name = "EMT Storage Privacy Shutters"; + name = "First Responder Storage Privacy Shutters"; pixel_x = 26; pixel_y = 25; req_access = list(5) @@ -47163,7 +47163,7 @@ "bLx" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ - name = "EMT Storage"; + name = "First Responder Storage"; req_access = list(5) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -47932,7 +47932,7 @@ /area/medical/sleeper) "bMO" = ( /obj/effect/landmark/start{ - name = "Emergency Medical Technician" + name = "First Responder" }, /obj/item/stool/padded, /turf/simulated/floor/tiled/white, @@ -47945,10 +47945,10 @@ req_access = list(5) }, /obj/effect/landmark/start{ - name = "Emergency Medical Technician" + name = "First Responder" }, /obj/machinery/camera/network/medbay{ - c_tag = "Medbay EMT Storage"; + c_tag = "Medbay First Responder Storage"; dir = 1 }, /obj/item/stool/padded,