From 1639d11b78ca76d9c3b91aec7529d6948ef7274f Mon Sep 17 00:00:00 2001 From: LynxSolstice <112824777+LynxSolstice@users.noreply.github.com> Date: Wed, 8 May 2024 11:12:57 -0600 Subject: [PATCH 01/11] Changes the First Responder title to the more accurate, Paramedic title. --- code/__DEFINES/access.dm | 2 +- code/datums/tips/tips.dm | 2 +- code/datums/uplink/medical.dm | 2 +- code/game/jobs/faction/pmc.dm | 4 +- code/game/jobs/faction/zeng_hu.dm | 4 +- code/game/jobs/job/medical.dm | 12 ++-- code/game/jobs/jobs.dm | 2 +- .../objects/items/weapons/storage/belt.dm | 2 +- .../crates_lockers/closets/secure/medical.dm | 4 +- .../loadout/items/accessories.dm | 6 +- .../loadout/items/augments.dm | 14 ++--- .../preference_setup/loadout/items/eyes.dm | 4 +- .../loadout/items/factions.dm | 20 +++---- .../preference_setup/loadout/items/head.dm | 4 +- .../loadout/items/religion.dm | 2 +- .../preference_setup/loadout/items/suit.dm | 10 ++-- .../preference_setup/loadout/items/uniform.dm | 4 +- .../loadout/items/xeno/tajara.dm | 2 +- .../loadout/items/xeno/unathi.dm | 2 +- .../loadout/items/xeno/vaurca.dm | 2 +- code/modules/clothing/head/hardhat.dm | 2 +- code/modules/clothing/suits/jobs.dm | 10 ++-- .../clothing/under/accessories/armband.dm | 2 +- code/modules/clothing/under/jobs/medsci.dm | 6 +- code/modules/customitems/item_defines.dm | 6 +- .../LynxSolstice-Return-of-the-Paramedic.yml | 58 +++++++++++++++++++ 26 files changed, 123 insertions(+), 65 deletions(-) create mode 100644 html/changelogs/LynxSolstice-Return-of-the-Paramedic.yml diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 726233c1b74..3e152922b87 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -418,7 +418,7 @@ #define ACCESS_FIRST_RESPONDER 67 /datum/access/first_responder id = ACCESS_FIRST_RESPONDER - desc = "First Responder Equipment" + desc = "Paramedic Equipment" region = ACCESS_REGION_MEDBAY // free_access_id = 68 diff --git a/code/datums/tips/tips.dm b/code/datums/tips/tips.dm index 4a2ce5cd168..a42417a7f24 100644 --- a/code/datums/tips/tips.dm +++ b/code/datums/tips/tips.dm @@ -123,7 +123,7 @@ GLOBAL_LIST_EMPTY(tips_by_category) /datum/tip/medical category = CATEGORY_MEDICAL messages = list( - "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 the Chief Medical Officer, coordinate and communicate with your doctors, chemists, and Paramedics 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/code/datums/uplink/medical.dm b/code/datums/uplink/medical.dm index 1ba670a0335..efb22accfcd 100644 --- a/code/datums/uplink/medical.dm +++ b/code/datums/uplink/medical.dm @@ -40,7 +40,7 @@ name = "Fully Loaded Combat Medical Belt" bluecrystal_cost = 3 path = /obj/item/storage/belt/medical/first_responder/combat/full - desc = "A fully loaded medical belt even Zeng-Hu's top First Responders would be dying to wear. It contains liquid medicines and a hypospray. Combat hypo sold separately." + desc = "A fully loaded medical belt even Zeng-Hu's top Paramedics would be dying to wear. It contains liquid medicines and a hypospray. Combat hypo sold separately." /datum/uplink_item/item/medical/defib name = "Combat Defibrillator" diff --git a/code/game/jobs/faction/pmc.dm b/code/game/jobs/faction/pmc.dm index 17b3dd2066a..f32ff6f5428 100644 --- a/code/game/jobs/faction/pmc.dm +++ b/code/game/jobs/faction/pmc.dm @@ -44,7 +44,7 @@ "Pharmacist" = /obj/outfit/job/pharmacist/pmc, "Psychiatrist" = /obj/outfit/job/psychiatrist/pmc, "Psychologist" = /obj/outfit/job/psychiatrist/pmc, - "First Responder" = /obj/outfit/job/med_tech/pmc, + "Paramedic" = /obj/outfit/job/med_tech/pmc, "Medical Intern" = /obj/outfit/job/intern_med/pmc, "Corporate Reporter" = /obj/outfit/job/journalist/pmc, "Corporate Liaison" = /obj/outfit/job/representative/pmc, @@ -168,7 +168,7 @@ messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg /obj/outfit/job/med_tech/pmc - name = "First Responder - PMC" + name = "Paramedic - PMC" head = /obj/item/clothing/head/softcap/pmc uniform = /obj/item/clothing/under/rank/medical/first_responder/pmc diff --git a/code/game/jobs/faction/zeng_hu.dm b/code/game/jobs/faction/zeng_hu.dm index 1412df7d8aa..d2b66ee6ccc 100644 --- a/code/game/jobs/faction/zeng_hu.dm +++ b/code/game/jobs/faction/zeng_hu.dm @@ -45,7 +45,7 @@ "Pharmacist" = /obj/outfit/job/pharmacist/zeng_hu, "Psychiatrist" = /obj/outfit/job/psychiatrist/zeng_hu, "Psychologist" = /obj/outfit/job/psychiatrist/zeng_hu, - "First Responder" = /obj/outfit/job/med_tech/zeng_hu, + "Paramedic" = /obj/outfit/job/med_tech/zeng_hu, "Medical Intern" = /obj/outfit/job/intern_med/zeng_hu, "Scientist" = /obj/outfit/job/scientist/zeng_hu, "Xenobiologist" = /obj/outfit/job/scientist/xenobiologist/zeng_hu, @@ -116,7 +116,7 @@ messengerbag_faction = /obj/item/storage/backpack/messenger/zeng /obj/outfit/job/med_tech/zeng_hu - name = "First Responder - Zeng-Hu" + name = "Paramedic - Zeng-Hu" head = /obj/item/clothing/head/softcap/zeng uniform = /obj/item/clothing/under/rank/medical/first_responder/zeng diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 9ad5e4426e0..33ebe984cfa 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -252,7 +252,7 @@ jobtype = /datum/job/psychiatrist /datum/job/med_tech - title = "First Responder" + title = "Paramedic" flag = MED_TECH departments = SIMPLEDEPT(DEPARTMENT_MEDICAL) department_flag = MEDSCI @@ -276,8 +276,8 @@ blacklisted_species = list(SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_IPC_G2, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) /obj/outfit/job/med_tech - name = "First Responder" - base_name = "First Responder" + name = "Paramedic" + base_name = "Paramedic" jobtype = /datum/job/med_tech head = /obj/item/clothing/head/softcap/nt @@ -314,8 +314,8 @@ departments = SIMPLEDEPT(DEPARTMENT_MEDICAL) department_flag = MEDSCI faction = "Station" - alt_titles = list("First Responder Trainee", "Pharmacy Intern", "Resident Physician", "Resident Surgeon", "Resident Psychiatrist") - alt_outfits = list("First Responder Trainee" = /obj/outfit/job/intern_med/medtech, "Pharmacy Intern" = /obj/outfit/job/intern_med/pharmacist, "Resident Surgeon" = /obj/outfit/job/intern_med/surgeon, "Resident Psychiatrist" = /obj/outfit/job/intern_med/psychiatrist) + alt_titles = list("Paramedic Trainee", "Pharmacy Intern", "Resident Physician", "Resident Surgeon", "Resident Psychiatrist") + alt_outfits = list("Paramedic Trainee" = /obj/outfit/job/intern_med/medtech, "Pharmacy Intern" = /obj/outfit/job/intern_med/pharmacist, "Resident Surgeon" = /obj/outfit/job/intern_med/surgeon, "Resident Psychiatrist" = /obj/outfit/job/intern_med/psychiatrist) alt_ages = list("Pharmacy Intern" = list( SPECIES_HUMAN = 25, SPECIES_SKRELL = 58, @@ -375,7 +375,7 @@ tablet = /obj/item/modular_computer/handheld/preset/medical /obj/outfit/job/intern_med/medtech - name = "First Responder Trainee" + name = "Paramedic Trainee" head = /obj/item/clothing/head/softcap/nt shoes = /obj/item/clothing/shoes/jackboots diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 6e9d0f5165f..42154bee645 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -103,7 +103,7 @@ var/list/medical_positions = list( "Surgeon", "Psychiatrist", "Pharmacist", - "First Responder", + "Paramedic", "Medical Intern", "Medical Personnel" ) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index ba7fdff79a7..4037d43e2fc 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -231,7 +231,7 @@ ) /obj/item/storage/belt/medical/first_responder - name = "first responder utility belt" + name = "Paramedic utility belt" desc = "A sturdy black webbing belt with attached pouches." icon_state = "emsbelt" item_state = "emsbelt" 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 feea526ac84..d90d24e00c7 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -76,8 +76,8 @@ new /obj/item/clothing/glasses/eyepatch/hud/medical(src) /obj/structure/closet/secure_closet/medical_fr - name = "first responder's locker" - desc = "An immobile, card-locked storage unit containing all the necessary equipment for a first responder." + name = "Paramedic's locker" + desc = "An immobile, card-locked storage unit containing all the necessary equipment for a Paramedic." req_access = list(ACCESS_FIRST_RESPONDER) icon_state = "med" diff --git a/code/modules/client/preference_setup/loadout/items/accessories.dm b/code/modules/client/preference_setup/loadout/items/accessories.dm index ed829f410a9..fe301cdff97 100644 --- a/code/modules/client/preference_setup/loadout/items/accessories.dm +++ b/code/modules/client/preference_setup/loadout/items/accessories.dm @@ -45,7 +45,7 @@ armbands["red armband"] = /obj/item/clothing/accessory/armband armbands["security armband"] = /obj/item/clothing/accessory/armband/sec armbands["operations armband"] = /obj/item/clothing/accessory/armband/operations - armbands["first responder armband"] = /obj/item/clothing/accessory/armband/medgreen + armbands["Paramedic 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 @@ -122,7 +122,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", "First Responder", "Medical Intern", "Medical Personnel") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Psychiatrist", "Paramedic", "Medical Intern", "Medical Personnel") /datum/gear/accessory/webbing display_name = "webbing, simple" @@ -169,7 +169,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", "First Responder", "Medical Intern", "Medical Personnel") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Psychiatrist", "Paramedic", "Medical Intern", "Medical Personnel") /datum/gear/accessory/pouches display_name = "drop pouches, simple" diff --git a/code/modules/client/preference_setup/loadout/items/augments.dm b/code/modules/client/preference_setup/loadout/items/augments.dm index 0f6214b91b4..9518b6a203c 100644 --- a/code/modules/client/preference_setup/loadout/items/augments.dm +++ b/code/modules/client/preference_setup/loadout/items/augments.dm @@ -158,7 +158,7 @@ path = /obj/item/organ/internal/augment/memory_inhibitor whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) faction = "Zeng-Hu Pharmaceuticals" - allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") + allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") /datum/gear/augment/emotional_manipulator display_name = "emotional manipulator" @@ -166,7 +166,7 @@ path = /obj/item/organ/internal/augment/emotional_manipulator whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) faction = "Zeng-Hu Pharmaceuticals" - allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") + allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") /datum/gear/augment/enhanced_vision display_name = "vision enhanced retinas" @@ -175,7 +175,7 @@ whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) faction = "Zeng-Hu Pharmaceuticals" cost = 3 - allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain", "Bridge Crew", "Medical Personnel") + allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain", "Bridge Crew", "Medical Personnel") /datum/gear/augment/sightlights @@ -185,7 +185,7 @@ whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) faction = "Zeng-Hu Pharmaceuticals" cost = 3 - allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain", "Medical Personnel", "Science Personnel") + allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain", "Medical Personnel", "Science Personnel") /datum/gear/augment/zenghu_plate @@ -194,7 +194,7 @@ path = /obj/item/organ/internal/augment/zenghu_plate whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) faction = "Zeng-Hu Pharmaceuticals" - allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain", "Medical Personnel", "Science Personnel") + allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain", "Medical Personnel", "Science Personnel") /datum/gear/augment/corrective_lenses @@ -251,7 +251,7 @@ path = /obj/item/organ/internal/augment/language/zeng whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD) faction = "Zeng-Hu Pharmaceuticals" - allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain", "Medical Personnel", "Science Personnel") + allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain", "Medical Personnel", "Science Personnel") cost = 3 /datum/gear/augment/phalanx_plate @@ -259,6 +259,6 @@ description = "This modular face plate accommodates a wide array of cybernetic augmentations, enabling seamless integration with Phalanx's transhumanist doctrine. Enhanced sensory overlays and HUDs offer Phalanx members superior situational awareness and promote a sense of hive-thinking." path = /obj/item/organ/internal/augment/eye_sensors/phalanx whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI) - allowed_roles = list("Physician", "Surgeon", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Medical Personnel", "Security Officer", "Warden", "Security Cadet", "Investigator", "Security Personnel", "Corporate Liaison", "Assistant", "Off-Duty Crew Member") + allowed_roles = list("Physician", "Surgeon", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Medical Personnel", "Security Officer", "Warden", "Security Cadet", "Investigator", "Security Personnel", "Corporate Liaison", "Assistant", "Off-Duty Crew Member") faction = "Private Military Contracting Group" cost = 1 diff --git a/code/modules/client/preference_setup/loadout/items/eyes.dm b/code/modules/client/preference_setup/loadout/items/eyes.dm index 837999d4790..cfc24a9cdbd 100644 --- a/code/modules/client/preference_setup/loadout/items/eyes.dm +++ b/code/modules/client/preference_setup/loadout/items/eyes.dm @@ -79,7 +79,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", "First Responder", "Psychiatrist", "Medical Intern", "Medical Personnel") + allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Medical Personnel") /datum/gear/eyes/medhuds/New() ..() @@ -158,7 +158,7 @@ display_name = "HUD goggles selection (medical)" description = "A selection of medical goggles. Note that factional ones can only be taken by members of that faction." path = /obj/item/clothing/glasses/safety/goggles/medical - allowed_roles = list("First Responder", "Medical Personnel") + allowed_roles = list("Paramedic", "Medical Personnel") /datum/gear/eyes/medical_goggles/New() ..() diff --git a/code/modules/client/preference_setup/loadout/items/factions.dm b/code/modules/client/preference_setup/loadout/items/factions.dm index 4890b457e43..90bc7bb9080 100644 --- a/code/modules/client/preference_setup/loadout/items/factions.dm +++ b/code/modules/client/preference_setup/loadout/items/factions.dm @@ -283,7 +283,7 @@ description = "A selection of PMCG medical HUDs." path = /obj/item/clothing/glasses/hud/health/aviator/pmc slot = slot_glasses - allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Medical Personnel") + allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Medical Personnel") faction = "Private Military Contracting Group" /datum/gear/faction/pmc_medglasses/New() @@ -425,19 +425,19 @@ allowed_roles = list("Medical Intern", "Medical Personnel") /datum/gear/faction/epmc_uniform_fr_med - display_name = "PMCG/EPMC first responder uniform" + display_name = "PMCG/EPMC Paramedic uniform" path = /obj/item/clothing/under/rank/medical/first_responder/pmc/epmc slot = slot_w_uniform faction = "Private Military Contracting Group" - allowed_roles = list("First Responder", "Medical Personnel") + allowed_roles = list("Paramedic", "Medical Personnel") /datum/gear/faction/epmc_uniform_fr_med/New() ..() var/list/epmc_uniform_fr_med = list() - epmc_uniform_fr_med["EPMC first responder uniform"] = /obj/item/clothing/under/rank/medical/first_responder/pmc/epmc - epmc_uniform_fr_med["PMCG first responder uniform, alt"] = /obj/item/clothing/under/rank/medical/first_responder/pmc/alt - epmc_uniform_fr_med["Sekhmet Intergalactic first responder uniform"] = /obj/item/clothing/under/rank/medical/first_responder/pmc/sekh - epmc_uniform_fr_med["Ve'katak Phalanx first responder uniform"] = /obj/item/clothing/under/rank/medical/first_responder/pmc/vekatak_phalanx + epmc_uniform_fr_med["EPMC Paramedic uniform"] = /obj/item/clothing/under/rank/medical/first_responder/pmc/epmc + epmc_uniform_fr_med["PMCG Paramedic uniform, alt"] = /obj/item/clothing/under/rank/medical/first_responder/pmc/alt + epmc_uniform_fr_med["Sekhmet Intergalactic Paramedic uniform"] = /obj/item/clothing/under/rank/medical/first_responder/pmc/sekh + epmc_uniform_fr_med["Ve'katak Phalanx Paramedic uniform"] = /obj/item/clothing/under/rank/medical/first_responder/pmc/vekatak_phalanx gear_tweaks += new /datum/gear_tweak/path(epmc_uniform_fr_med) /datum/gear/faction/wildlands_flagpatches @@ -508,7 +508,7 @@ zenghu_labcoats["zeng-hu letterman labcoat, alt"] = /obj/item/clothing/suit/storage/toggle/labcoat/zeng/letterman/alt zenghu_labcoats["zeng-hu letterman labcoat, classic"] = /obj/item/clothing/suit/storage/toggle/labcoat/zeng/letterman/alt2 zenghu_labcoats["zeng-hu labcoat, long"] = /obj/item/clothing/suit/storage/toggle/longcoat/zeng - zenghu_labcoats["zeng-hu first responder jacket"] = /obj/item/clothing/suit/storage/toggle/fr_jacket/zeng + zenghu_labcoats["zeng-hu Paramedic jacket"] = /obj/item/clothing/suit/storage/toggle/fr_jacket/zeng zenghu_labcoats["zeng-hu corporate jacket"] = /obj/item/clothing/suit/storage/toggle/corp/zeng zenghu_labcoats["zeng-hu corporate jacket, alt"] = /obj/item/clothing/suit/storage/toggle/corp/zeng/alt zenghu_labcoats["zeng-hu winter coat"] = /obj/item/clothing/suit/storage/hooded/wintercoat/zeng @@ -538,7 +538,7 @@ description = "A selection of Zeng-Hu medical HUDs." path = /obj/item/clothing/glasses/hud/health/aviator/zeng slot = slot_glasses - allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Medical Personnel") + allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Medical Personnel") faction = "Zeng-Hu Pharmaceuticals" /datum/gear/faction/zeng_medglasses/New() @@ -634,7 +634,7 @@ description = "A selection of NanoTrasen medical HUDs." path = /obj/item/clothing/glasses/hud/health/aviator/nt slot = slot_glasses - allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Medical Personnel") + allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Medical Personnel") faction = "NanoTrasen" /datum/gear/faction/nt_medglasses/New() diff --git a/code/modules/client/preference_setup/loadout/items/head.dm b/code/modules/client/preference_setup/loadout/items/head.dm index 708f4322f70..b56ff67c639 100644 --- a/code/modules/client/preference_setup/loadout/items/head.dm +++ b/code/modules/client/preference_setup/loadout/items/head.dm @@ -297,7 +297,7 @@ /datum/gear/head/surgical display_name = "surgical cap selection" path = /obj/item/clothing/head/surgery/pmc - allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Xenobiologist", "Research Director", "Investigator", "Medical Personnel") + allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Intern", "Xenobiologist", "Research Director", "Investigator", "Medical Personnel") /datum/gear/head/surgical/New() ..() @@ -343,7 +343,7 @@ display_name = "IAC headgear selection" description = "A selection of hats worn by Interstellar Aid Corps volunteers." path = /obj/item/clothing/head/softcap/iac - allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Medical Personnel") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Intern", "Medical Personnel") flags = GEAR_HAS_DESC_SELECTION /datum/gear/head/iac/New() diff --git a/code/modules/client/preference_setup/loadout/items/religion.dm b/code/modules/client/preference_setup/loadout/items/religion.dm index 03cbc172ebb..2982a7bd56d 100644 --- a/code/modules/client/preference_setup/loadout/items/religion.dm +++ b/code/modules/client/preference_setup/loadout/items/religion.dm @@ -176,7 +176,7 @@ display_name = "tribunalist medical beret" path = /obj/item/clothing/head/beret/dominia/medical slot = slot_head - allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Medical Personnel") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Intern", "Medical Personnel") /datum/gear/religion/dominia/robe_consular display_name = "tribunalist consular uniform" diff --git a/code/modules/client/preference_setup/loadout/items/suit.dm b/code/modules/client/preference_setup/loadout/items/suit.dm index d2a14cbdc0f..8a2dc70ce0b 100644 --- a/code/modules/client/preference_setup/loadout/items/suit.dm +++ b/code/modules/client/preference_setup/loadout/items/suit.dm @@ -122,24 +122,24 @@ display_name = "surgical apron" path = /obj/item/clothing/accessory/apron/surgery cost = 1 - allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Xenobiologist", "Research Director", "Investigator", "Medical Personnel", "Science Personnel") + allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Intern", "Xenobiologist", "Research Director", "Investigator", "Medical Personnel", "Science Personnel") /datum/gear/suit/medical_outerwear display_name = "medical outerwear (jackets, vests, rigs)" path = /obj/item/clothing/suit/storage/toggle/fr_jacket - allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Medical Personnel") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Intern", "Medical Personnel") /datum/gear/suit/medical_outerwear/New() ..() var/list/medical_outerwear = list() medical_outerwear["medical chest-rig"] = /obj/item/clothing/suit/storage/medical_chest_rig - medical_outerwear["first responder jacket"] = /obj/item/clothing/suit/storage/toggle/fr_jacket + medical_outerwear["Paramedic jacket"] = /obj/item/clothing/suit/storage/toggle/fr_jacket gear_tweaks += new /datum/gear_tweak/path(medical_outerwear) /datum/gear/suit/iac_outerwear display_name = "IAC outerwear (jackets, vests, rigs)" path = /obj/item/clothing/suit/storage/hazardvest/iac - allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Medical Personnel") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Intern", "Medical Personnel") flags = GEAR_HAS_DESC_SELECTION /datum/gear/suit/iac_outerwear/New() @@ -297,7 +297,7 @@ display_name = "tribunalist medical cape" path = /obj/item/clothing/accessory/poncho/dominia_cape/hospital flags = GEAR_HAS_DESC_SELECTION - allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Intern") culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi) /datum/gear/suit/dominia diff --git a/code/modules/client/preference_setup/loadout/items/uniform.dm b/code/modules/client/preference_setup/loadout/items/uniform.dm index 7ed5f721b60..23404eb6e0f 100644 --- a/code/modules/client/preference_setup/loadout/items/uniform.dm +++ b/code/modules/client/preference_setup/loadout/items/uniform.dm @@ -12,7 +12,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", "First Responder", "Medical Intern", "Medical Personnel") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Intern", "Medical Personnel") /datum/gear/uniform/jumpsuit display_name = "generic jumpsuits" @@ -99,7 +99,7 @@ /datum/gear/uniform/scrubs display_name = "scrubs selection" path = /obj/item/clothing/under/rank/medical/surgeon/zavod - allowed_roles = list("Scientist","Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Xenobiologist", "Research Director", "Investigator", "Medical Personnel", "Science Personnel") + allowed_roles = list("Scientist","Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Intern", "Xenobiologist", "Research Director", "Investigator", "Medical Personnel", "Science Personnel") /datum/gear/uniform/scrubs/New() ..() diff --git a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm index 26fea38d460..e528dffe076 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm @@ -116,7 +116,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", "Pharmacist", "First Responder", "Medical Intern", "Medical Personnel") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Intern", "Medical Personnel") sort_category = "Xenowear - Tajara" /datum/gear/suit/tajaran_surgeon diff --git a/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm b/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm index bbceceb15c1..8af37e9b9ae 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm @@ -230,7 +230,7 @@ culture_restriction = list(/singleton/origin_item/culture/autakh) sort_category = "Xenowear - Unathi" cost = 2 - allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "First Responder", "Medical Intern", "Psychiatrist", "Pharmacist", "Medical Personnel") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Paramedic", "Medical Intern", "Psychiatrist", "Pharmacist", "Medical Personnel") flags = GEAR_NO_SELECTION /datum/gear/augment/autakh_security diff --git a/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm b/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm index af0c4db4665..c29e20afcc7 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm @@ -276,7 +276,7 @@ path = /obj/item/organ/external/hand/right/vaurca/medical whitelisted = list(SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER) sort_category = "Xenowear - Vaurca" - allowed_roles = list("Physician", "Surgeon", "First Responder", "Medical Intern", "Psychiatrist", "Pharmacist", "Medical Personnel") + allowed_roles = list("Physician", "Surgeon", "Paramedic", "Medical Intern", "Psychiatrist", "Pharmacist", "Medical Personnel") flags = GEAR_NO_SELECTION /datum/gear/augment/vaurcamag diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index f01a3275bca..e1e1a382081 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -66,7 +66,7 @@ /obj/item/clothing/head/hardhat/first_responder name = "medical helmet" - 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." + desc = "A polymer helmet worn by 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" diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 7275410cb01..565bd83066c 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -239,8 +239,8 @@ //Medical /obj/item/clothing/suit/storage/toggle/fr_jacket - name = "first responder jacket" - desc = "A high-visibility jacket worn by medical first responders." + name = "Paramedic jacket" + desc = "A high-visibility jacket worn by medical Paramedics." icon = 'icons/obj/item/clothing/department_uniforms/medical.dmi' contained_sprite = TRUE icon_state = "nt_emt_jacket" @@ -251,12 +251,12 @@ body_parts_covered = UPPER_TORSO|ARMS /obj/item/clothing/suit/storage/toggle/fr_jacket/zeng - desc = "A first responder jacket in the classic white and purple of Zeng-Hu Pharmaceuticals." + desc = "A Paramedic jacket in the classic white and purple of Zeng-Hu Pharmaceuticals." icon_state = "zeng_emt_jacket" item_state = "zeng_emt_jacket" /obj/item/clothing/suit/storage/toggle/fr_jacket/pmc - desc = "A first responder jacket in the classic black and blue of the PMCG." + desc = "A Paramedic jacket in the classic black and blue of the PMCG." icon_state = "pmc_emt_jacket" item_state = "pmc_emt_jacket" @@ -267,7 +267,7 @@ /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." + desc = "A white chest-rig with pouches worn by medical Paramedics, meant to carry their equipment." icon_state = "paramed_armor" item_state = "paramed_armor" blood_overlay_type = "armor" diff --git a/code/modules/clothing/under/accessories/armband.dm b/code/modules/clothing/under/accessories/armband.dm index 6449334f62f..1f1f05c686a 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 = "first responder armband" + name = "Paramedic 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 9a591eeae56..33883b171f3 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -185,11 +185,11 @@ icon_state = "pmc_alt_intern" item_state = "pmc_alt_intern" -// First Responder +// Paramedic /obj/item/clothing/under/rank/medical/first_responder - name = "first responder jumpsuit" - desc = "It's made of a special fiber that provides minor protection against biohazards. It's a special jumpsuit made for first responders." + name = "Paramedic jumpsuit" + desc = "It's made of a special fiber that provides minor protection against biohazards. It's a special jumpsuit made for Paramedics." icon_state = "nt_emt" item_state = "nt_emt" diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 51c91b0a4be..90c4a056098 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -661,7 +661,7 @@ All custom items with worn sprites must follow the contained sprite system: http /obj/item/clothing/suit/storage/toggle/fr_jacket/fluff/ramit_jacket //Winter Paramedic Jacket - Ra'mit Ma'zaira - sampletex name = "winter paramedic jacket" - desc = "A custom made first responder coat. Inside is a warm fabric with the name \"Ra'Mit Ma'zaira\" sewn in by the collar." + desc = "A custom made Paramedic coat. Inside is a warm fabric with the name \"Ra'Mit Ma'zaira\" sewn in by the collar." icon = 'icons/obj/custom_items/ramit_jacket.dmi' icon_override = 'icons/obj/custom_items/ramit_jacket.dmi' icon_state = "ramit_jacket" @@ -996,8 +996,8 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = TRUE species_restricted = list(BODYTYPE_TAJARA) -/obj/item/clothing/suit/storage/toggle/fr_jacket/fluff/akila_jacket //Reflective First Responder Jacket - Akila Aksha'Shalwariran - shestrying - name = "reflective first responder jacket" +/obj/item/clothing/suit/storage/toggle/fr_jacket/fluff/akila_jacket //Reflective Paramedic Jacket - Akila Aksha'Shalwariran - shestrying + name = "reflective Paramedic jacket" desc = "A jacket in an eye-blinding yellow, with flourescent green, light-reflective striping along the cuffs and bottom edge. A bright red cross rests on the front, over the heart." icon = 'icons/obj/custom_items/akila_jacket.dmi' icon_override = 'icons/obj/custom_items/akila_jacket.dmi' diff --git a/html/changelogs/LynxSolstice-Return-of-the-Paramedic.yml b/html/changelogs/LynxSolstice-Return-of-the-Paramedic.yml new file mode 100644 index 00000000000..2dec50adf10 --- /dev/null +++ b/html/changelogs/LynxSolstice-Return-of-the-Paramedic.yml @@ -0,0 +1,58 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: LynxSolstice + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: +- qol: "Changes the title of the first responder back to paramedic, to be more accurate, since Security Officers are also first responders (or the fabled firefighter atmos tech)" From bf563bacf1a668389046cf4dc6aa2babcae41d0f Mon Sep 17 00:00:00 2001 From: LynxSolstice <112824777+LynxSolstice@users.noreply.github.com> Date: Wed, 8 May 2024 11:16:52 -0600 Subject: [PATCH 02/11] Should have gotten them all with this pass! --- code/__DEFINES/access.dm | 6 +- code/datums/outfits/ert/ap_eridani.dm | 12 ++-- code/datums/outfits/ert/biesel.dm | 2 +- code/datums/outfits/ert/coalition.dm | 4 +- code/datums/outfits/ert/dominia.dm | 2 +- code/datums/outfits/ert/einstein.dm | 2 +- code/datums/outfits/ert/elyra.dm | 2 +- code/datums/outfits/ert/fsf.dm | 2 +- code/datums/outfits/ert/hephaestus_ert.dm | 2 +- code/datums/outfits/ert/izweski.dm | 2 +- code/datums/outfits/ert/kataphract.dm | 2 +- code/datums/outfits/ert/kosmostrelki.dm | 2 +- code/datums/outfits/ert/mercenary.dm | 2 +- code/datums/outfits/ert/nt_ert.dm | 2 +- code/datums/outfits/ert/qukala.dm | 2 +- code/datums/outfits/ert/scc_ert.dm | 2 +- code/datums/outfits/ert/vaurca.dm | 4 +- code/datums/outfits/ert/zavod.dm | 2 +- code/datums/outfits/ert/zenghu.dm | 4 +- .../outfits/event/outfit_generic/medical.dm | 4 +- code/datums/outfits/event/outfit_megacorps.dm | 2 +- code/datums/trading/weaponry.dm | 2 +- code/datums/uplink/medical.dm | 2 +- code/game/jobs/faction/pmc.dm | 2 +- code/game/jobs/faction/zeng_hu.dm | 2 +- code/game/jobs/job/event.dm | 4 +- code/game/jobs/job/medical.dm | 10 +-- code/game/machinery/doors/firedoor.dm | 2 +- .../objects/items/weapons/storage/belt.dm | 8 +-- code/game/objects/random/clothing.dm | 6 +- .../crates_lockers/closets/secure/medical.dm | 12 ++-- .../crates_lockers/crates/gear_loadout.dm | 2 +- code/game/turfs/flooring/flooring_decals_.dm | 2 +- .../loadout/items/factions.dm | 10 +-- code/modules/clothing/factions/pmcg.dm | 2 +- code/modules/clothing/head/hardhat.dm | 2 +- .../clothing/spacesuits/rig/suits/station.dm | 2 +- code/modules/clothing/suits/jobs.dm | 4 +- code/modules/clothing/under/jobs/medsci.dm | 12 ++-- code/modules/item_worth/worths_list.dm | 2 +- .../programs/civilian/crusher_control.dm | 2 +- maps/_common/areas/station/medical.dm | 2 +- maps/aurora/aurora-1_centcomm.dmm | 8 +-- maps/aurora/aurora-3_sublevel.dmm | 12 ++-- maps/aurora/aurora-4_mainlevel.dmm | 70 +++++++++---------- .../cult_base/cult_base_ghostroles.dm | 2 +- .../point_verdant/point_verdant_ghostroles.dm | 6 +- .../biesel/tcaf_corvette/tcaf_corvette.dmm | 4 +- .../tcfl_patrol/tcfl_peacekeeper_ship.dmm | 2 +- maps/away/ships/coc/coc_ranger/coc_ship.dmm | 2 +- .../dominian_corvette/dominian_corvette.dmm | 2 +- .../dominian_unathi_privateer.dmm | 2 +- .../elyra/elyra_corvette/elyra_corvette.dmm | 2 +- .../away/ships/freebooter/freebooter_ship.dmm | 2 +- .../hegemony_corvette/hegemony_corvette.dmm | 2 +- .../heph/heph_security/heph_security.dmm | 2 +- maps/away/ships/iac/iac_rescue_ship.dmm | 8 +-- .../ships/kataphracts/kataphract_ship.dmm | 2 +- .../ships/konyang/kasf_ship/kasf_ship.dmm | 2 +- .../ships/sol/sol_merc/fsf_patrol_ship.dmm | 2 +- maps/away/ships/sol/sol_ssmd/ssmd_ship.dmm | 2 +- .../hiskyn/unathi_pirate_hiskyn.dmm | 2 +- .../tarwa/unathi_pirate_tarwa.dmm | 2 +- .../ships/wildlands_militia/militia_ship.dmm | 2 +- maps/away/ships/xanu/xanu_frigate.dmm | 2 +- .../pre_fabricated/massfab_medical.dmm | 12 ++-- maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 54 +++++++------- maps/sccv_horizon/sccv_horizon-3_deck_3.dmm | 4 +- maps/sccv_horizon/sccv_horizon-4_centcomm.dmm | 8 +-- 69 files changed, 188 insertions(+), 188 deletions(-) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 3e152922b87..702be15daf0 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -415,9 +415,9 @@ desc = "Medical Equipment" region = ACCESS_REGION_MEDBAY -#define ACCESS_FIRST_RESPONDER 67 -/datum/access/first_responder - id = ACCESS_FIRST_RESPONDER +#define ACCESS_PARAMEDIC 67 +/datum/access/paramedic + id = ACCESS_PARAMEDIC desc = "Paramedic Equipment" region = ACCESS_REGION_MEDBAY diff --git a/code/datums/outfits/ert/ap_eridani.dm b/code/datums/outfits/ert/ap_eridani.dm index 7bd78d9901f..9aa2c68273b 100644 --- a/code/datums/outfits/ert/ap_eridani.dm +++ b/code/datums/outfits/ert/ap_eridani.dm @@ -85,15 +85,15 @@ /obj/outfit/admin/ert/ap_eridani/doctor name = "Eridani Medical Officer" - uniform = /obj/item/clothing/under/rank/medical/first_responder/pmc/epmc + uniform = /obj/item/clothing/under/rank/medical/paramedic/pmc/epmc suit = /obj/item/clothing/suit/storage/medical_chest_rig - suit_store = /obj/item/clothing/head/hardhat/first_responder + suit_store = /obj/item/clothing/head/hardhat/paramedic head = /obj/item/clothing/head/beret/corporate/pmc/epmc mask = /obj/item/clothing/mask/surgical glasses = /obj/item/clothing/glasses/hud/health/aviator shoes = /obj/item/clothing/shoes/combat gloves = /obj/item/clothing/gloves/latex/nitrile - belt = /obj/item/storage/belt/medical/first_responder/combat + belt = /obj/item/storage/belt/medical/paramedic/combat back = /obj/item/storage/backpack/satchel/med accessory = /obj/item/clothing/accessory/holster/thigh accessory_contents = list(/obj/item/gun/energy/disruptorpistol/magnum = 1) @@ -129,16 +129,16 @@ /obj/outfit/admin/ert/ap_eridani/corpsman name = "Eridani Corpsman" - uniform = /obj/item/clothing/under/rank/medical/first_responder/pmc/epmc + uniform = /obj/item/clothing/under/rank/medical/paramedic/pmc/epmc suit = /obj/item/clothing/suit/storage/medical_chest_rig - suit_store = /obj/item/clothing/head/hardhat/first_responder + suit_store = /obj/item/clothing/head/hardhat/paramedic head = /obj/item/clothing/head/softcap/pmc/epmc mask = /obj/item/clothing/mask/surgical glasses = /obj/item/clothing/glasses/hud/health/aviator gloves = /obj/item/clothing/gloves/latex/nitrile shoes = /obj/item/clothing/shoes/combat back = /obj/item/storage/backpack/messenger/med - belt = /obj/item/storage/belt/medical/first_responder/combat + belt = /obj/item/storage/belt/medical/paramedic/combat accessory = /obj/item/clothing/accessory/holster/thigh accessory_contents = list(/obj/item/gun/energy/disruptorpistol/magnum = 1) l_pocket = /obj/item/device/healthanalyzer diff --git a/code/datums/outfits/ert/biesel.dm b/code/datums/outfits/ert/biesel.dm index 3a66b67f492..5a1a446e841 100644 --- a/code/datums/outfits/ert/biesel.dm +++ b/code/datums/outfits/ert/biesel.dm @@ -56,7 +56,7 @@ /obj/outfit/admin/ert/tcaf/medic name = "Republican Fleet Medic" - belt = /obj/item/storage/belt/medical/first_responder/combat + belt = /obj/item/storage/belt/medical/paramedic/combat glasses = /obj/item/clothing/glasses/hud/health gloves = /obj/item/clothing/gloves/latex/nitrile species_gloves = list( diff --git a/code/datums/outfits/ert/coalition.dm b/code/datums/outfits/ert/coalition.dm index 99d27feb4bb..27149d042e0 100644 --- a/code/datums/outfits/ert/coalition.dm +++ b/code/datums/outfits/ert/coalition.dm @@ -28,7 +28,7 @@ /obj/outfit/admin/ert/coalition/medic name = "Coalition Medic" - belt = /obj/item/storage/belt/medical/first_responder/combat + belt = /obj/item/storage/belt/medical/paramedic/combat back = /obj/item/storage/backpack/satchel/med glasses = /obj/item/clothing/glasses/hud/health gloves = /obj/item/clothing/gloves/latex @@ -126,7 +126,7 @@ /obj/outfit/admin/ert/konyang/medic name = "KASF Medic" - belt = /obj/item/storage/belt/medical/first_responder/combat + belt = /obj/item/storage/belt/medical/paramedic/combat back = /obj/item/storage/backpack/satchel/med glasses = /obj/item/clothing/glasses/hud/health gloves = /obj/item/clothing/gloves/latex diff --git a/code/datums/outfits/ert/dominia.dm b/code/datums/outfits/ert/dominia.dm index 09c4903e8a8..a65b3e2dd71 100644 --- a/code/datums/outfits/ert/dominia.dm +++ b/code/datums/outfits/ert/dominia.dm @@ -42,7 +42,7 @@ uniform = /obj/item/clothing/under/dominia/fleet glasses = /obj/item/clothing/glasses/hud/health gloves = /obj/item/clothing/gloves/latex - belt = /obj/item/storage/belt/medical/first_responder/combat + belt = /obj/item/storage/belt/medical/paramedic/combat back = /obj/item/storage/backpack/dominia suit_store = /obj/item/gun/projectile/automatic/tommygun/dom backpack_contents = list( diff --git a/code/datums/outfits/ert/einstein.dm b/code/datums/outfits/ert/einstein.dm index ec516cb1a4e..a4e83b04b72 100644 --- a/code/datums/outfits/ert/einstein.dm +++ b/code/datums/outfits/ert/einstein.dm @@ -32,7 +32,7 @@ /obj/outfit/admin/ert/einstein/medic name = "Einstein Medic" - belt = /obj/item/storage/belt/medical/first_responder/combat + belt = /obj/item/storage/belt/medical/paramedic/combat glasses = /obj/item/clothing/glasses/hud/health gloves = /obj/item/clothing/gloves/latex/nitrile backpack = /obj/item/storage/backpack/satchel/med diff --git a/code/datums/outfits/ert/elyra.dm b/code/datums/outfits/ert/elyra.dm index bd56aa0b5b3..0d253b3e5fa 100644 --- a/code/datums/outfits/ert/elyra.dm +++ b/code/datums/outfits/ert/elyra.dm @@ -65,7 +65,7 @@ /obj/outfit/admin/ert/elyran_trooper/medical name = "Elyran Navy Corpsman" - belt = /obj/item/storage/belt/medical/first_responder/combat + belt = /obj/item/storage/belt/medical/paramedic/combat back = /obj/item/storage/backpack/satchel/med glasses = /obj/item/clothing/glasses/hud/health gloves = /obj/item/clothing/gloves/latex diff --git a/code/datums/outfits/ert/fsf.dm b/code/datums/outfits/ert/fsf.dm index b5e37cbbf87..bdeee7432e9 100644 --- a/code/datums/outfits/ert/fsf.dm +++ b/code/datums/outfits/ert/fsf.dm @@ -36,7 +36,7 @@ /obj/outfit/admin/ert/fsf/medic name = "Free Solarian Fleets Medic" - belt = /obj/item/storage/belt/medical/first_responder/combat + belt = /obj/item/storage/belt/medical/paramedic/combat back = /obj/item/storage/backpack/satchel/med glasses = /obj/item/clothing/glasses/hud/health suit_store = /obj/item/gun/projectile/shotgun/pump/combat/sol diff --git a/code/datums/outfits/ert/hephaestus_ert.dm b/code/datums/outfits/ert/hephaestus_ert.dm index bfe0ccc9f7b..278942ba0b4 100644 --- a/code/datums/outfits/ert/hephaestus_ert.dm +++ b/code/datums/outfits/ert/hephaestus_ert.dm @@ -45,7 +45,7 @@ /obj/outfit/admin/ert/hephaestus/medic name = "Hephaestus Medic" - belt = /obj/item/storage/belt/medical/first_responder/combat + belt = /obj/item/storage/belt/medical/paramedic/combat glasses = /obj/item/clothing/glasses/hud/health gloves = /obj/item/clothing/gloves/latex species_gloves = list( diff --git a/code/datums/outfits/ert/izweski.dm b/code/datums/outfits/ert/izweski.dm index c73625a3969..aae7e0269ad 100644 --- a/code/datums/outfits/ert/izweski.dm +++ b/code/datums/outfits/ert/izweski.dm @@ -31,7 +31,7 @@ /obj/outfit/admin/ert/izweski/medic name = "Izweski Navy Medic" - belt = /obj/item/storage/belt/medical/first_responder/combat + belt = /obj/item/storage/belt/medical/paramedic/combat back = /obj/item/storage/backpack/satchel/hegemony head = /obj/item/clothing/head/helmet/space/void/hegemony/specialist suit = /obj/item/clothing/suit/space/void/hegemony/specialist diff --git a/code/datums/outfits/ert/kataphract.dm b/code/datums/outfits/ert/kataphract.dm index 9ac627aad92..8f34c23a522 100644 --- a/code/datums/outfits/ert/kataphract.dm +++ b/code/datums/outfits/ert/kataphract.dm @@ -83,7 +83,7 @@ head = /obj/item/clothing/head/helmet/space/void/kataphract/spec suit = /obj/item/clothing/suit/space/void/kataphract/spec - belt = /obj/item/storage/belt/medical/first_responder/combat + belt = /obj/item/storage/belt/medical/paramedic/combat l_hand = /obj/item/melee/hammer/powered/hegemony belt_contents = list( diff --git a/code/datums/outfits/ert/kosmostrelki.dm b/code/datums/outfits/ert/kosmostrelki.dm index 7bd35089286..aa52d4b1aac 100644 --- a/code/datums/outfits/ert/kosmostrelki.dm +++ b/code/datums/outfits/ert/kosmostrelki.dm @@ -104,7 +104,7 @@ glasses = /obj/item/clothing/glasses/hud/health - belt = /obj/item/storage/belt/medical/first_responder/combat + belt = /obj/item/storage/belt/medical/paramedic/combat back = /obj/item/storage/backpack/satchel/leather diff --git a/code/datums/outfits/ert/mercenary.dm b/code/datums/outfits/ert/mercenary.dm index 16278810e09..de562683a36 100644 --- a/code/datums/outfits/ert/mercenary.dm +++ b/code/datums/outfits/ert/mercenary.dm @@ -41,7 +41,7 @@ name = "Mercenary Freelancer Medic" glasses = /obj/item/clothing/glasses/hud/health/aviator - belt = /obj/item/storage/belt/medical/first_responder/combat + belt = /obj/item/storage/belt/medical/paramedic/combat gloves = /obj/item/clothing/gloves/latex backpack_contents = list( diff --git a/code/datums/outfits/ert/nt_ert.dm b/code/datums/outfits/ert/nt_ert.dm index f15096f8568..ef1448a06b4 100644 --- a/code/datums/outfits/ert/nt_ert.dm +++ b/code/datums/outfits/ert/nt_ert.dm @@ -34,7 +34,7 @@ /obj/outfit/admin/ert/nanotrasen/specialist/medical name = "NanoTrasen ERT Medical Specialist" - belt = /obj/item/storage/belt/medical/first_responder/combat + belt = /obj/item/storage/belt/medical/paramedic/combat back = /obj/item/rig/ert/medical r_hand = /obj/item/storage/firstaid/combat diff --git a/code/datums/outfits/ert/qukala.dm b/code/datums/outfits/ert/qukala.dm index 1f1821d9f63..1db5971cf7a 100644 --- a/code/datums/outfits/ert/qukala.dm +++ b/code/datums/outfits/ert/qukala.dm @@ -66,7 +66,7 @@ name = "Qukala Medic" suit = /obj/item/clothing/suit/space/void/kala/med head = /obj/item/clothing/head/helmet/space/void/kala/med - belt = /obj/item/storage/belt/medical/first_responder/combat + belt = /obj/item/storage/belt/medical/paramedic/combat glasses = /obj/item/clothing/glasses/hud/health gloves = /obj/item/clothing/gloves/latex/nitrile species_gloves = list( diff --git a/code/datums/outfits/ert/scc_ert.dm b/code/datums/outfits/ert/scc_ert.dm index c5e5e77ddec..71b706de92b 100644 --- a/code/datums/outfits/ert/scc_ert.dm +++ b/code/datums/outfits/ert/scc_ert.dm @@ -31,7 +31,7 @@ /obj/outfit/admin/ert/scc/medic name = "ERT Medical Specialist (SCC)" - belt = /obj/item/storage/belt/medical/first_responder/combat + belt = /obj/item/storage/belt/medical/paramedic/combat back = /obj/item/rig/ert/scc/medical r_hand = /obj/item/storage/firstaid/combat diff --git a/code/datums/outfits/ert/vaurca.dm b/code/datums/outfits/ert/vaurca.dm index be40b9c124c..7e78c749170 100644 --- a/code/datums/outfits/ert/vaurca.dm +++ b/code/datums/outfits/ert/vaurca.dm @@ -52,7 +52,7 @@ /obj/outfit/admin/ert/zora/medic name = "Zo'ra Field Biotechnician" - belt = /obj/item/storage/belt/medical/first_responder/combat + belt = /obj/item/storage/belt/medical/paramedic/combat gloves = /obj/item/clothing/gloves/latex/nitrile/vaurca backpack_contents = list( @@ -196,7 +196,7 @@ /obj/outfit/admin/ert/klax/medic name = "K'lax Field Biotechnician" - belt = /obj/item/storage/belt/medical/first_responder/combat + belt = /obj/item/storage/belt/medical/paramedic/combat gloves = /obj/item/clothing/gloves/latex/nitrile/vaurca r_hand = null diff --git a/code/datums/outfits/ert/zavod.dm b/code/datums/outfits/ert/zavod.dm index f63a2883cb7..2372f6b5d4c 100644 --- a/code/datums/outfits/ert/zavod.dm +++ b/code/datums/outfits/ert/zavod.dm @@ -38,7 +38,7 @@ /obj/outfit/admin/ert/zavodskoi/medic name = "Zavodskoi Medic" - belt = /obj/item/storage/belt/medical/first_responder/combat + belt = /obj/item/storage/belt/medical/paramedic/combat glasses = /obj/item/clothing/glasses/hud/health gloves = /obj/item/clothing/gloves/latex/nitrile backpack_contents = list( diff --git a/code/datums/outfits/ert/zenghu.dm b/code/datums/outfits/ert/zenghu.dm index d551a4522cc..76cad4697cc 100644 --- a/code/datums/outfits/ert/zenghu.dm +++ b/code/datums/outfits/ert/zenghu.dm @@ -31,8 +31,8 @@ /obj/outfit/admin/ert/zeng/medic name = "Zeng-Hu Medic" - uniform = /obj/item/clothing/under/rank/medical/first_responder/zeng - belt = /obj/item/storage/belt/medical/first_responder/combat + uniform = /obj/item/clothing/under/rank/medical/paramedic/zeng + belt = /obj/item/storage/belt/medical/paramedic/combat glasses = /obj/item/clothing/glasses/hud/health gloves = /obj/item/clothing/gloves/latex/nitrile backpack_contents = list( diff --git a/code/datums/outfits/event/outfit_generic/medical.dm b/code/datums/outfits/event/outfit_generic/medical.dm index 68228e29fb5..89d825052ea 100644 --- a/code/datums/outfits/event/outfit_generic/medical.dm +++ b/code/datums/outfits/event/outfit_generic/medical.dm @@ -25,8 +25,8 @@ belt = list( /obj/item/storage/belt/medical/full, /obj/item/storage/belt/medical/full/inaprov, - /obj/item/storage/belt/medical/first_responder/full, - /obj/item/storage/belt/medical/first_responder/combat/full, + /obj/item/storage/belt/medical/paramedic/full, + /obj/item/storage/belt/medical/paramedic/combat/full, ) glasses = list( /obj/item/clothing/glasses/hud/health, diff --git a/code/datums/outfits/event/outfit_megacorps.dm b/code/datums/outfits/event/outfit_megacorps.dm index 7d3c6e547ca..5307d622902 100644 --- a/code/datums/outfits/event/outfit_megacorps.dm +++ b/code/datums/outfits/event/outfit_megacorps.dm @@ -44,7 +44,7 @@ /obj/outfit/admin/megacorp/zenghu_trooper name = "Zeng Hu Pharmaceuticals Asset Protection" - uniform = /obj/item/clothing/under/rank/medical/first_responder/zeng + uniform = /obj/item/clothing/under/rank/medical/paramedic/zeng back = /obj/item/storage/backpack/satchel/leather gloves = /obj/item/clothing/gloves/combat shoes = /obj/item/clothing/shoes/magboots diff --git a/code/datums/trading/weaponry.dm b/code/datums/trading/weaponry.dm index eb433683106..d97d29b8e06 100644 --- a/code/datums/trading/weaponry.dm +++ b/code/datums/trading/weaponry.dm @@ -179,6 +179,6 @@ /obj/item/clothing/mask/gas/tactical = TRADER_THIS_TYPE, /obj/item/shield/riot/tact = TRADER_THIS_TYPE, /obj/item/storage/belt/security/tactical = TRADER_THIS_TYPE, - /obj/item/storage/belt/medical/first_responder/combat = TRADER_THIS_TYPE, + /obj/item/storage/belt/medical/paramedic/combat = TRADER_THIS_TYPE, /obj/item/clothing/accessory/storage/bandolier = TRADER_THIS_TYPE ) diff --git a/code/datums/uplink/medical.dm b/code/datums/uplink/medical.dm index efb22accfcd..a83d6aec50e 100644 --- a/code/datums/uplink/medical.dm +++ b/code/datums/uplink/medical.dm @@ -39,7 +39,7 @@ /datum/uplink_item/item/medical/medicalbelt name = "Fully Loaded Combat Medical Belt" bluecrystal_cost = 3 - path = /obj/item/storage/belt/medical/first_responder/combat/full + path = /obj/item/storage/belt/medical/paramedic/combat/full desc = "A fully loaded medical belt even Zeng-Hu's top Paramedics would be dying to wear. It contains liquid medicines and a hypospray. Combat hypo sold separately." /datum/uplink_item/item/medical/defib diff --git a/code/game/jobs/faction/pmc.dm b/code/game/jobs/faction/pmc.dm index f32ff6f5428..bf3da937bbe 100644 --- a/code/game/jobs/faction/pmc.dm +++ b/code/game/jobs/faction/pmc.dm @@ -171,7 +171,7 @@ name = "Paramedic - PMC" head = /obj/item/clothing/head/softcap/pmc - uniform = /obj/item/clothing/under/rank/medical/first_responder/pmc + uniform = /obj/item/clothing/under/rank/medical/paramedic/pmc suit = /obj/item/clothing/suit/storage/toggle/fr_jacket/pmc id = /obj/item/card/id/pmc diff --git a/code/game/jobs/faction/zeng_hu.dm b/code/game/jobs/faction/zeng_hu.dm index d2b66ee6ccc..0743aad286e 100644 --- a/code/game/jobs/faction/zeng_hu.dm +++ b/code/game/jobs/faction/zeng_hu.dm @@ -119,7 +119,7 @@ name = "Paramedic - Zeng-Hu" head = /obj/item/clothing/head/softcap/zeng - uniform = /obj/item/clothing/under/rank/medical/first_responder/zeng + uniform = /obj/item/clothing/under/rank/medical/paramedic/zeng suit = /obj/item/clothing/suit/storage/toggle/fr_jacket/zeng id = /obj/item/card/id/zeng_hu diff --git a/code/game/jobs/job/event.dm b/code/game/jobs/job/event.dm index bf212493c36..994bb435bf8 100644 --- a/code/game/jobs/job/event.dm +++ b/code/game/jobs/job/event.dm @@ -42,8 +42,8 @@ SPECIES_SKRELL_AXIORI = 55 ) - access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PSYCHIATRIST, ACCESS_FIRST_RESPONDER) - minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_FIRST_RESPONDER) + access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PSYCHIATRIST, ACCESS_PARAMEDIC) + minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PARAMEDIC) outfit = /obj/outfit/job/med_tech blacklisted_species = list(SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_IPC_G2, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 33ebe984cfa..7f1f3db629f 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -20,11 +20,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_SHIP_WEAPONS, ACCESS_CONSTRUCTION, ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_PSYCHIATRIST, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_MAILSORTING, - ACCESS_FIRST_RESPONDER, ACCESS_MAINT_TUNNELS, ACCESS_INTREPID, ACCESS_TELEPORTER) + ACCESS_PARAMEDIC, ACCESS_MAINT_TUNNELS, ACCESS_INTREPID, ACCESS_TELEPORTER) 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_SHIP_WEAPONS, ACCESS_CONSTRUCTION, ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_PSYCHIATRIST, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_MAILSORTING, - ACCESS_FIRST_RESPONDER, ACCESS_MAINT_TUNNELS, ACCESS_INTREPID, ACCESS_TELEPORTER) + ACCESS_PARAMEDIC, ACCESS_MAINT_TUNNELS, ACCESS_INTREPID, ACCESS_TELEPORTER) minimal_player_age = 10 outfit = /obj/outfit/job/cmo @@ -269,8 +269,8 @@ SPECIES_SKRELL_AXIORI = 55 ) - access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PSYCHIATRIST, ACCESS_FIRST_RESPONDER) - minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_FIRST_RESPONDER) + access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PSYCHIATRIST, ACCESS_PARAMEDIC) + minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PARAMEDIC) outfit = /obj/outfit/job/med_tech blacklisted_species = list(SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_IPC_G2, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) @@ -281,7 +281,7 @@ jobtype = /datum/job/med_tech head = /obj/item/clothing/head/softcap/nt - uniform = /obj/item/clothing/under/rank/medical/first_responder + uniform = /obj/item/clothing/under/rank/medical/paramedic suit = /obj/item/clothing/suit/storage/toggle/fr_jacket shoes = /obj/item/clothing/shoes/jackboots id = /obj/item/card/id/white diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 5807a157fcf..116fa2ac9e8 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -11,7 +11,7 @@ desc = "An airtight emergency shutter designed to seal off areas from hostile environments. It flashes a warning light if it detects an environmental hazard on any side." icon = 'icons/obj/doors/basic/single/emergency/firedoor.dmi' icon_state = "door_open" - req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ENGINE_EQUIP, ACCESS_FIRST_RESPONDER) + req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ENGINE_EQUIP, ACCESS_PARAMEDIC) opacity = 0 density = 0 layer = OPEN_DOOR_LAYER diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 4037d43e2fc..f0cbd80f8dd 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -230,13 +230,13 @@ /obj/item/storage/box/fancy/med_pouch/trauma = 1, ) -/obj/item/storage/belt/medical/first_responder +/obj/item/storage/belt/medical/paramedic name = "Paramedic utility belt" desc = "A sturdy black webbing belt with attached pouches." icon_state = "emsbelt" item_state = "emsbelt" -/obj/item/storage/belt/medical/first_responder/full +/obj/item/storage/belt/medical/paramedic/full starts_with = list( /obj/item/reagent_containers/hypospray = 1, /obj/item/reagent_containers/glass/bottle/inaprovaline = 1, @@ -247,7 +247,7 @@ /obj/item/extinguisher/mini = 1, ) -/obj/item/storage/belt/medical/first_responder/combat +/obj/item/storage/belt/medical/paramedic/combat name = "tactical medical belt" desc = "A sturdy black webbing belt with attached pouches. This one is designed for medical professionals who expect to enter conflict zones on the daily. It has increased storage and utility." storage_slots = 9 @@ -293,7 +293,7 @@ /obj/item/reagent_containers/blood ) -/obj/item/storage/belt/medical/first_responder/combat/full +/obj/item/storage/belt/medical/paramedic/combat/full starts_with = list( /obj/item/reagent_containers/hypospray/cmo = 1, /obj/item/reagent_containers/glass/bottle/inaprovaline = 1, diff --git a/code/game/objects/random/clothing.dm b/code/game/objects/random/clothing.dm index 6069bba39f4..902879659b5 100644 --- a/code/game/objects/random/clothing.dm +++ b/code/game/objects/random/clothing.dm @@ -3,8 +3,8 @@ problist = list( /obj/item/storage/belt/utility = 1, /obj/item/storage/belt/medical = 0.4, - /obj/item/storage/belt/medical/first_responder = 0.4, - /obj/item/storage/belt/medical/first_responder/combat = 0.1, + /obj/item/storage/belt/medical/paramedic = 0.4, + /obj/item/storage/belt/medical/paramedic/combat = 0.1, /obj/item/storage/belt/security/tactical = 0.1, /obj/item/storage/belt/military = 0.1, /obj/item/storage/belt/custodial = 0.4 @@ -257,7 +257,7 @@ /obj/item/clothing/head/hardhat/dblue = 1, /obj/item/clothing/head/hardhat/white = 0.5, /obj/item/clothing/head/hardhat/atmos = 0.1, - /obj/item/clothing/head/hardhat/first_responder = 0.1, + /obj/item/clothing/head/hardhat/paramedic = 0.1, /obj/item/clothing/head/hardhat/firefighter = 0.1 ) 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 d90d24e00c7..f5b40011614 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -78,26 +78,26 @@ /obj/structure/closet/secure_closet/medical_fr name = "Paramedic's locker" desc = "An immobile, card-locked storage unit containing all the necessary equipment for a Paramedic." - req_access = list(ACCESS_FIRST_RESPONDER) + req_access = list(ACCESS_PARAMEDIC) icon_state = "med" /obj/structure/closet/secure_closet/medical_fr/fill() ..() new /obj/item/storage/backpack/satchel/med(src) new /obj/item/storage/backpack/duffel/med(src) - new /obj/item/clothing/head/hardhat/first_responder(src) + new /obj/item/clothing/head/hardhat/paramedic(src) new /obj/item/device/radio/headset/headset_med(src) new /obj/item/clothing/glasses/hud/health(src) new /obj/item/storage/backpack/medic(src) new /obj/item/clothing/accessory/storage/white_vest(src) new /obj/item/clothing/suit/storage/medical_chest_rig(src) - new /obj/item/clothing/under/rank/medical/first_responder(src) - new /obj/item/clothing/under/rank/medical/first_responder/zeng(src) - new /obj/item/clothing/under/rank/medical/first_responder/pmc(src) + new /obj/item/clothing/under/rank/medical/paramedic(src) + new /obj/item/clothing/under/rank/medical/paramedic/zeng(src) + new /obj/item/clothing/under/rank/medical/paramedic/pmc(src) new /obj/item/clothing/shoes/jackboots(src) new /obj/item/device/flashlight/pen(src) new /obj/item/clothing/accessory/stethoscope(src) - new /obj/item/storage/belt/medical/first_responder(src) + new /obj/item/storage/belt/medical/paramedic(src) new /obj/item/device/gps/medical(src) new /obj/item/reagent_containers/hypospray(src) new /obj/item/taperoll/medical(src) diff --git a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm index 3400c0f6d9f..cb0eabb6505 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -87,7 +87,7 @@ new /obj/item/clothing/under/rank/security/pmc/epmc(src) new /obj/item/clothing/under/rank/security/pmc/epmc(src) new /obj/item/clothing/under/rank/security/pmc/epmc(src) - new /obj/item/clothing/under/rank/medical/first_responder/pmc/epmc(src) + new /obj/item/clothing/under/rank/medical/paramedic/pmc/epmc(src) new /obj/item/clothing/under/rank/security/pmc/epmc/alt(src) new /obj/item/clothing/head/beret/corporate/pmc/epmc(src) new /obj/item/clothing/head/beret/corporate/pmc/epmc(src) diff --git a/code/game/turfs/flooring/flooring_decals_.dm b/code/game/turfs/flooring/flooring_decals_.dm index 9d6e1658c30..46997d7298e 100644 --- a/code/game/turfs/flooring/flooring_decals_.dm +++ b/code/game/turfs/flooring/flooring_decals_.dm @@ -930,7 +930,7 @@ /obj/effect/floor_decal/sign/gtr icon_state = "white_gtr" -/obj/effect/floor_decal/sign/first_responder +/obj/effect/floor_decal/sign/paramedic icon_state = "white_emt" /obj/effect/floor_decal/sign/w diff --git a/code/modules/client/preference_setup/loadout/items/factions.dm b/code/modules/client/preference_setup/loadout/items/factions.dm index 90bc7bb9080..2eda2c8534f 100644 --- a/code/modules/client/preference_setup/loadout/items/factions.dm +++ b/code/modules/client/preference_setup/loadout/items/factions.dm @@ -426,7 +426,7 @@ /datum/gear/faction/epmc_uniform_fr_med display_name = "PMCG/EPMC Paramedic uniform" - path = /obj/item/clothing/under/rank/medical/first_responder/pmc/epmc + path = /obj/item/clothing/under/rank/medical/paramedic/pmc/epmc slot = slot_w_uniform faction = "Private Military Contracting Group" allowed_roles = list("Paramedic", "Medical Personnel") @@ -434,10 +434,10 @@ /datum/gear/faction/epmc_uniform_fr_med/New() ..() var/list/epmc_uniform_fr_med = list() - epmc_uniform_fr_med["EPMC Paramedic uniform"] = /obj/item/clothing/under/rank/medical/first_responder/pmc/epmc - epmc_uniform_fr_med["PMCG Paramedic uniform, alt"] = /obj/item/clothing/under/rank/medical/first_responder/pmc/alt - epmc_uniform_fr_med["Sekhmet Intergalactic Paramedic uniform"] = /obj/item/clothing/under/rank/medical/first_responder/pmc/sekh - epmc_uniform_fr_med["Ve'katak Phalanx Paramedic uniform"] = /obj/item/clothing/under/rank/medical/first_responder/pmc/vekatak_phalanx + epmc_uniform_fr_med["EPMC Paramedic uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/epmc + epmc_uniform_fr_med["PMCG Paramedic uniform, alt"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/alt + epmc_uniform_fr_med["Sekhmet Intergalactic Paramedic uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/sekh + epmc_uniform_fr_med["Ve'katak Phalanx Paramedic uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/vekatak_phalanx gear_tweaks += new /datum/gear_tweak/path(epmc_uniform_fr_med) /datum/gear/faction/wildlands_flagpatches diff --git a/code/modules/clothing/factions/pmcg.dm b/code/modules/clothing/factions/pmcg.dm index 330ff572476..e729b70c76f 100644 --- a/code/modules/clothing/factions/pmcg.dm +++ b/code/modules/clothing/factions/pmcg.dm @@ -80,7 +80,7 @@ icon_state = "phalanx-sec-jumpsuit" item_state = "phalanx-sec-jumpsuit" -/obj/item/clothing/under/rank/medical/first_responder/pmc/vekatak_phalanx +/obj/item/clothing/under/rank/medical/paramedic/pmc/vekatak_phalanx name = "\improper Ve'katak Phalanx medical uniform" desc = "A uniform used by the forces of the Ve'katak Phalanx, a Vaurca-run private military company. This one has dark blue shoulder stripes and ornamentation, identifying it as belonging to a Phalanx medic in the employ of the Private Military Contracting Group." desc_extended = "These uniforms are designed to fit under the combat hardsuits favored by the Phalanx. They are utilitarian in design, and reportedly somewhat uncomfortable - though few of the non-Vaurcae bold enough to join Ve'katak seem to complain." diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index e1e1a382081..a99578ef100 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -64,7 +64,7 @@ contained_sprite = TRUE min_pressure_protection = FIRESUIT_MIN_PRESSURE -/obj/item/clothing/head/hardhat/first_responder +/obj/item/clothing/head/hardhat/paramedic name = "medical helmet" desc = "A polymer helmet worn by 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" diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index d787f9c2115..addc425811b 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -332,7 +332,7 @@ /obj/item/rig/medical/equipped - req_access = list(ACCESS_FIRST_RESPONDER) + req_access = list(ACCESS_PARAMEDIC) 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 565bd83066c..4102292250b 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -247,7 +247,7 @@ item_state = "nt_emt_jacket" blood_overlay_type = "armor" allowed = list(/obj/item/stack/medical, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/syringe, \ - /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, /obj/item/clothing/head/hardhat/first_responder) + /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, /obj/item/clothing/head/hardhat/paramedic) body_parts_covered = UPPER_TORSO|ARMS /obj/item/clothing/suit/storage/toggle/fr_jacket/zeng @@ -272,7 +272,7 @@ item_state = "paramed_armor" blood_overlay_type = "armor" allowed = list(/obj/item/stack/medical, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/syringe, \ - /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, /obj/item/clothing/head/hardhat/first_responder) + /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, /obj/item/clothing/head/hardhat/paramedic) body_parts_covered = UPPER_TORSO //Mime diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index 33883b171f3..a9a73ce88f9 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -187,29 +187,29 @@ // Paramedic -/obj/item/clothing/under/rank/medical/first_responder +/obj/item/clothing/under/rank/medical/paramedic name = "Paramedic jumpsuit" desc = "It's made of a special fiber that provides minor protection against biohazards. It's a special jumpsuit made for Paramedics." icon_state = "nt_emt" item_state = "nt_emt" -/obj/item/clothing/under/rank/medical/first_responder/zeng +/obj/item/clothing/under/rank/medical/paramedic/zeng icon_state = "zeng_emt" item_state = "zeng_emt" -/obj/item/clothing/under/rank/medical/first_responder/pmc +/obj/item/clothing/under/rank/medical/paramedic/pmc icon_state = "pmc_emt" item_state = "pmc_emt" -/obj/item/clothing/under/rank/medical/first_responder/pmc/alt +/obj/item/clothing/under/rank/medical/paramedic/pmc/alt icon_state = "pmc_emt" item_state = "pmc_emt" -/obj/item/clothing/under/rank/medical/first_responder/pmc/epmc +/obj/item/clothing/under/rank/medical/paramedic/pmc/epmc icon_state = "epmc_emt" item_state = "epmc_emt" -/obj/item/clothing/under/rank/medical/first_responder/pmc/sekh +/obj/item/clothing/under/rank/medical/paramedic/pmc/sekh icon_state = "sekh_emt" item_state = "sekh_emt" diff --git a/code/modules/item_worth/worths_list.dm b/code/modules/item_worth/worths_list.dm index de9fefb179c..d064f15defe 100644 --- a/code/modules/item_worth/worths_list.dm +++ b/code/modules/item_worth/worths_list.dm @@ -154,7 +154,7 @@ var/list/worths = list( /obj/item/storage/belt/security/tactical = 500, /obj/item/storage/belt/soulstone = 800, /obj/item/storage/belt = -50, - /obj/item/storage/belt/medical/first_responder/combat = 650, + /obj/item/storage/belt/medical/paramedic/combat = 650, /obj/item/storage/backpack/holding = -3000, /obj/item/storage = -30, //WEAPONS, diff --git a/code/modules/modular_computers/file_system/programs/civilian/crusher_control.dm b/code/modules/modular_computers/file_system/programs/civilian/crusher_control.dm index 9875a218689..f839df6cc22 100644 --- a/code/modules/modular_computers/file_system/programs/civilian/crusher_control.dm +++ b/code/modules/modular_computers/file_system/programs/civilian/crusher_control.dm @@ -7,7 +7,7 @@ size = 8 requires_ntnet = FALSE available_on_ntnet = FALSE - required_access_run = list(ACCESS_JANITOR, ACCESS_FIRST_RESPONDER) + required_access_run = list(ACCESS_JANITOR, ACCESS_PARAMEDIC) required_access_download = ACCESS_HOP requires_access_to_run = PROGRAM_ACCESS_LIST_ONE usage_flags = PROGRAM_TELESCREEN diff --git a/maps/_common/areas/station/medical.dm b/maps/_common/areas/station/medical.dm index 70d67a160fe..21ee4e92344 100644 --- a/maps/_common/areas/station/medical.dm +++ b/maps/_common/areas/station/medical.dm @@ -33,7 +33,7 @@ icon_state = "medbay4" ambience = list('sound/ambience/signal.ogg') -/area/medical/first_responder +/area/medical/paramedic name = "Medical - First Responder Equipment Storage" icon_state = "medbay" diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index 3475e8fb1df..e703cb444ea 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -35126,7 +35126,7 @@ /obj/item/clothing/mask/surgical, /obj/item/clothing/mask/surgical, /obj/item/storage/belt/medical, -/obj/item/storage/belt/medical/first_responder/combat, +/obj/item/storage/belt/medical/paramedic/combat, /obj/item/storage/belt/medical, /obj/structure/sink{ dir = 4; @@ -38660,12 +38660,12 @@ /area/centcom/specops) "wWK" = ( /obj/structure/table/rack, -/obj/item/storage/belt/medical/first_responder/combat/full{ +/obj/item/storage/belt/medical/paramedic/combat/full{ pixel_x = 5; pixel_y = -5 }, -/obj/item/storage/belt/medical/first_responder/combat/full, -/obj/item/storage/belt/medical/first_responder/combat/full{ +/obj/item/storage/belt/medical/paramedic/combat/full, +/obj/item/storage/belt/medical/paramedic/combat/full{ pixel_x = -4; pixel_y = 5 }, diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index 2880713775b..a4047bb9297 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -20821,22 +20821,22 @@ /obj/item/storage/belt/medical{ pixel_y = -4 }, -/obj/item/storage/belt/medical/first_responder{ +/obj/item/storage/belt/medical/paramedic{ pixel_y = 4 }, -/obj/item/storage/belt/medical/first_responder{ +/obj/item/storage/belt/medical/paramedic{ pixel_y = 4 }, -/obj/item/storage/belt/medical/first_responder{ +/obj/item/storage/belt/medical/paramedic{ pixel_y = 4 }, -/obj/item/storage/belt/medical/first_responder{ +/obj/item/storage/belt/medical/paramedic{ pixel_y = 4 }, -/obj/item/storage/belt/medical/first_responder{ +/obj/item/storage/belt/medical/paramedic{ pixel_y = 4 }, -/obj/item/storage/belt/medical/first_responder{ +/obj/item/storage/belt/medical/paramedic{ pixel_y = 4 }, /obj/item/clothing/accessory/stethoscope, diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 1dfdbe3ae7c..e057723e60d 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -40678,7 +40678,7 @@ /area/hallway/primary/central_one) "bwd" = ( /turf/simulated/wall, -/area/medical/first_responder) +/area/medical/paramedic) "bwe" = ( /obj/machinery/computer/guestpass{ pixel_x = -28 @@ -40694,7 +40694,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "bwg" = ( /obj/structure/cable/green{ d1 = 4; @@ -41452,7 +41452,7 @@ /obj/effect/floor_decal/corner/white/diagonal, /obj/machinery/firealarm/north, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "bxv" = ( /obj/structure/sign/nosmoking_1{ pixel_y = 32 @@ -41468,7 +41468,7 @@ /obj/item/storage/firstaid/o2, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "bxw" = ( /obj/structure/table/standard, /obj/item/storage/firstaid/adv{ @@ -41479,7 +41479,7 @@ /obj/effect/floor_decal/corner/white/diagonal, /obj/machinery/alarm/north, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "bxx" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/closet/walllocker/medical/secure{ @@ -41496,7 +41496,7 @@ /obj/item/reagent_containers/hypospray/autoinjector/coagzolug, /obj/item/reagent_containers/hypospray/autoinjector/coagzolug, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "bxy" = ( /obj/machinery/power/apc/north{ is_critical = 1 @@ -41507,7 +41507,7 @@ icon_state = "0-2" }, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "bxz" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/closet/walllocker/medical/secure{ @@ -41522,7 +41522,7 @@ /obj/item/reagent_containers/syringe/antibiotic, /obj/item/reagent_containers/syringe/antibiotic, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "bxA" = ( /obj/machinery/light{ dir = 1 @@ -41530,7 +41530,7 @@ /obj/effect/floor_decal/corner/white/diagonal, /obj/machinery/suit_cycler/medical, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "bxB" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/window/reinforced{ @@ -41551,7 +41551,7 @@ req_access = list(67) }, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "bxC" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/disposalpipe/segment{ @@ -41566,7 +41566,7 @@ icon_state = "1-4" }, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "bxD" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -42113,21 +42113,21 @@ }, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "byT" = ( /obj/structure/disposalpipe/junction{ dir = 8 }, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "byU" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "byV" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/disposalpipe/segment{ @@ -42137,11 +42137,11 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "byW" = ( /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "byX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -42165,7 +42165,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "byZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -42184,7 +42184,7 @@ /obj/effect/floor_decal/corner/grey{ dir = 9 }, -/obj/effect/floor_decal/sign/first_responder, +/obj/effect/floor_decal/sign/paramedic, /turf/simulated/floor/tiled/white, /area/medical/medbay) "bza" = ( @@ -42694,13 +42694,13 @@ }, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "bzY" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/window/reinforced, /obj/random/pottedplant, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "bzZ" = ( /obj/structure/grille, /obj/structure/window/reinforced{ @@ -42723,7 +42723,7 @@ opacity = 0 }, /turf/simulated/floor/plating, -/area/medical/first_responder) +/area/medical/paramedic) "bAb" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/disposalpipe/segment{ @@ -42741,12 +42741,12 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "bAc" = ( /obj/structure/bed/stool/chair/office/light, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "bAd" = ( /obj/structure/extinguisher_cabinet/west, /obj/structure/bed/stool/chair/plastic{ @@ -43042,7 +43042,7 @@ }, /obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "bAO" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -43095,10 +43095,10 @@ name = "First Responder Garage Door" }, /turf/simulated/floor/plating, -/area/medical/first_responder) +/area/medical/paramedic) "bAV" = ( /turf/simulated/floor/plating, -/area/medical/first_responder) +/area/medical/paramedic) "bAW" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -43112,7 +43112,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/medical/first_responder) +/area/medical/paramedic) "bAZ" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/structure/sign/securearea{ @@ -43127,7 +43127,7 @@ /obj/effect/floor_decal/corner/white/diagonal, /obj/machinery/light, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "bBc" = ( /obj/random/pottedplant, /obj/machinery/alarm/west, @@ -43351,7 +43351,7 @@ }, /obj/item/device/hand_labeler, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "bBH" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -43431,7 +43431,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/medical/first_responder) +/area/medical/paramedic) "bBP" = ( /turf/simulated/wall, /area/crew_quarters/sleep/main) @@ -43771,7 +43771,7 @@ pixel_y = 4 }, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "bCC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -58440,7 +58440,7 @@ pixel_y = 3 }, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "eqc" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -60005,7 +60005,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "gZP" = ( /obj/effect/floor_decal/corner_wide/orange{ dir = 9 @@ -62973,7 +62973,7 @@ /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/bed/stool/chair/office/light, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "nbB" = ( /obj/structure/cable/green{ d1 = 1; @@ -66419,7 +66419,7 @@ /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/closet/secure_closet/medical_fr, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "tjb" = ( /obj/item/chess_piece/queen/black, /turf/simulated/floor/marble/dark, diff --git a/maps/away/away_site/cult_base/cult_base_ghostroles.dm b/maps/away/away_site/cult_base/cult_base_ghostroles.dm index 1ccc0bb670f..62f78803803 100644 --- a/maps/away/away_site/cult_base/cult_base_ghostroles.dm +++ b/maps/away/away_site/cult_base/cult_base_ghostroles.dm @@ -149,7 +149,7 @@ belt = list( /obj/item/storage/belt/fannypack, /obj/item/storage/belt/utility/full, - /obj/item/storage/belt/medical/first_responder/full, + /obj/item/storage/belt/medical/paramedic/full, /obj/item/storage/belt/mining/full, /obj/item/storage/belt/security/full/alt, /obj/item/storage/belt/security/full/pistol45, diff --git a/maps/away/away_site/konyang/point_verdant/point_verdant_ghostroles.dm b/maps/away/away_site/konyang/point_verdant/point_verdant_ghostroles.dm index 67a45fdde14..e59ef54064a 100644 --- a/maps/away/away_site/konyang/point_verdant/point_verdant_ghostroles.dm +++ b/maps/away/away_site/konyang/point_verdant/point_verdant_ghostroles.dm @@ -362,7 +362,7 @@ back = /obj/item/storage/backpack/satchel/med gloves = /obj/item/clothing/gloves/latex/nitrile glasses = /obj/item/clothing/glasses/hud/health - belt = /obj/item/storage/belt/medical/first_responder/combat/full + belt = /obj/item/storage/belt/medical/paramedic/combat/full backpack_contents = list( /obj/item/storage/box/survival = 1, /obj/item/storage/firstaid/adv = 1, @@ -457,10 +457,10 @@ outfit = /obj/outfit/admin/corporate_solutions/medic /obj/outfit/admin/corporate_solutions/medic - uniform = /obj/item/clothing/under/rank/medical/first_responder/zeng + uniform = /obj/item/clothing/under/rank/medical/paramedic/zeng gloves = /obj/item/clothing/gloves/latex/nitrile glasses = /obj/item/clothing/glasses/hud/health - belt = /obj/item/storage/belt/medical/first_responder/combat + belt = /obj/item/storage/belt/medical/paramedic/combat backpack = /obj/item/storage/backpack/satchel/zeng belt_contents = list( /obj/item/reagent_containers/hypospray/cmo = 1, diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm index 8619bc9cc34..b282147d917 100644 --- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm +++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm @@ -3252,8 +3252,8 @@ /area/tcaf_corvette/medical) "AN" = ( /obj/structure/table/steel, -/obj/item/storage/belt/medical/first_responder/combat, -/obj/item/storage/belt/medical/first_responder/combat, +/obj/item/storage/belt/medical/paramedic/combat, +/obj/item/storage/belt/medical/paramedic/combat, /obj/item/reagent_containers/hypospray/autoinjector/survival, /obj/item/reagent_containers/hypospray/autoinjector/survival, /obj/item/reagent_containers/hypospray/autoinjector/survival, diff --git a/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm b/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm index 0d3d20c3160..c77ee92bf10 100644 --- a/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm +++ b/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm @@ -1168,7 +1168,7 @@ "hsG" = ( /obj/structure/table/steel, /obj/item/clothing/glasses/hud/health, -/obj/item/storage/belt/medical/first_responder/combat, +/obj/item/storage/belt/medical/paramedic/combat, /turf/simulated/floor/shuttle/white, /area/ship/tcfl_peacekeeper_ship) "hud" = ( diff --git a/maps/away/ships/coc/coc_ranger/coc_ship.dmm b/maps/away/ships/coc/coc_ranger/coc_ship.dmm index ab22eaa603b..362c304670e 100644 --- a/maps/away/ships/coc/coc_ranger/coc_ship.dmm +++ b/maps/away/ships/coc/coc_ranger/coc_ship.dmm @@ -4873,7 +4873,7 @@ /obj/item/storage/belt/utility/full, /obj/item/storage/belt/utility/very_full, /obj/item/storage/belt/medical, -/obj/item/storage/belt/medical/first_responder/combat/full, +/obj/item/storage/belt/medical/paramedic/combat/full, /obj/item/clothing/accessory/flagpatch/coalition, /obj/item/clothing/accessory/flagpatch/coalition, /obj/item/clothing/accessory/flagpatch/coalition, diff --git a/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm b/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm index f40c0a419ba..4f8cbd8fc9b 100644 --- a/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm +++ b/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm @@ -3280,7 +3280,7 @@ pixel_x = -32 }, /obj/item/storage/belt/medical, -/obj/item/storage/belt/medical/first_responder, +/obj/item/storage/belt/medical/paramedic, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/hypospray, /obj/item/auto_cpr, diff --git a/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm b/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm index d60e52f84f3..f68d7b9294b 100644 --- a/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm +++ b/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer.dmm @@ -6931,7 +6931,7 @@ /obj/item/bodybag/cryobag, /obj/item/reagent_containers/hypospray, /obj/item/storage/pill_bottle/dylovene, -/obj/item/storage/belt/medical/first_responder, +/obj/item/storage/belt/medical/paramedic, /obj/item/auto_cpr{ pixel_x = 6; pixel_y = -1 diff --git a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm index 3a3ee0d055b..ee743ea6191 100644 --- a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm +++ b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm @@ -7088,7 +7088,7 @@ /obj/item/clothing/accessory/badge/passcard/elyra, /obj/item/clothing/accessory/storage/white_vest, /obj/item/clothing/accessory/storage/pouches/white, -/obj/item/storage/belt/medical/first_responder/combat/full, +/obj/item/storage/belt/medical/paramedic/combat/full, /obj/item/clothing/accessory/armband/medgreen, /obj/item/clothing/head/beret/elyra, /turf/simulated/floor/carpet/rubber, diff --git a/maps/away/ships/freebooter/freebooter_ship.dmm b/maps/away/ships/freebooter/freebooter_ship.dmm index 475759962f1..3ec4bcd8e51 100644 --- a/maps/away/ships/freebooter/freebooter_ship.dmm +++ b/maps/away/ships/freebooter/freebooter_ship.dmm @@ -720,7 +720,7 @@ /obj/random/civgun, /obj/item/melee/energy/sword/knife, /obj/item/clothing/suit/armor/material/makeshift, -/obj/item/clothing/head/hardhat/first_responder, +/obj/item/clothing/head/hardhat/paramedic, /turf/simulated/floor/tiled/dark, /area/ship/freebooter_ship/pod4) "bdI" = ( diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm index d5b2dbd7db8..6935b1e8f52 100644 --- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm +++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm @@ -5802,7 +5802,7 @@ /obj/item/device/healthanalyzer, /obj/item/device/breath_analyzer, /obj/item/clothing/mask/surgical, -/obj/item/storage/belt/medical/first_responder/combat/full, +/obj/item/storage/belt/medical/paramedic/combat/full, /obj/item/clothing/gloves/latex/nitrile/unathi, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/accessory/storage/pouches/white, diff --git a/maps/away/ships/heph/heph_security/heph_security.dmm b/maps/away/ships/heph/heph_security/heph_security.dmm index 1d6c899ebc3..3176456b6ec 100644 --- a/maps/away/ships/heph/heph_security/heph_security.dmm +++ b/maps/away/ships/heph/heph_security/heph_security.dmm @@ -6519,7 +6519,7 @@ /turf/simulated/floor/tiled/dark/full, /area/heph_security_ship/grauwolf) "ZM" = ( -/obj/item/storage/belt/medical/first_responder, +/obj/item/storage/belt/medical/paramedic, /obj/item/reagent_containers/hypospray, /obj/structure/closet/secure_closet/medical3{ req_access = null diff --git a/maps/away/ships/iac/iac_rescue_ship.dmm b/maps/away/ships/iac/iac_rescue_ship.dmm index bec67cea60b..e847cfda80e 100644 --- a/maps/away/ships/iac/iac_rescue_ship.dmm +++ b/maps/away/ships/iac/iac_rescue_ship.dmm @@ -4197,10 +4197,10 @@ /obj/item/storage/belt/medical{ pixel_y = -4 }, -/obj/item/storage/belt/medical/first_responder{ +/obj/item/storage/belt/medical/paramedic{ pixel_y = 4 }, -/obj/item/storage/belt/medical/first_responder{ +/obj/item/storage/belt/medical/paramedic{ pixel_y = 4 }, /obj/machinery/alarm/north{ @@ -6332,7 +6332,7 @@ /obj/item/clothing/head/softcap/iac, /obj/item/clothing/accessory/storage/white_vest, /obj/item/clothing/accessory/storage/pouches/white, -/obj/item/storage/belt/medical/first_responder, +/obj/item/storage/belt/medical/paramedic, /obj/item/storage/belt/medical, /obj/item/clothing/accessory/stethoscope, /obj/item/clothing/accessory/poncho/roles/iac, @@ -8164,7 +8164,7 @@ /obj/item/clothing/accessory/storage/pouches/white, /obj/item/reagent_containers/hypospray, /obj/item/storage/belt/medical, -/obj/item/storage/belt/medical/first_responder, +/obj/item/storage/belt/medical/paramedic, /obj/item/clothing/accessory/stethoscope, /turf/simulated/floor/tiled/white, /area/ship/iac_rescue_ship/pharmacy) diff --git a/maps/away/ships/kataphracts/kataphract_ship.dmm b/maps/away/ships/kataphracts/kataphract_ship.dmm index 44dc03be73e..9c380250b88 100644 --- a/maps/away/ships/kataphracts/kataphract_ship.dmm +++ b/maps/away/ships/kataphracts/kataphract_ship.dmm @@ -2701,7 +2701,7 @@ /obj/structure/table/standard, /obj/item/reagent_containers/glass/bottle/inaprovaline, /obj/item/reagent_containers/hypospray, -/obj/item/storage/belt/medical/first_responder, +/obj/item/storage/belt/medical/paramedic, /obj/item/storage/belt/medical, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/glass/bottle/inaprovaline, diff --git a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm index 7589b94535a..5745bbdcf97 100644 --- a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm +++ b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm @@ -714,7 +714,7 @@ /obj/item/clothing/accessory/badge/passcard/konyang, /obj/item/clothing/accessory/storage/white_vest, /obj/item/clothing/accessory/storage/pouches/white, -/obj/item/storage/belt/medical/first_responder/combat/full, +/obj/item/storage/belt/medical/paramedic/combat/full, /obj/item/clothing/accessory/armband/medgreen, /obj/effect/floor_decal/corner_wide/dark_blue{ dir = 6 diff --git a/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dmm b/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dmm index b53f3561962..22c9b096856 100644 --- a/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dmm +++ b/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dmm @@ -149,7 +149,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/fsf_patrol_ship/brig) "agg" = ( -/obj/item/storage/belt/medical/first_responder, +/obj/item/storage/belt/medical/paramedic, /obj/item/roller, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light{ diff --git a/maps/away/ships/sol/sol_ssmd/ssmd_ship.dmm b/maps/away/ships/sol/sol_ssmd/ssmd_ship.dmm index 7f9e8a56162..8fce33bdf41 100644 --- a/maps/away/ships/sol/sol_ssmd/ssmd_ship.dmm +++ b/maps/away/ships/sol/sol_ssmd/ssmd_ship.dmm @@ -617,7 +617,7 @@ pixel_x = -3 }, /obj/item/storage/belt/medical, -/obj/item/storage/belt/medical/first_responder, +/obj/item/storage/belt/medical/paramedic, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/hypospray, /turf/simulated/floor/tiled/white, diff --git a/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dmm b/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dmm index 5f5a0ace6fb..d31886d0956 100644 --- a/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dmm +++ b/maps/away/ships/unathi_pirate/hiskyn/unathi_pirate_hiskyn.dmm @@ -1489,7 +1489,7 @@ /obj/item/bodybag/cryobag, /obj/item/reagent_containers/hypospray, /obj/item/storage/pill_bottle/dylovene, -/obj/item/storage/belt/medical/first_responder, +/obj/item/storage/belt/medical/paramedic, /obj/item/auto_cpr{ pixel_x = 6; pixel_y = -1 diff --git a/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm b/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm index ffeaea75d5a..3685ea3d05a 100644 --- a/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm +++ b/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm @@ -1716,7 +1716,7 @@ /area/tarwa_ship/gun) "zg" = ( /obj/machinery/light, -/obj/item/storage/belt/medical/first_responder, +/obj/item/storage/belt/medical/paramedic, /obj/item/reagent_containers/hypospray, /obj/structure/table/rack, /obj/item/storage/firstaid/fire{ diff --git a/maps/away/ships/wildlands_militia/militia_ship.dmm b/maps/away/ships/wildlands_militia/militia_ship.dmm index 8f430642edb..4f017a8e56a 100644 --- a/maps/away/ships/wildlands_militia/militia_ship.dmm +++ b/maps/away/ships/wildlands_militia/militia_ship.dmm @@ -291,7 +291,7 @@ /obj/item/storage/firstaid/adv, /obj/item/storage/firstaid/o2, /obj/item/auto_cpr, -/obj/item/storage/belt/medical/first_responder, +/obj/item/storage/belt/medical/paramedic, /obj/item/roller, /obj/item/clothing/accessory/storage/white_vest, /obj/item/clothing/suit/storage/toggle/leather_jacket/military/old/alt, diff --git a/maps/away/ships/xanu/xanu_frigate.dmm b/maps/away/ships/xanu/xanu_frigate.dmm index 8b3b5e818ce..789bd47ef96 100644 --- a/maps/away/ships/xanu/xanu_frigate.dmm +++ b/maps/away/ships/xanu/xanu_frigate.dmm @@ -11344,7 +11344,7 @@ /obj/item/clothing/accessory/storage/brown_vest, /obj/item/clothing/accessory/storage/brown_vest, /obj/item/clothing/accessory/storage/white_vest, -/obj/item/storage/belt/medical/first_responder, +/obj/item/storage/belt/medical/paramedic, /turf/simulated/floor/tiled/dark/full, /area/ship/xanu_frigate/cic) "MY" = ( diff --git a/maps/helpers/pre_fabricated/massfab_medical.dmm b/maps/helpers/pre_fabricated/massfab_medical.dmm index 6f24874b70d..3658fd84108 100644 --- a/maps/helpers/pre_fabricated/massfab_medical.dmm +++ b/maps/helpers/pre_fabricated/massfab_medical.dmm @@ -3179,12 +3179,12 @@ /obj/item/device/gps/medical{ pixel_x = 5 }, -/obj/item/storage/belt/medical/first_responder, -/obj/item/storage/belt/medical/first_responder, -/obj/item/storage/belt/medical/first_responder, -/obj/item/storage/belt/medical/first_responder, -/obj/item/storage/belt/medical/first_responder, -/obj/item/storage/belt/medical/first_responder, +/obj/item/storage/belt/medical/paramedic, +/obj/item/storage/belt/medical/paramedic, +/obj/item/storage/belt/medical/paramedic, +/obj/item/storage/belt/medical/paramedic, +/obj/item/storage/belt/medical/paramedic, +/obj/item/storage/belt/medical/paramedic, /obj/effect/floor_decal/spline/plain/green, /turf/simulated/floor/tiled/white, /area/space) diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 02df9c270fe..0df1e6a4a2d 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -903,7 +903,7 @@ /obj/structure/closet/secure_closet/medical_fr, /obj/item/defibrillator/compact/loaded, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "auo" = ( /obj/structure/table/wood, /obj/item/toy/desk/newtoncradle, @@ -933,7 +933,7 @@ pixel_x = -32 }, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "avb" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance_hatch{ @@ -983,7 +983,7 @@ pixel_y = -11 }, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "avs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1132,7 +1132,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "axW" = ( /obj/effect/floor_decal/industrial/warning/full, /obj/machinery/porta_turret, @@ -1617,7 +1617,7 @@ /obj/effect/floor_decal/corner/white/diagonal, /obj/item/storage/pill_bottle/dexalin, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "aIH" = ( /obj/machinery/camera/network/prison{ c_tag = "Security - Brig Communal Fore"; @@ -1759,7 +1759,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "aML" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -1837,7 +1837,7 @@ dir = 6 }, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "aOz" = ( /obj/machinery/light{ dir = 8 @@ -1915,7 +1915,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "aQR" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -2069,7 +2069,7 @@ dir = 9 }, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "aTp" = ( /obj/machinery/light/floor{ dir = 1 @@ -2100,7 +2100,7 @@ pixel_x = 13 }, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "aTI" = ( /obj/structure/table/rack, /obj/item/storage/lockbox/anti_augment{ @@ -2430,7 +2430,7 @@ /obj/structure/table/standard, /obj/structure/roller_rack/two, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "ban" = ( /obj/effect/floor_decal/spline/plain/corner{ dir = 1 @@ -2548,8 +2548,8 @@ "bdy" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/table/standard, -/obj/item/storage/belt/medical/first_responder, -/obj/item/storage/belt/medical/first_responder, +/obj/item/storage/belt/medical/paramedic, +/obj/item/storage/belt/medical/paramedic, /obj/machinery/alarm/south, /obj/item/device/radio{ pixel_x = -6; @@ -2580,7 +2580,7 @@ department = "First Responder Bay" }, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "beJ" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/floor_decal/industrial/warning{ @@ -8262,7 +8262,7 @@ /obj/effect/floor_decal/corner_wide/green/full{ dir = 1 }, -/obj/effect/floor_decal/sign/first_responder, +/obj/effect/floor_decal/sign/paramedic, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -11037,7 +11037,7 @@ /obj/item/reagent_containers/hypospray/autoinjector/coagzolug, /obj/item/reagent_containers/hypospray/autoinjector/coagzolug, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "fdF" = ( /turf/simulated/wall, /area/maintenance/aux_atmospherics/deck_2/starboard) @@ -30790,7 +30790,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "ohQ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -30953,7 +30953,7 @@ }, /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, -/area/medical/first_responder) +/area/medical/paramedic) "okP" = ( /obj/effect/floor_decal/corner/mauve{ dir = 10 @@ -32347,7 +32347,7 @@ /area/horizon/hydroponics) "oUt" = ( /turf/simulated/wall, -/area/medical/first_responder) +/area/medical/paramedic) "oUu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -32451,7 +32451,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "oXi" = ( /obj/structure/table/standard, /obj/item/gun/energy/mousegun/xenofauna, @@ -36867,7 +36867,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "raA" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -38071,7 +38071,7 @@ "rEY" = ( /obj/machinery/suit_cycler/medical, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "rFn" = ( /turf/simulated/wall/r_wall, /area/rnd/xenobiology/xenoflora) @@ -38924,7 +38924,7 @@ /obj/effect/floor_decal/industrial/warning/full, /obj/machinery/mech_recharger, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "rXD" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/corner/brown{ @@ -44802,7 +44802,7 @@ opacity = 0 }, /turf/simulated/floor/tiled/full, -/area/medical/first_responder) +/area/medical/paramedic) "uMT" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -45188,7 +45188,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "uVi" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/lattice/catwalk/indoor/grate, @@ -50914,7 +50914,7 @@ /obj/structure/closet/secure_closet/medical_fr, /obj/item/defibrillator/compact/loaded, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "xBU" = ( /obj/effect/floor_decal/industrial/outline/engineering, /obj/structure/closet/secure_closet/atmos_personal, @@ -51831,7 +51831,7 @@ }, /obj/machinery/door/window/southleft, /turf/simulated/floor/tiled, -/area/medical/first_responder) +/area/medical/paramedic) "xWb" = ( /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /obj/machinery/door/blast/shutters/open{ diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 75851cc97f9..d895504e0fc 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -19784,10 +19784,10 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "nrw" = ( -/obj/item/storage/belt/medical/first_responder{ +/obj/item/storage/belt/medical/paramedic{ pixel_y = 4 }, -/obj/item/storage/belt/medical/first_responder{ +/obj/item/storage/belt/medical/paramedic{ pixel_y = 4 }, /obj/item/storage/belt/medical{ diff --git a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm index e00650ce8ea..5cc32c93b5a 100644 --- a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm +++ b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm @@ -21575,12 +21575,12 @@ /area/centcom/legion/hangar5) "beT" = ( /obj/structure/table/rack, -/obj/item/storage/belt/medical/first_responder/combat/full{ +/obj/item/storage/belt/medical/paramedic/combat/full{ pixel_x = 5; pixel_y = -5 }, -/obj/item/storage/belt/medical/first_responder/combat/full, -/obj/item/storage/belt/medical/first_responder/combat/full{ +/obj/item/storage/belt/medical/paramedic/combat/full, +/obj/item/storage/belt/medical/paramedic/combat/full{ pixel_x = -4; pixel_y = 5 }, @@ -27800,7 +27800,7 @@ /obj/item/clothing/mask/surgical, /obj/item/clothing/mask/surgical, /obj/item/storage/belt/medical, -/obj/item/storage/belt/medical/first_responder/combat, +/obj/item/storage/belt/medical/paramedic /obj/item/storage/belt/medical, /obj/structure/sink{ dir = 4; From 291a777de530f0da7ffa61596b6621c82f668a39 Mon Sep 17 00:00:00 2001 From: LynxSolstice <112824777+LynxSolstice@users.noreply.github.com> Date: Wed, 8 May 2024 11:32:30 -0600 Subject: [PATCH 03/11] makes centcomm happy --- maps/sccv_horizon/sccv_horizon-4_centcomm.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm index 5cc32c93b5a..5a23583b169 100644 --- a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm +++ b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm @@ -27800,7 +27800,7 @@ /obj/item/clothing/mask/surgical, /obj/item/clothing/mask/surgical, /obj/item/storage/belt/medical, -/obj/item/storage/belt/medical/paramedic +/obj/item/storage/belt/medical/paramedic/combat/full /obj/item/storage/belt/medical, /obj/structure/sink{ dir = 4; From 9caa1fe7750fda964703f7bb9dbcdb329c3f8e5f Mon Sep 17 00:00:00 2001 From: LynxSolstice <112824777+LynxSolstice@users.noreply.github.com> Date: Wed, 8 May 2024 11:37:48 -0600 Subject: [PATCH 04/11] stupid map that no one uses being stupid, die die die --- maps/sccv_horizon/sccv_horizon-4_centcomm.dmm | 1 - 1 file changed, 1 deletion(-) diff --git a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm index 5a23583b169..333cf783349 100644 --- a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm +++ b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm @@ -27800,7 +27800,6 @@ /obj/item/clothing/mask/surgical, /obj/item/clothing/mask/surgical, /obj/item/storage/belt/medical, -/obj/item/storage/belt/medical/paramedic/combat/full /obj/item/storage/belt/medical, /obj/structure/sink{ dir = 4; From 4c9025f1d0b4186dd3ab3627973e18c11eef413c Mon Sep 17 00:00:00 2001 From: LynxSolstice <112824777+LynxSolstice@users.noreply.github.com> Date: Fri, 10 May 2024 21:51:33 -0600 Subject: [PATCH 05/11] maybe fix --- .../structures/crates_lockers/closets/secure/medical.dm | 4 ++-- maps/_common/areas/station/medical.dm | 2 +- maps/aurora/aurora-4_mainlevel.dmm | 2 +- maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) 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 f5b40011614..4b4884800db 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -75,13 +75,13 @@ new /obj/item/clothing/glasses/hud/health/aviator(src) new /obj/item/clothing/glasses/eyepatch/hud/medical(src) -/obj/structure/closet/secure_closet/medical_fr +/obj/structure/closet/secure_closet/medical_para name = "Paramedic's locker" desc = "An immobile, card-locked storage unit containing all the necessary equipment for a Paramedic." req_access = list(ACCESS_PARAMEDIC) icon_state = "med" -/obj/structure/closet/secure_closet/medical_fr/fill() +/obj/structure/closet/secure_closet/medical_para/fill() ..() new /obj/item/storage/backpack/satchel/med(src) new /obj/item/storage/backpack/duffel/med(src) diff --git a/maps/_common/areas/station/medical.dm b/maps/_common/areas/station/medical.dm index 21ee4e92344..8b850f7d6d7 100644 --- a/maps/_common/areas/station/medical.dm +++ b/maps/_common/areas/station/medical.dm @@ -34,7 +34,7 @@ ambience = list('sound/ambience/signal.ogg') /area/medical/paramedic - name = "Medical - First Responder Equipment Storage" + name = "Medical - Paramedic Equipment Storage" icon_state = "medbay" /area/medical/temp_morgue diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index e057723e60d..87dc2225def 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -66417,7 +66417,7 @@ /area/crew_quarters/kitchen/freezer) "tiv" = ( /obj/effect/floor_decal/corner/white/diagonal, -/obj/structure/closet/secure_closet/medical_fr, +/obj/structure/closet/secure_closet/medical_para, /turf/simulated/floor/tiled, /area/medical/paramedic) "tjb" = ( diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 0df1e6a4a2d..0cf1212ad10 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -900,7 +900,7 @@ /obj/machinery/camera/network/medbay{ c_tag = "Medical - First Responder Room" }, -/obj/structure/closet/secure_closet/medical_fr, +/obj/structure/closet/secure_closet/medical_para, /obj/item/defibrillator/compact/loaded, /turf/simulated/floor/tiled, /area/medical/paramedic) @@ -50911,7 +50911,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/closet/secure_closet/medical_fr, +/obj/structure/closet/secure_closet/medical_para, /obj/item/defibrillator/compact/loaded, /turf/simulated/floor/tiled, /area/medical/paramedic) From 6d408def1bd802f47a89d16499b77d82a3537154 Mon Sep 17 00:00:00 2001 From: LynxSolstice <112824777+LynxSolstice@users.noreply.github.com> Date: Sun, 12 May 2024 13:54:09 -0600 Subject: [PATCH 06/11] changes some mentions of fr_jacket to para_jacket --- code/game/jobs/faction/pmc.dm | 2 +- code/game/jobs/faction/zeng_hu.dm | 2 +- code/game/jobs/job/medical.dm | 2 +- .../crates_lockers/closets/secure/medical.dm | 6 +++--- .../preference_setup/loadout/items/factions.dm | 18 +++++++++--------- .../preference_setup/loadout/items/suit.dm | 4 ++-- code/modules/clothing/suits/jobs.dm | 8 ++++---- code/modules/customitems/item_defines.dm | 4 ++-- maps/away/ships/scc/scc_scout_ship.dmm | 2 +- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/code/game/jobs/faction/pmc.dm b/code/game/jobs/faction/pmc.dm index bf3da937bbe..91d0fa62ff6 100644 --- a/code/game/jobs/faction/pmc.dm +++ b/code/game/jobs/faction/pmc.dm @@ -172,7 +172,7 @@ head = /obj/item/clothing/head/softcap/pmc uniform = /obj/item/clothing/under/rank/medical/paramedic/pmc - suit = /obj/item/clothing/suit/storage/toggle/fr_jacket/pmc + suit = /obj/item/clothing/suit/storage/toggle/para_jacket/pmc id = /obj/item/card/id/pmc backpack_faction = /obj/item/storage/backpack/pmcg diff --git a/code/game/jobs/faction/zeng_hu.dm b/code/game/jobs/faction/zeng_hu.dm index 0743aad286e..551c0f827c8 100644 --- a/code/game/jobs/faction/zeng_hu.dm +++ b/code/game/jobs/faction/zeng_hu.dm @@ -120,7 +120,7 @@ head = /obj/item/clothing/head/softcap/zeng uniform = /obj/item/clothing/under/rank/medical/paramedic/zeng - suit = /obj/item/clothing/suit/storage/toggle/fr_jacket/zeng + suit = /obj/item/clothing/suit/storage/toggle/para_jacket/zeng id = /obj/item/card/id/zeng_hu backpack_faction = /obj/item/storage/backpack/zeng diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 7f1f3db629f..857a5924c86 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -282,7 +282,7 @@ head = /obj/item/clothing/head/softcap/nt uniform = /obj/item/clothing/under/rank/medical/paramedic - suit = /obj/item/clothing/suit/storage/toggle/fr_jacket + suit = /obj/item/clothing/suit/storage/toggle/para_jacket shoes = /obj/item/clothing/shoes/jackboots id = /obj/item/card/id/white 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 4b4884800db..6054a1f214a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -107,9 +107,9 @@ new /obj/item/clothing/mask/gas/alt(src) new /obj/item/clothing/mask/gas/half(src) new /obj/item/auto_cpr(src) - new /obj/item/clothing/suit/storage/toggle/fr_jacket(src) - new /obj/item/clothing/suit/storage/toggle/fr_jacket/zeng(src) - new /obj/item/clothing/suit/storage/toggle/fr_jacket/pmc(src) + new /obj/item/clothing/suit/storage/toggle/para_jacket(src) + new /obj/item/clothing/suit/storage/toggle/para_jacket/zeng(src) + new /obj/item/clothing/suit/storage/toggle/para_jacket/pmc(src) /obj/structure/closet/secure_closet/CMO name = "chief medical officer's locker" diff --git a/code/modules/client/preference_setup/loadout/items/factions.dm b/code/modules/client/preference_setup/loadout/items/factions.dm index 2eda2c8534f..3db5537e8b0 100644 --- a/code/modules/client/preference_setup/loadout/items/factions.dm +++ b/code/modules/client/preference_setup/loadout/items/factions.dm @@ -424,21 +424,21 @@ faction = "Private Military Contracting Group" allowed_roles = list("Medical Intern", "Medical Personnel") -/datum/gear/faction/epmc_uniform_fr_med +/datum/gear/faction/epmc_uniform_para_med display_name = "PMCG/EPMC Paramedic uniform" path = /obj/item/clothing/under/rank/medical/paramedic/pmc/epmc slot = slot_w_uniform faction = "Private Military Contracting Group" allowed_roles = list("Paramedic", "Medical Personnel") -/datum/gear/faction/epmc_uniform_fr_med/New() +/datum/gear/faction/epmc_uniform_para_med/New() ..() - var/list/epmc_uniform_fr_med = list() - epmc_uniform_fr_med["EPMC Paramedic uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/epmc - epmc_uniform_fr_med["PMCG Paramedic uniform, alt"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/alt - epmc_uniform_fr_med["Sekhmet Intergalactic Paramedic uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/sekh - epmc_uniform_fr_med["Ve'katak Phalanx Paramedic uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/vekatak_phalanx - gear_tweaks += new /datum/gear_tweak/path(epmc_uniform_fr_med) + var/list/epmc_uniform_para_med = list() + epmc_uniform_para_med["EPMC Paramedic uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/epmc + epmc_uniform_para_med["PMCG Paramedic uniform, alt"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/alt + epmc_uniform_para_med["Sekhmet Intergalactic Paramedic uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/sekh + epmc_uniform_para_med["Ve'katak Phalanx Paramedic uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/vekatak_phalanx + gear_tweaks += new /datum/gear_tweak/path(epmc_uniform_para_med) /datum/gear/faction/wildlands_flagpatches display_name = "wildlands flagpatch selection" @@ -508,7 +508,7 @@ zenghu_labcoats["zeng-hu letterman labcoat, alt"] = /obj/item/clothing/suit/storage/toggle/labcoat/zeng/letterman/alt zenghu_labcoats["zeng-hu letterman labcoat, classic"] = /obj/item/clothing/suit/storage/toggle/labcoat/zeng/letterman/alt2 zenghu_labcoats["zeng-hu labcoat, long"] = /obj/item/clothing/suit/storage/toggle/longcoat/zeng - zenghu_labcoats["zeng-hu Paramedic jacket"] = /obj/item/clothing/suit/storage/toggle/fr_jacket/zeng + zenghu_labcoats["zeng-hu Paramedic jacket"] = /obj/item/clothing/suit/storage/toggle/para_jacket/zeng zenghu_labcoats["zeng-hu corporate jacket"] = /obj/item/clothing/suit/storage/toggle/corp/zeng zenghu_labcoats["zeng-hu corporate jacket, alt"] = /obj/item/clothing/suit/storage/toggle/corp/zeng/alt zenghu_labcoats["zeng-hu winter coat"] = /obj/item/clothing/suit/storage/hooded/wintercoat/zeng diff --git a/code/modules/client/preference_setup/loadout/items/suit.dm b/code/modules/client/preference_setup/loadout/items/suit.dm index 8a2dc70ce0b..5cc5c521964 100644 --- a/code/modules/client/preference_setup/loadout/items/suit.dm +++ b/code/modules/client/preference_setup/loadout/items/suit.dm @@ -126,14 +126,14 @@ /datum/gear/suit/medical_outerwear display_name = "medical outerwear (jackets, vests, rigs)" - path = /obj/item/clothing/suit/storage/toggle/fr_jacket + path = /obj/item/clothing/suit/storage/toggle/para_jacket allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Intern", "Medical Personnel") /datum/gear/suit/medical_outerwear/New() ..() var/list/medical_outerwear = list() medical_outerwear["medical chest-rig"] = /obj/item/clothing/suit/storage/medical_chest_rig - medical_outerwear["Paramedic jacket"] = /obj/item/clothing/suit/storage/toggle/fr_jacket + medical_outerwear["Paramedic jacket"] = /obj/item/clothing/suit/storage/toggle/para_jacket gear_tweaks += new /datum/gear_tweak/path(medical_outerwear) /datum/gear/suit/iac_outerwear diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 4102292250b..e7f3ff85d17 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -238,7 +238,7 @@ item_state = "longblazer" //Medical -/obj/item/clothing/suit/storage/toggle/fr_jacket +/obj/item/clothing/suit/storage/toggle/para_jacket name = "Paramedic jacket" desc = "A high-visibility jacket worn by medical Paramedics." icon = 'icons/obj/item/clothing/department_uniforms/medical.dmi' @@ -250,17 +250,17 @@ /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, /obj/item/clothing/head/hardhat/paramedic) body_parts_covered = UPPER_TORSO|ARMS -/obj/item/clothing/suit/storage/toggle/fr_jacket/zeng +/obj/item/clothing/suit/storage/toggle/para_jacket/zeng desc = "A Paramedic jacket in the classic white and purple of Zeng-Hu Pharmaceuticals." icon_state = "zeng_emt_jacket" item_state = "zeng_emt_jacket" -/obj/item/clothing/suit/storage/toggle/fr_jacket/pmc +/obj/item/clothing/suit/storage/toggle/para_jacket/pmc desc = "A Paramedic jacket in the classic black and blue of the PMCG." icon_state = "pmc_emt_jacket" item_state = "pmc_emt_jacket" -/obj/item/clothing/suit/storage/toggle/fr_jacket/pmc/alt +/obj/item/clothing/suit/storage/toggle/para_jacket/pmc/alt icon_state = "pmc_alt_emt_jacket" item_state = "pmc_alt_emt_jacket" diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 90c4a056098..fa4031c6ab9 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -659,7 +659,7 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "likho_labcoat" -/obj/item/clothing/suit/storage/toggle/fr_jacket/fluff/ramit_jacket //Winter Paramedic Jacket - Ra'mit Ma'zaira - sampletex +/obj/item/clothing/suit/storage/toggle/para_jacket/fluff/ramit_jacket //Winter Paramedic Jacket - Ra'mit Ma'zaira - sampletex name = "winter paramedic jacket" desc = "A custom made Paramedic coat. Inside is a warm fabric with the name \"Ra'Mit Ma'zaira\" sewn in by the collar." icon = 'icons/obj/custom_items/ramit_jacket.dmi' @@ -996,7 +996,7 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = TRUE species_restricted = list(BODYTYPE_TAJARA) -/obj/item/clothing/suit/storage/toggle/fr_jacket/fluff/akila_jacket //Reflective Paramedic Jacket - Akila Aksha'Shalwariran - shestrying +/obj/item/clothing/suit/storage/toggle/para_jacket/fluff/akila_jacket //Reflective Paramedic Jacket - Akila Aksha'Shalwariran - shestrying name = "reflective Paramedic jacket" desc = "A jacket in an eye-blinding yellow, with flourescent green, light-reflective striping along the cuffs and bottom edge. A bright red cross rests on the front, over the heart." icon = 'icons/obj/custom_items/akila_jacket.dmi' diff --git a/maps/away/ships/scc/scc_scout_ship.dmm b/maps/away/ships/scc/scc_scout_ship.dmm index 4e06ca71685..610a5c41696 100644 --- a/maps/away/ships/scc/scc_scout_ship.dmm +++ b/maps/away/ships/scc/scc_scout_ship.dmm @@ -3967,7 +3967,7 @@ }, /obj/item/clothing/gloves/zeng, /obj/item/clothing/head/beret/corporate/zeng, -/obj/item/clothing/suit/storage/toggle/fr_jacket/zeng, +/obj/item/clothing/suit/storage/toggle/para_jacket/zeng, /obj/item/clothing/suit/storage/toggle/labcoat/zeng, /obj/item/clothing/under/rank/medical/surgeon/zeng, /obj/item/clothing/head/softcap/zeng, From 1487c22ecf3c00223658c8305e5f70678f68b15a Mon Sep 17 00:00:00 2001 From: LynxSolstice <112824777+LynxSolstice@users.noreply.github.com> Date: Sun, 12 May 2024 15:03:08 -0600 Subject: [PATCH 07/11] cl tests --- maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm | 2 +- .../away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm index b8e32eb4bc7..7cdf5b84fa5 100644 --- a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm +++ b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm @@ -3659,7 +3659,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/storage/firstaid/adv, -/obj/item/storage/belt/medical/first_responder, +/obj/item/storage/belt/medical/paramedic, /turf/simulated/floor/tiled{ temperature = 278.15 }, diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm index b3713c3f516..a7014586cc8 100644 --- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm +++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm @@ -8363,7 +8363,7 @@ /obj/item/clothing/glasses/hud/health, /obj/item/reagent_containers/inhaler/pneumalin, /obj/item/reagent_containers/inhaler/pneumalin, -/obj/item/storage/belt/medical/first_responder/combat/full, +/obj/item/storage/belt/medical/paramedic/combat/full, /turf/simulated/floor/tiled/white, /area/hegemony_ship/medbay) "VG" = ( From 9bde664f79d7f1b1755f02546e5ae286cfb7be89 Mon Sep 17 00:00:00 2001 From: LynxSolstice <112824777+LynxSolstice@users.noreply.github.com> Date: Sun, 9 Jun 2024 14:38:45 -0600 Subject: [PATCH 08/11] merge conflict resolution --- .../client/preference_setup/loadout/items/xeno/vaurca.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm b/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm index 2b84821a9fa..c07e091db8a 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm @@ -289,7 +289,7 @@ path = /obj/item/organ/internal/augment/vaurca_mag sort_category = "Xenowear - Vaurca" whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) - allowed_roles = list("Shaft Miner", "Engineer", "Atmospheric Technician", "Engineering Apprentice", "Xenoarchaeologist", "Engineering Personnel", "Operations Personnel", "First Responder", "Medical Personnel") + allowed_roles = list("Shaft Miner", "Engineer", "Atmospheric Technician", "Engineering Apprentice", "Xenoarchaeologist", "Engineering Personnel", "Operations Personnel", "Paramedic", "Medical Personnel") /datum/gear/accessory/tret_passcard display_name = "tret passcard" From ba8943cd808358a49639281f82a1619e1b0d1e8e Mon Sep 17 00:00:00 2001 From: LynxSolstice <112824777+LynxSolstice@users.noreply.github.com> Date: Sun, 9 Jun 2024 15:03:40 -0600 Subject: [PATCH 09/11] CI --- .../away_site/tajara/saniorios_outpost/saniorios_outpost.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/away/away_site/tajara/saniorios_outpost/saniorios_outpost.dmm b/maps/away/away_site/tajara/saniorios_outpost/saniorios_outpost.dmm index 56dcdc81a7f..81d28fa5b44 100644 --- a/maps/away/away_site/tajara/saniorios_outpost/saniorios_outpost.dmm +++ b/maps/away/away_site/tajara/saniorios_outpost/saniorios_outpost.dmm @@ -615,7 +615,7 @@ /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, /obj/effect/floor_decal/corner/green/full, -/obj/item/storage/belt/medical/first_responder, +/obj/item/storage/belt/medical/paramedic, /turf/simulated/floor/tiled/white{ temperature = 278.15 }, From 98dd8a93b59fd1fdc27362c4c4e37353d24e9e3c Mon Sep 17 00:00:00 2001 From: LynxSolstice <112824777+LynxSolstice@users.noreply.github.com> Date: Tue, 11 Jun 2024 20:09:12 -0600 Subject: [PATCH 10/11] Should have gotten all the improper capitalizations --- code/datums/tips/tips.dm | 2 +- code/datums/uplink/medical.dm | 2 +- code/game/objects/items/weapons/storage/belt.dm | 2 +- .../crates_lockers/closets/secure/medical.dm | 4 ++-- .../preference_setup/loadout/items/accessories.dm | 2 +- .../preference_setup/loadout/items/factions.dm | 12 ++++++------ .../client/preference_setup/loadout/items/suit.dm | 2 +- code/modules/clothing/head/hardhat.dm | 2 +- code/modules/clothing/suits/jobs.dm | 10 +++++----- code/modules/clothing/under/accessories/armband.dm | 2 +- code/modules/clothing/under/jobs/medsci.dm | 4 ++-- code/modules/customitems/item_defines.dm | 8 ++++---- maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 14 +++++++------- 13 files changed, 33 insertions(+), 33 deletions(-) diff --git a/code/datums/tips/tips.dm b/code/datums/tips/tips.dm index a42417a7f24..637fe85c62f 100644 --- a/code/datums/tips/tips.dm +++ b/code/datums/tips/tips.dm @@ -123,7 +123,7 @@ GLOBAL_LIST_EMPTY(tips_by_category) /datum/tip/medical category = CATEGORY_MEDICAL messages = list( - "As the Chief Medical Officer, coordinate and communicate with your doctors, chemists, and Paramedics 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 paramedics 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/code/datums/uplink/medical.dm b/code/datums/uplink/medical.dm index a83d6aec50e..c39e4fe3c51 100644 --- a/code/datums/uplink/medical.dm +++ b/code/datums/uplink/medical.dm @@ -40,7 +40,7 @@ name = "Fully Loaded Combat Medical Belt" bluecrystal_cost = 3 path = /obj/item/storage/belt/medical/paramedic/combat/full - desc = "A fully loaded medical belt even Zeng-Hu's top Paramedics would be dying to wear. It contains liquid medicines and a hypospray. Combat hypo sold separately." + desc = "A fully loaded medical belt even Zeng-Hu's top paramedics would be dying to wear. It contains liquid medicines and a hypospray. Combat hypo sold separately." /datum/uplink_item/item/medical/defib name = "Combat Defibrillator" diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index d926a7a5666..5df462eb322 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -231,7 +231,7 @@ ) /obj/item/storage/belt/medical/paramedic - name = "Paramedic utility belt" + name = "paramedic utility belt" desc = "A sturdy black webbing belt with attached pouches." icon_state = "emsbelt" item_state = "emsbelt" 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 11b66025a8b..d7caf6ea61b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -76,8 +76,8 @@ new /obj/item/clothing/glasses/eyepatch/hud/medical(src) /obj/structure/closet/secure_closet/medical_para - name = "Paramedic's locker" - desc = "An immobile, card-locked storage unit containing all the necessary equipment for a Paramedic." + name = "paramedic's locker" + desc = "An immobile, card-locked storage unit containing all the necessary equipment for a paramedic." req_access = list(ACCESS_PARAMEDIC) icon_state = "med" diff --git a/code/modules/client/preference_setup/loadout/items/accessories.dm b/code/modules/client/preference_setup/loadout/items/accessories.dm index fe301cdff97..7f5a1e2fed6 100644 --- a/code/modules/client/preference_setup/loadout/items/accessories.dm +++ b/code/modules/client/preference_setup/loadout/items/accessories.dm @@ -45,7 +45,7 @@ armbands["red armband"] = /obj/item/clothing/accessory/armband armbands["security armband"] = /obj/item/clothing/accessory/armband/sec armbands["operations armband"] = /obj/item/clothing/accessory/armband/operations - armbands["Paramedic armband"] = /obj/item/clothing/accessory/armband/medgreen + armbands["paramedic 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 diff --git a/code/modules/client/preference_setup/loadout/items/factions.dm b/code/modules/client/preference_setup/loadout/items/factions.dm index 81968cfa971..2f38c4afc72 100644 --- a/code/modules/client/preference_setup/loadout/items/factions.dm +++ b/code/modules/client/preference_setup/loadout/items/factions.dm @@ -426,7 +426,7 @@ allowed_roles = list("Medical Intern", "Medical Personnel") /datum/gear/faction/epmc_uniform_para_med - display_name = "PMCG/EPMC Paramedic uniform" + display_name = "PMCG/EPMC paramedic uniform" path = /obj/item/clothing/under/rank/medical/paramedic/pmc/epmc slot = slot_w_uniform faction = "Private Military Contracting Group" @@ -435,10 +435,10 @@ /datum/gear/faction/epmc_uniform_para_med/New() ..() var/list/epmc_uniform_para_med = list() - epmc_uniform_para_med["EPMC Paramedic uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/epmc - epmc_uniform_para_med["PMCG Paramedic uniform, alt"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/alt - epmc_uniform_para_med["Sekhmet Intergalactic Paramedic uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/sekh - epmc_uniform_para_med["Ve'katak Phalanx Paramedic uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/vekatak_phalanx + epmc_uniform_para_med["EPMC paramedic uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/epmc + epmc_uniform_para_med["PMCG paramedic uniform, alt"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/alt + epmc_uniform_para_med["Sekhmet Intergalactic paramedic uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/sekh + epmc_uniform_para_med["Ve'katak Phalanx paramedic uniform"] = /obj/item/clothing/under/rank/medical/paramedic/pmc/vekatak_phalanx gear_tweaks += new /datum/gear_tweak/path(epmc_uniform_para_med) /datum/gear/faction/wildlands_flagpatches @@ -509,7 +509,7 @@ zenghu_labcoats["zeng-hu letterman labcoat, alt"] = /obj/item/clothing/suit/storage/toggle/labcoat/zeng/letterman/alt zenghu_labcoats["zeng-hu letterman labcoat, classic"] = /obj/item/clothing/suit/storage/toggle/labcoat/zeng/letterman/alt2 zenghu_labcoats["zeng-hu labcoat, long"] = /obj/item/clothing/suit/storage/toggle/longcoat/zeng - zenghu_labcoats["zeng-hu Paramedic jacket"] = /obj/item/clothing/suit/storage/toggle/para_jacket/zeng + zenghu_labcoats["zeng-hu paramedic jacket"] = /obj/item/clothing/suit/storage/toggle/para_jacket/zeng zenghu_labcoats["zeng-hu corporate jacket"] = /obj/item/clothing/suit/storage/toggle/corp/zeng zenghu_labcoats["zeng-hu corporate jacket, alt"] = /obj/item/clothing/suit/storage/toggle/corp/zeng/alt zenghu_labcoats["zeng-hu winter coat"] = /obj/item/clothing/suit/storage/hooded/wintercoat/zeng diff --git a/code/modules/client/preference_setup/loadout/items/suit.dm b/code/modules/client/preference_setup/loadout/items/suit.dm index 5cc5c521964..26970a25f7d 100644 --- a/code/modules/client/preference_setup/loadout/items/suit.dm +++ b/code/modules/client/preference_setup/loadout/items/suit.dm @@ -133,7 +133,7 @@ ..() var/list/medical_outerwear = list() medical_outerwear["medical chest-rig"] = /obj/item/clothing/suit/storage/medical_chest_rig - medical_outerwear["Paramedic jacket"] = /obj/item/clothing/suit/storage/toggle/para_jacket + medical_outerwear["paramedic jacket"] = /obj/item/clothing/suit/storage/toggle/para_jacket gear_tweaks += new /datum/gear_tweak/path(medical_outerwear) /datum/gear/suit/iac_outerwear diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index a99578ef100..4e9577fd1d7 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -66,7 +66,7 @@ /obj/item/clothing/head/hardhat/paramedic name = "medical helmet" - desc = "A polymer helmet worn by 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 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" diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index e7f3ff85d17..8013fbcbd5d 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -239,8 +239,8 @@ //Medical /obj/item/clothing/suit/storage/toggle/para_jacket - name = "Paramedic jacket" - desc = "A high-visibility jacket worn by medical Paramedics." + name = "paramedic jacket" + desc = "A high-visibility jacket worn by medical paramedics." icon = 'icons/obj/item/clothing/department_uniforms/medical.dmi' contained_sprite = TRUE icon_state = "nt_emt_jacket" @@ -251,12 +251,12 @@ body_parts_covered = UPPER_TORSO|ARMS /obj/item/clothing/suit/storage/toggle/para_jacket/zeng - desc = "A Paramedic jacket in the classic white and purple of Zeng-Hu Pharmaceuticals." + desc = "A paramedic jacket in the classic white and purple of Zeng-Hu Pharmaceuticals." icon_state = "zeng_emt_jacket" item_state = "zeng_emt_jacket" /obj/item/clothing/suit/storage/toggle/para_jacket/pmc - desc = "A Paramedic jacket in the classic black and blue of the PMCG." + desc = "A paramedic jacket in the classic black and blue of the PMCG." icon_state = "pmc_emt_jacket" item_state = "pmc_emt_jacket" @@ -267,7 +267,7 @@ /obj/item/clothing/suit/storage/medical_chest_rig name = "medic chest-rig" - desc = "A white chest-rig with pouches worn by medical Paramedics, meant to carry their equipment." + desc = "A white chest-rig with pouches worn by paramedics, meant to carry their equipment." icon_state = "paramed_armor" item_state = "paramed_armor" blood_overlay_type = "armor" diff --git a/code/modules/clothing/under/accessories/armband.dm b/code/modules/clothing/under/accessories/armband.dm index 1f1f05c686a..8c0f4819e63 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 = "Paramedic armband" + name = "paramedic 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 a9a73ce88f9..67b172166a8 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -188,8 +188,8 @@ // Paramedic /obj/item/clothing/under/rank/medical/paramedic - name = "Paramedic jumpsuit" - desc = "It's made of a special fiber that provides minor protection against biohazards. It's a special jumpsuit made for Paramedics." + name = "paramedic jumpsuit" + desc = "It's made of a special fiber that provides minor protection against biohazards. It's a special jumpsuit made for paramedics." icon_state = "nt_emt" item_state = "nt_emt" diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index df4aeb6a3e8..09169333456 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -659,9 +659,9 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "likho_labcoat" -/obj/item/clothing/suit/storage/toggle/para_jacket/fluff/ramit_jacket //Winter Paramedic Jacket - Ra'mit Ma'zaira - sampletex +/obj/item/clothing/suit/storage/toggle/para_jacket/fluff/ramit_jacket //Winter paramedic Jacket - Ra'mit Ma'zaira - sampletex name = "winter paramedic jacket" - desc = "A custom made Paramedic coat. Inside is a warm fabric with the name \"Ra'Mit Ma'zaira\" sewn in by the collar." + desc = "A custom made paramedic coat. Inside is a warm fabric with the name \"Ra'Mit Ma'zaira\" sewn in by the collar." icon = 'icons/obj/custom_items/ramit_jacket.dmi' icon_override = 'icons/obj/custom_items/ramit_jacket.dmi' icon_state = "ramit_jacket" @@ -996,8 +996,8 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = TRUE species_restricted = list(BODYTYPE_TAJARA) -/obj/item/clothing/suit/storage/toggle/para_jacket/fluff/akila_jacket //Reflective Paramedic Jacket - Akila Aksha'Shalwariran - shestrying - name = "reflective Paramedic jacket" +/obj/item/clothing/suit/storage/toggle/para_jacket/fluff/akila_jacket //Reflective paramedic Jacket - Akila Aksha'Shalwariran - shestrying + name = "reflective paramedic jacket" desc = "A jacket in an eye-blinding yellow, with flourescent green, light-reflective striping along the cuffs and bottom edge. A bright red cross rests on the front, over the heart." icon = 'icons/obj/custom_items/akila_jacket.dmi' icon_override = 'icons/obj/custom_items/akila_jacket.dmi' diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index e61d611f01d..9792333e6b1 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -2566,7 +2566,7 @@ pixel_x = -7 }, /obj/machinery/requests_console/east{ - department = "First Responder Bay" + department = "Paramedic Bay" }, /turf/simulated/floor/tiled, /area/medical/paramedic) @@ -44831,11 +44831,6 @@ /turf/simulated/floor/reinforced, /area/horizon/bar) "uMM" = ( -/obj/machinery/door/airlock/glass_medical{ - dir = 4; - name = "First Responder Quarters"; - req_access = list(67) - }, /obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ density = 0; @@ -44845,6 +44840,11 @@ name = "MedBay Lockdown Shutters"; opacity = 0 }, +/obj/machinery/door/airlock/glass_medical{ + dir = 4; + name = "Paramedic Quarters"; + req_access = list(67) + }, /turf/simulated/floor/tiled/full, /area/medical/paramedic) "uMT" = ( @@ -45227,7 +45227,7 @@ /obj/effect/floor_decal/corner/white/diagonal, /obj/machinery/door/airlock/glass_medical{ dir = 4; - name = "First Responder Quarters"; + name = "Paramedic Quarters"; req_access = list(67) }, /obj/machinery/door/firedoor, From 6153421834d2985f82625ebc62cf95f184a6e0ee Mon Sep 17 00:00:00 2001 From: LynxSolstice <112824777+LynxSolstice@users.noreply.github.com> Date: Tue, 11 Jun 2024 20:11:10 -0600 Subject: [PATCH 11/11] Fixes the spawn bug caught in the test merge. --- maps/sccv_horizon/sccv_horizon-3_deck_3.dmm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 1b6a083a0a4..6f48c01fd6a 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -16494,9 +16494,7 @@ /obj/effect/floor_decal/corner_wide/green{ dir = 10 }, -/obj/effect/landmark/start{ - name = "First Responder" - }, +/obj/effect/landmark/start, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "llA" = ( @@ -26566,7 +26564,7 @@ dir = 10 }, /obj/effect/landmark/start{ - name = "First Responder" + name = "Paramedic" }, /obj/machinery/firealarm/south, /turf/simulated/floor/tiled/white,