From 188226e986e16e8d225580873eb7d5d70b2d3988 Mon Sep 17 00:00:00 2001 From: Geeves Date: Tue, 23 Jun 2020 14:20:48 +0200 Subject: [PATCH] EMT Default (#9175) EMTs are now the default role Paramedic role, with Paramedic being the alt-title, as Paramedics are EMTs with more certifications and training. --- code/datums/uplink/specialty.dm | 2 +- code/game/jobs/access_datum.dm | 8 ++-- code/game/jobs/faction/eridani.dm | 8 ++-- code/game/jobs/faction/zeng_hu.dm | 8 ++-- code/game/jobs/job/medical.dm | 37 +++++++++---------- code/game/jobs/jobs.dm | 2 +- code/game/machinery/doors/firedoor.dm | 2 +- .../clothing/spacesuits/rig/suits/station.dm | 2 +- html/changelogs/geeves-emt_default.yml | 6 +++ 9 files changed, 40 insertions(+), 35 deletions(-) create mode 100644 html/changelogs/geeves-emt_default.yml diff --git a/code/datums/uplink/specialty.dm b/code/datums/uplink/specialty.dm index 505dfac86d5..f2dd665e641 100644 --- a/code/datums/uplink/specialty.dm +++ b/code/datums/uplink/specialty.dm @@ -21,7 +21,7 @@ Quick and easy list of all the occupations for farther expansion and addition. /datum/job/doctor /datum/job/chemist /datum/job/psychiatrist -/datum/job/paramedic +/datum/job/med_tech /datum/job/rd /datum/job/scientist /datum/job/xenobiologist diff --git a/code/game/jobs/access_datum.dm b/code/game/jobs/access_datum.dm index f4f70ce3dd6..166a4499c73 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_paramedic = 67 -/datum/access/access_paramedic - id = access_paramedic - desc = "Paramedic Equipment" +/var/const/access_emt = 67 +/datum/access/access_emt + id = access_emt + desc = "EMT 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 433d6c68489..8e0ad629f4f 100644 --- a/code/game/jobs/faction/eridani.dm +++ b/code/game/jobs/faction/eridani.dm @@ -27,7 +27,7 @@ /datum/job/officer, /datum/job/warden, /datum/job/forensics, - /datum/job/paramedic, + /datum/job/med_tech, /datum/job/representative ) @@ -45,8 +45,8 @@ "Warden" = /datum/outfit/job/warden/eridani, "Forensic Technician" = /datum/outfit/job/forensics/eridani, "Crime Scene Investigator" = /datum/outfit/job/forensics/eridani, - "Paramedic" = /datum/outfit/job/paramedic/eridani, - "Emergency Medical Technician" = /datum/outfit/job/paramedic/eridani, + "Paramedic" = /datum/outfit/job/med_tech/paramed/eridani, + "Emergency Medical Technician" = /datum/outfit/job/med_tech/paramed/eridani, "Corporate Liaison" = /datum/outfit/job/representative/eridani ) @@ -65,7 +65,7 @@ uniform = /obj/item/clothing/under/rank/security/eridani id = /obj/item/card/id/eridani -/datum/outfit/job/paramedic/eridani +/datum/outfit/job/med_tech/paramed/eridani name = "Paramedic - Eridani" uniform = /obj/item/clothing/under/rank/eridani_medic id = /obj/item/card/id/eridani diff --git a/code/game/jobs/faction/zeng_hu.dm b/code/game/jobs/faction/zeng_hu.dm index 872427dbf84..2e80ad8707f 100644 --- a/code/game/jobs/faction/zeng_hu.dm +++ b/code/game/jobs/faction/zeng_hu.dm @@ -35,7 +35,7 @@ /datum/job/surgeon, /datum/job/pharmacist, /datum/job/psychiatrist, - /datum/job/paramedic, + /datum/job/med_tech, /datum/job/roboticist, /datum/job/xenobiologist, /datum/job/representative @@ -58,8 +58,8 @@ "Chemist" = /datum/outfit/job/pharmacist/zeng_hu, "Psychiatrist" = /datum/outfit/job/psychiatrist/zeng_hu, "Psychologist" = /datum/outfit/job/psychiatrist/zeng_hu, - "Paramedic" = /datum/outfit/job/paramedic/zeng_hu, - "Emergency Medical Technician" = /datum/outfit/job/paramedic/zeng_hu, + "Paramedic" = /datum/outfit/job/med_tech/paramed/zeng_hu, + "Emergency Medical Technician" = /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, @@ -93,7 +93,7 @@ uniform = /obj/item/clothing/under/rank/zeng id = /obj/item/card/id/zeng_hu -/datum/outfit/job/paramedic/zeng_hu +/datum/outfit/job/med_tech/paramed/zeng_hu name = "Paramedic - Zeng-Hu" uniform = /obj/item/clothing/under/rank/zeng id = /obj/item/card/id/zeng_hu diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index cb6e45a1a41..6eb906d527a 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -17,11 +17,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_paramedic, access_maint_tunnels) + access_emt, 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_paramedic, access_maint_tunnels) + access_emt, access_maint_tunnels) minimal_player_age = 10 ideal_character_age = 50 @@ -223,9 +223,9 @@ name = "Psychologist" jobtype = /datum/job/psychiatrist -/datum/job/paramedic - title = "Paramedic" - flag = PARAMEDIC +/datum/job/med_tech + title = "Emergency Medical Technician" + flag = MED_TECH department = "Medical" department_flag = MEDSCI faction = "Station" @@ -235,21 +235,21 @@ selection_color = "#FF97D1" economic_modifier = 4 - minimum_character_age = 24 - alt_ages = list("Emergency Medical Technician" = 20) + minimum_character_age = 20 + alt_ages = list("Paramedic" = 24) - 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_paramedic) - minimal_access = list(access_medical, access_medical_equip, access_morgue, access_eva, access_maint_tunnels, access_external_airlocks, access_paramedic) - alt_titles = list("Emergency Medical Technician") - outfit = /datum/outfit/job/paramedic - alt_outfits = list("Emergency Medical Technician"=/datum/outfit/job/paramedic/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_emt) + minimal_access = list(access_medical, access_medical_equip, access_morgue, access_eva, access_maint_tunnels, access_external_airlocks, access_emt) + alt_titles = list("Paramedic") + outfit = /datum/outfit/job/med_tech + alt_outfits = list("Paramedic" = /datum/outfit/job/med_tech/paramed) blacklisted_species = list("Diona") -/datum/outfit/job/paramedic - name = "Paramedic" - base_name = "Paramedic" - jobtype = /datum/job/paramedic +/datum/outfit/job/med_tech + name = "Emergency Medical Technician" + base_name = "Emergency Medical Technician" + jobtype = /datum/job/med_tech uniform = /obj/item/clothing/under/rank/medical/black suit = /obj/item/clothing/suit/storage/toggle/fr_jacket @@ -267,9 +267,8 @@ dufflebag = /obj/item/storage/backpack/duffel/med messengerbag = /obj/item/storage/backpack/messenger/med -/datum/outfit/job/paramedic/emt - name = "Emergency Medical Technician" - jobtype = /datum/job/paramedic +/datum/outfit/job/med_tech/paramed + name = "Paramedic" /datum/job/intern_med title = "Medical Resident" diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index d982822a7c3..d1a69af22f5 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -28,7 +28,7 @@ var/const/VIROLOGIST =(1<<6) var/const/PSYCHIATRIST =(1<<7) var/const/ROBOTICIST =(1<<8) var/const/XENOBIOLOGIST =(1<<9) -var/const/PARAMEDIC =(1<<10) +var/const/MED_TECH =(1<<10) var/const/INTERN_MED =(1<<11) var/const/INTERN_SCI =(1<<12) diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 76c1cee226e..cc7544a9789 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_paramedic) + req_one_access = list(access_atmospherics, access_engine_equip, access_emt) opacity = 0 density = 0 layer = DOOR_OPEN_LAYER - 0.01 diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index f18636dfe79..08023686487 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -224,7 +224,7 @@ /obj/item/rig/medical/equipped - req_access = list(access_paramedic) + req_access = list(access_emt) initial_modules = list( /obj/item/rig_module/chem_dispenser/injector/paramedic, diff --git a/html/changelogs/geeves-emt_default.yml b/html/changelogs/geeves-emt_default.yml new file mode 100644 index 00000000000..44f47437685 --- /dev/null +++ b/html/changelogs/geeves-emt_default.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - tweak: "EMTs are now the default role Paramedic role, with Paramedic being the alt-title, as Paramedics are EMTs with more certifications and training." \ No newline at end of file