From 837dfac16582ef2a3b1ead030a93ed6b236bbef1 Mon Sep 17 00:00:00 2001 From: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com> Date: Thu, 6 Jun 2024 15:01:25 -0700 Subject: [PATCH] [MIRROR] Adds new fax reason for expedition teams (#8493) Co-authored-by: TheToaster98 <51209769+TheToaster98@users.noreply.github.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- code/game/jobs/job/captain_vr.dm | 4 ++-- code/game/jobs/job/civilian_vr.dm | 6 ++++++ code/game/jobs/job/engineering_vr.dm | 6 +++--- code/game/jobs/job/exploration_vr.dm | 7 ++++++- code/game/jobs/job/medical_vr.dm | 7 +++++-- code/game/jobs/job/science_vr.dm | 4 +++- code/game/jobs/job/security_vr.dm | 4 ++-- 7 files changed, 27 insertions(+), 11 deletions(-) diff --git a/code/game/jobs/job/captain_vr.dm b/code/game/jobs/job/captain_vr.dm index a8949c0ee0..459e06a65a 100644 --- a/code/game/jobs/job/captain_vr.dm +++ b/code/game/jobs/job/captain_vr.dm @@ -15,7 +15,7 @@ title = "Captain" /datum/job/captain/get_request_reasons() - return list("Training crew") + return list("Training crew", "Assembling expedition team") /datum/job/hop disallow_jobhop = TRUE @@ -53,7 +53,7 @@ /datum/job/hop/get_request_reasons() - return list("ID modification", "Training crew") + return list("ID modification", "Training crew", "Assembling expedition team") /datum/job/secretary diff --git a/code/game/jobs/job/civilian_vr.dm b/code/game/jobs/job/civilian_vr.dm index 0f3f3881f7..bdd7f8cbd7 100644 --- a/code/game/jobs/job/civilian_vr.dm +++ b/code/game/jobs/job/civilian_vr.dm @@ -106,6 +106,9 @@ /datum/alt_title/excavator title = "Excavator" +/datum/job/mining/get_request_reasons() + return list("Assembling expedition team") + /datum/job/janitor //Lots of janitor substations on station. total_positions = 3 @@ -238,6 +241,9 @@ title = "Helmsman" */ //CHOMP Remove end +/datum/job/pilot/get_request_reasons() + return list("Assembling expedition team") + ////////////////////////////////// // Entertainer ////////////////////////////////// diff --git a/code/game/jobs/job/engineering_vr.dm b/code/game/jobs/job/engineering_vr.dm index 58ebb57dd2..7801a45743 100644 --- a/code/game/jobs/job/engineering_vr.dm +++ b/code/game/jobs/job/engineering_vr.dm @@ -24,7 +24,7 @@ title = "Maintenance Manager" /datum/job/chief_engineer/get_request_reasons() - return list("Engine setup", "Construction project", "Repairs necessary", "Training crew") + return list("Engine setup", "Construction project", "Repairs necessary", "Training crew", "Assembling expedition team") /datum/job/engineer @@ -42,7 +42,7 @@ title_blurb = "An Engineering Contractor fulfills similar duties to other engineers, but isn't directly employed by NT proper." /datum/job/engineer/get_request_reasons() - return list("Engine setup", "Construction project", "Repairs necessary") + return list("Engine setup", "Construction project", "Repairs necessary", "Assembling expedition team") @@ -63,4 +63,4 @@ title_blurb = "A Disposals Technician is an Atmospheric Technician still and can fulfill all the same duties, although specializes more in disposals delivery system's operations and configurations." /datum/job/atmos/get_request_reasons() - return list("Construction project", "Repairs necessary") \ No newline at end of file + return list("Construction project", "Repairs necessary", "Assembling expedition team") diff --git a/code/game/jobs/job/exploration_vr.dm b/code/game/jobs/job/exploration_vr.dm index 0716b26335..6d86e9d07e 100644 --- a/code/game/jobs/job/exploration_vr.dm +++ b/code/game/jobs/job/exploration_vr.dm @@ -56,7 +56,7 @@ title = "Exploration Manager" /datum/job/pathfinder/get_request_reasons() - return list("Training crew") + return list("Training crew", "Assembling expedition team") /datum/job/pilot @@ -113,6 +113,8 @@ /datum/alt_title/offsite_scout title = "Offsite Scout" +/datum/job/explorer/get_request_reasons() + return list("Assembling expedition team") /datum/job/sar title = "Field Medic" @@ -138,3 +140,6 @@ /datum/alt_title/offsite_medic title = "Offsite Medic" + +/datum/job/sar/get_request_reasons() + return list("Assembling expedition team") diff --git a/code/game/jobs/job/medical_vr.dm b/code/game/jobs/job/medical_vr.dm index 1b9e3f49b1..ba4b2321c3 100644 --- a/code/game/jobs/job/medical_vr.dm +++ b/code/game/jobs/job/medical_vr.dm @@ -22,7 +22,7 @@ title = "Healthcare Manager" /datum/job/cmo/get_request_reasons() - return list("Surgery pending", "Viral outbreak", "Training crew") + return list("Surgery pending", "Viral outbreak", "Training crew", "Assembling expedition team") /datum/job/doctor @@ -49,7 +49,7 @@ title_blurb = "A Medical Contractor can be anything from a full-blown doctor to the likes of a nurse or orderly, but isn't directly employed by NT proper." /datum/job/doctor/get_request_reasons() - return list("Surgery pending", "Viral outbreak") + return list("Surgery pending", "Viral outbreak", "Assembling expedition team") /datum/job/chemist @@ -94,3 +94,6 @@ /datum/alt_title/sar title = "Search and Rescue" */ + +/datum/job/paramedic/get_request_reasons() + return list("Assembling expedition team") diff --git a/code/game/jobs/job/science_vr.dm b/code/game/jobs/job/science_vr.dm index bbcf853324..e28d7230ab 100644 --- a/code/game/jobs/job/science_vr.dm +++ b/code/game/jobs/job/science_vr.dm @@ -26,7 +26,7 @@ title = "Head Scientist" /datum/job/rd/get_request_reasons() - return list("Repairs needed", "Training crew") + return list("Repairs needed", "Training crew", "Assembling expedition team") /datum/job/scientist spawn_positions = 5 @@ -68,6 +68,8 @@ title_blurb = "A Circuit Programmer is a Scientist whose expertise is working with integrated circuits. They are familar with the workings and programming of those devices. \ They work to create various useful devices using the capabilities of integrated circuitry." +/datum/job/scientist/get_request_reasons() + return list("Assembling expedition team") /datum/job/xenobiologist spawn_positions = 3 diff --git a/code/game/jobs/job/security_vr.dm b/code/game/jobs/job/security_vr.dm index 80acbb451e..21fb51b2f4 100644 --- a/code/game/jobs/job/security_vr.dm +++ b/code/game/jobs/job/security_vr.dm @@ -17,7 +17,7 @@ title = "Security Manager" /datum/job/hos/get_request_reasons() - return list("Wildlife management", "Forensic investigation", "Training crew") + return list("Wildlife management", "Forensic investigation", "Training crew", "Assembling expedition team") /datum/job/warden @@ -69,4 +69,4 @@ title = "Security Contractor" /datum/job/officer/get_request_reasons() - return list("Wildlife management") + return list("Wildlife management", "Assembling expedition team")