From 9d878d06837f8a650fd19c4ed658b079b7c30986 Mon Sep 17 00:00:00 2001 From: Cydia Date: Thu, 6 Aug 2020 15:34:19 -0500 Subject: [PATCH 1/4] Adds even MORE JOB TITLES people keep requesting them and they're too cool to not pass up --- code/modules/jobs/job_types/job_alt_titles.dm | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/job_alt_titles.dm b/code/modules/jobs/job_types/job_alt_titles.dm index d0864145..0e8506eb 100644 --- a/code/modules/jobs/job_types/job_alt_titles.dm +++ b/code/modules/jobs/job_types/job_alt_titles.dm @@ -1,6 +1,9 @@ //Engineering +/datum/job/chief_engineer + alt_titles = list("Head Engineer", "Construction Coordinator", "Project Manager") + /datum/job/engineer - alt_titles = list("Maintenance Technician", "Engine Technician", "Electrician") + alt_titles = list("Maintenance Technician", "Engine Technician", "Electrician", "Structural Engineer", "Station Architect") /datum/job/atmos alt_titles = list("Firefighter", "Life Support Specialist") @@ -32,8 +35,14 @@ /datum/job/mime alt_titles = list("Performer") + +/datum/job/bartender + alt_titles = list("Mixologist", "Bar Owner") //Science +/datum/job/rd + alt_titles = list("Research Manager", "Science Administrator") + /datum/job/scientist alt_titles = list("Circuitry Designer", "Xenobiologist", "Xenobotanist", "Xenoarcheologist", "Chemical Researcher", "Researcher", "Pyrotechnician") @@ -41,6 +50,9 @@ alt_titles = list("Biomechanical Engineer", "Mechatronic Engineer", "Mechanic") //Medical +/datum/job/cmo + alt_titles = list("Medical Director") + /datum/job/doctor alt_titles = list("Nurse", "Surgeon", "Physician") @@ -54,6 +66,15 @@ alt_titles = list("Gene Therapist") //Security +/datum/job/hos + alt_titles = list("Chief of Security", "Security Commander") + +/datum/job/warden + alt_titles = list("Prison Chief", "Armory Manager", "Prison Administrator") + +/datum/job/officer + alt_titles = list("Security Agent", "Probation OFficer", "Security Peacekeeper", "Security Cadet") + /datum/job/detective alt_titles = list("Forensics Technician", "Private Investigator", "Gumshoe") @@ -66,3 +87,7 @@ /datum/job/mining alt_titles = list("Exotic Ore Miner", "Fauna Hunter", "Explorer", "Digger") //Just because you're a hunter does not excuse you from rock collecting!!!!!!!!!!!! + +//Command +/datum/job/hop + alt_titles = list("Personnel Manager", "Staff Administrator") From 5769730f2d78a715d2d12236ecc5f906c05bb289 Mon Sep 17 00:00:00 2001 From: Cydia Date: Thu, 6 Aug 2020 22:53:57 -0500 Subject: [PATCH 2/4] captain titles wip --- code/modules/jobs/job_types/captain.dm | 5 ++++- code/modules/jobs/job_types/job_alt_titles.dm | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index ebef17ab..45919569 100644 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -28,7 +28,10 @@ Captain /datum/job/captain/announce(mob/living/carbon/human/H) ..() - SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, .proc/minor_announce, "Captain [H.nameless ? "" : "[H.real_name] "]on deck!")) + var/displayed_rank = H.client.prefs.alt_titles_preferences[H.job] + if(!displayed_rank) + displayed_rank = "Captain" + SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, .proc/minor_announce, "[displayed_rank] [H.nameless ? "" : "[H.real_name] "]on deck!")) /datum/outfit/job/captain name = "Captain" diff --git a/code/modules/jobs/job_types/job_alt_titles.dm b/code/modules/jobs/job_types/job_alt_titles.dm index 0e8506eb..9dc57294 100644 --- a/code/modules/jobs/job_types/job_alt_titles.dm +++ b/code/modules/jobs/job_types/job_alt_titles.dm @@ -89,5 +89,8 @@ alt_titles = list("Exotic Ore Miner", "Fauna Hunter", "Explorer", "Digger") //Just because you're a hunter does not excuse you from rock collecting!!!!!!!!!!!! //Command +/datum/job/captain + alt_titles = list("Station Director", "Station Commander", "Station Overseer") + /datum/job/hop alt_titles = list("Personnel Manager", "Staff Administrator") From 44735bb1d34ed7b1837d0110a644345458b79e39 Mon Sep 17 00:00:00 2001 From: Cydia Date: Sat, 8 Aug 2020 01:35:17 -0500 Subject: [PATCH 3/4] Revert "captain titles wip" This reverts commit 5769730f2d78a715d2d12236ecc5f906c05bb289. --- code/modules/jobs/job_types/captain.dm | 5 +---- code/modules/jobs/job_types/job_alt_titles.dm | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index 45919569..ebef17ab 100644 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -28,10 +28,7 @@ Captain /datum/job/captain/announce(mob/living/carbon/human/H) ..() - var/displayed_rank = H.client.prefs.alt_titles_preferences[H.job] - if(!displayed_rank) - displayed_rank = "Captain" - SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, .proc/minor_announce, "[displayed_rank] [H.nameless ? "" : "[H.real_name] "]on deck!")) + SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, .proc/minor_announce, "Captain [H.nameless ? "" : "[H.real_name] "]on deck!")) /datum/outfit/job/captain name = "Captain" diff --git a/code/modules/jobs/job_types/job_alt_titles.dm b/code/modules/jobs/job_types/job_alt_titles.dm index 9dc57294..0e8506eb 100644 --- a/code/modules/jobs/job_types/job_alt_titles.dm +++ b/code/modules/jobs/job_types/job_alt_titles.dm @@ -89,8 +89,5 @@ alt_titles = list("Exotic Ore Miner", "Fauna Hunter", "Explorer", "Digger") //Just because you're a hunter does not excuse you from rock collecting!!!!!!!!!!!! //Command -/datum/job/captain - alt_titles = list("Station Director", "Station Commander", "Station Overseer") - /datum/job/hop alt_titles = list("Personnel Manager", "Staff Administrator") From 6d8c164dbf3687de8f218f0748adab945a32182b Mon Sep 17 00:00:00 2001 From: Cydia Date: Sat, 8 Aug 2020 01:36:38 -0500 Subject: [PATCH 4/4] captain job names now that the weird bug was fixed --- code/modules/jobs/job_types/job_alt_titles.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/jobs/job_types/job_alt_titles.dm b/code/modules/jobs/job_types/job_alt_titles.dm index 0e8506eb..9dc57294 100644 --- a/code/modules/jobs/job_types/job_alt_titles.dm +++ b/code/modules/jobs/job_types/job_alt_titles.dm @@ -89,5 +89,8 @@ alt_titles = list("Exotic Ore Miner", "Fauna Hunter", "Explorer", "Digger") //Just because you're a hunter does not excuse you from rock collecting!!!!!!!!!!!! //Command +/datum/job/captain + alt_titles = list("Station Director", "Station Commander", "Station Overseer") + /datum/job/hop alt_titles = list("Personnel Manager", "Staff Administrator")