From f739b63e8d87f8a1794b60f1bb49def52fbd490b Mon Sep 17 00:00:00 2001 From: Heroman Date: Thu, 29 Dec 2022 15:17:24 +1000 Subject: [PATCH] Allows SD-exclusive job titles to be used anywhere --- code/game/jobs/job/captain_vr.dm | 5 ++- code/game/jobs/job/engineering_vr.dm | 6 +++- code/game/jobs/job/security_vr.dm | 5 ++- maps/stellar_delight/stellar_delight_jobs.dm | 32 -------------------- 4 files changed, 13 insertions(+), 35 deletions(-) diff --git a/code/game/jobs/job/captain_vr.dm b/code/game/jobs/job/captain_vr.dm index 8fcfffdf26..f80cfb7de1 100644 --- a/code/game/jobs/job/captain_vr.dm +++ b/code/game/jobs/job/captain_vr.dm @@ -25,7 +25,7 @@ dept_time_required = 60 alt_titles = list("Crew Resources Officer" = /datum/alt_title/cro, "Deputy Manager" = /datum/alt_title/deputy_manager, "Staff Manager" = /datum/alt_title/staff_manager, - "Facility Steward" = /datum/alt_title/facility_steward) + "Facility Steward" = /datum/alt_title/facility_steward, "First Mate" = /datum/alt_title/first_mate) access = list(access_security, access_sec_doors, access_brig, access_forensics_lockers, access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads, @@ -49,6 +49,9 @@ /datum/alt_title/facility_steward title = "Facility Steward" +/datum/alt_title/first_mate + title = "First Mate" + /datum/job/hop/get_request_reasons() return list("ID modification", "Training crew") diff --git a/code/game/jobs/job/engineering_vr.dm b/code/game/jobs/job/engineering_vr.dm index 70ee51c792..d1d82b9cae 100644 --- a/code/game/jobs/job/engineering_vr.dm +++ b/code/game/jobs/job/engineering_vr.dm @@ -50,7 +50,8 @@ /datum/job/atmos spawn_positions = 3 pto_type = PTO_ENGINEERING - alt_titles = list("Atmospheric Engineer" = /datum/alt_title/atmos_engi, "Atmospheric Maintainer" = /datum/alt_title/atmos_maint, "Disposals Technician" = /datum/alt_title/disposals_tech) + alt_titles = list("Atmospheric Engineer" = /datum/alt_title/atmos_engi, "Atmospheric Maintainer" = /datum/alt_title/atmos_maint, "Disposals Technician" = /datum/alt_title/disposals_tech, + "Fuel Technician" = /datum/alt_title/refuel_tech) /datum/alt_title/atmos_maint title = "Atmospheric Maintainer" @@ -62,5 +63,8 @@ title = "Disposals Technician" 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/alt_title/refuel_tech + title = "Fuel Technician" + /datum/job/atmos/get_request_reasons() return list("Construction project", "Repairs necessary") \ No newline at end of file diff --git a/code/game/jobs/job/security_vr.dm b/code/game/jobs/job/security_vr.dm index 232c9be332..c6657abec7 100644 --- a/code/game/jobs/job/security_vr.dm +++ b/code/game/jobs/job/security_vr.dm @@ -23,7 +23,7 @@ /datum/job/warden pto_type = PTO_SECURITY dept_time_required = 20 - alt_titles = list("Brig Sentry" = /datum/alt_title/brig_sentry, "Armory Superintendent" = /datum/alt_title/armory_superintendent) + alt_titles = list("Brig Sentry" = /datum/alt_title/brig_sentry, "Armory Superintendent" = /datum/alt_title/armory_superintendent, "Master-at-Arms" = /datum/alt_title/master_at_arms) /datum/alt_title/brig_sentry title = "Brig Sentry" @@ -31,6 +31,9 @@ /datum/alt_title/armory_superintendent title = "Armory Superintendent" +/datum/alt_title/master_at_arms + title = "Master-at-Arms" + /datum/job/warden/get_request_reasons() return list("Wildlife management") diff --git a/maps/stellar_delight/stellar_delight_jobs.dm b/maps/stellar_delight/stellar_delight_jobs.dm index 696f4950f7..928fb1f7b9 100644 --- a/maps/stellar_delight/stellar_delight_jobs.dm +++ b/maps/stellar_delight/stellar_delight_jobs.dm @@ -1,34 +1,2 @@ -//The pathfinder doesn't have a OM shuttle that they are in charge of, and so, doesn't need pilot access. -//Mostly to prevent explo from just commandeering the Starstuff as the explo shuttle without involving a pilot every round. -/* -/datum/job/pathfinder - access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_explorer, access_gateway, access_pathfinder) - minimal_access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_explorer, access_gateway, access_pathfinder) - -//Same as above, to discorage explo from taking off with the small ship without asking, SAR should not need pilot access. -/datum/job/sar - access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_eva, access_maint_tunnels, access_external_airlocks) - minimal_access = list(access_medical, access_medical_equip, access_morgue) -*/ -/datum/job/hop - alt_titles = list("Crew Resources Officer" = /datum/alt_title/cro, "Deputy Manager" = /datum/alt_title/deputy_manager, "Staff Manager" = /datum/alt_title/staff_manager, - "Facility Steward" = /datum/alt_title/facility_steward, "First Mate" = /datum/alt_title/first_mate) - -/datum/alt_title/first_mate - title = "First Mate" - -/datum/job/atmos - alt_titles = list("Atmospheric Engineer" = /datum/alt_title/atmos_engi, "Atmospheric Maintainer" = /datum/alt_title/atmos_maint, "Disposals Technician" = /datum/alt_title/disposals_tech, - "Fuel Technician" = /datum/alt_title/refuel_tech) - -/datum/alt_title/refuel_tech - title = "Fuel Technician" - -/datum/job/warden - alt_titles = list("Brig Sentry" = /datum/alt_title/brig_sentry, "Armory Superintendent" = /datum/alt_title/armory_superintendent, "Master-at-Arms" = /datum/alt_title/master_at_arms) - -/datum/alt_title/master_at_arms - title = "Master-at-Arms" - /datum/job/pilot/get_request_reasons() return list("Moving Stellar Delight")