Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return of the Paramedic #19125

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions code/__DEFINES/access.dm
Original file line number Diff line number Diff line change
Expand Up @@ -415,10 +415,10 @@
desc = "Medical Equipment"
region = ACCESS_REGION_MEDBAY

#define ACCESS_FIRST_RESPONDER 67
/datum/access/first_responder
id = ACCESS_FIRST_RESPONDER
desc = "First Responder Equipment"
#define ACCESS_PARAMEDIC 67
/datum/access/paramedic
id = ACCESS_PARAMEDIC
desc = "Paramedic Equipment"
region = ACCESS_REGION_MEDBAY

// free_access_id = 68
Expand Down
12 changes: 6 additions & 6 deletions code/datums/outfits/ert/ap_eridani.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/datums/outfits/ert/biesel.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,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(
Expand Down
4 changes: 2 additions & 2 deletions code/datums/outfits/ert/coalition.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/datums/outfits/ert/dominia.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion code/datums/outfits/ert/einstein.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/datums/outfits/ert/elyra.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/datums/outfits/ert/fsf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/datums/outfits/ert/hephaestus_ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion code/datums/outfits/ert/izweski.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/datums/outfits/ert/kataphract.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion code/datums/outfits/ert/kosmostrelki.dm
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,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

Expand Down
2 changes: 1 addition & 1 deletion code/datums/outfits/ert/mercenary.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion code/datums/outfits/ert/nt_ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion code/datums/outfits/ert/qukala.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion code/datums/outfits/ert/scc_ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions code/datums/outfits/ert/vaurca.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion code/datums/outfits/ert/zavod.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions code/datums/outfits/ert/zenghu.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions code/datums/outfits/event/outfit_generic/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion code/datums/outfits/event/outfit_megacorps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/datums/tips/tips.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down
2 changes: 1 addition & 1 deletion code/datums/trading/weaponry.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
4 changes: 2 additions & 2 deletions code/datums/uplink/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
/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
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."
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
name = "Combat Defibrillator"
Expand Down
8 changes: 4 additions & 4 deletions code/game/jobs/faction/pmc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -168,11 +168,11 @@
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
suit = /obj/item/clothing/suit/storage/toggle/fr_jacket/pmc
uniform = /obj/item/clothing/under/rank/medical/paramedic/pmc
suit = /obj/item/clothing/suit/storage/toggle/para_jacket/pmc
id = /obj/item/card/id/pmc

backpack_faction = /obj/item/storage/backpack/pmcg
Expand Down
8 changes: 4 additions & 4 deletions code/game/jobs/faction/zeng_hu.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -116,11 +116,11 @@
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
suit = /obj/item/clothing/suit/storage/toggle/fr_jacket/zeng
uniform = /obj/item/clothing/under/rank/medical/paramedic/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
Expand Down
4 changes: 2 additions & 2 deletions code/game/jobs/job/event.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading
Loading