diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 1a0c2351701..545da8549b3 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -180,6 +180,14 @@ /// Whether this job can be an intern. #define JOB_CAN_BE_INTERN (1<<8) - #define FACTION_NONE "None" #define FACTION_STATION "Station" + +// Variable macros used to declare who is the supervisor for a given job, announced to the player when they join as any given job. +#define SUPERVISOR_CAPTAIN "the Captain" +#define SUPERVISOR_CE "the Chief Engineer" +#define SUPERVISOR_CMO "the Chief Medical Officer" +#define SUPERVISOR_HOP "the Head of Personnel" +#define SUPERVISOR_HOS "the Head of Security" +#define SUPERVISOR_QM "the Quartermaster" +#define SUPERVISOR_RD "the Research Director" diff --git a/code/modules/jobs/job_types/atmospheric_technician.dm b/code/modules/jobs/job_types/atmospheric_technician.dm index 3f2e98a4cc3..be631bb8b1e 100644 --- a/code/modules/jobs/job_types/atmospheric_technician.dm +++ b/code/modules/jobs/job_types/atmospheric_technician.dm @@ -5,7 +5,7 @@ faction = FACTION_STATION total_positions = 3 spawn_positions = 2 - supervisors = "the chief engineer" + supervisors = SUPERVISOR_CE selection_color = "#fff5cc" exp_requirements = 60 exp_required_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/bartender.dm b/code/modules/jobs/job_types/bartender.dm index 64757d5fd47..3d643fddb0b 100644 --- a/code/modules/jobs/job_types/bartender.dm +++ b/code/modules/jobs/job_types/bartender.dm @@ -5,7 +5,7 @@ faction = FACTION_STATION total_positions = 1 spawn_positions = 1 - supervisors = "the head of personnel" + supervisors = SUPERVISOR_HOP selection_color = "#bbe291" exp_granted_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/botanist.dm b/code/modules/jobs/job_types/botanist.dm index 7dec53564e2..8193bd29b61 100644 --- a/code/modules/jobs/job_types/botanist.dm +++ b/code/modules/jobs/job_types/botanist.dm @@ -5,7 +5,7 @@ faction = FACTION_STATION total_positions = 3 spawn_positions = 2 - supervisors = "the head of personnel" + supervisors = SUPERVISOR_HOP selection_color = "#bbe291" exp_granted_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index 6e0f9637b38..778298b4a61 100755 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -8,7 +8,7 @@ faction = FACTION_STATION total_positions = 1 spawn_positions = 1 - supervisors = "Nanotrasen officials and Space law" + supervisors = "Nanotrasen officials and Space Law" selection_color = "#ccccff" req_admin_notify = 1 minimal_player_age = 14 diff --git a/code/modules/jobs/job_types/cargo_technician.dm b/code/modules/jobs/job_types/cargo_technician.dm index a3c7a1651df..37d275aa00d 100644 --- a/code/modules/jobs/job_types/cargo_technician.dm +++ b/code/modules/jobs/job_types/cargo_technician.dm @@ -7,7 +7,7 @@ faction = FACTION_STATION total_positions = 3 spawn_positions = 2 - supervisors = "the quartermaster" + supervisors = SUPERVISOR_QM selection_color = "#dcba97" exp_granted_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm index 286311b99b8..d3970bddd36 100644 --- a/code/modules/jobs/job_types/chaplain.dm +++ b/code/modules/jobs/job_types/chaplain.dm @@ -6,7 +6,7 @@ faction = FACTION_STATION total_positions = 1 spawn_positions = 1 - supervisors = "the head of personnel" + supervisors = SUPERVISOR_HOP selection_color = "#bbe291" exp_granted_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/chemist.dm b/code/modules/jobs/job_types/chemist.dm index cd7f8696f54..6ccd7590006 100644 --- a/code/modules/jobs/job_types/chemist.dm +++ b/code/modules/jobs/job_types/chemist.dm @@ -6,7 +6,7 @@ faction = FACTION_STATION total_positions = 2 spawn_positions = 2 - supervisors = "the chief medical officer" + supervisors = SUPERVISOR_CMO selection_color = "#ffeef0" exp_requirements = 60 exp_required_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm index 03df4c57607..0d8ebb5e614 100644 --- a/code/modules/jobs/job_types/chief_engineer.dm +++ b/code/modules/jobs/job_types/chief_engineer.dm @@ -8,7 +8,7 @@ faction = FACTION_STATION total_positions = 1 spawn_positions = 1 - supervisors = "the captain" + supervisors = SUPERVISOR_CAPTAIN selection_color = "#ffeeaa" req_admin_notify = 1 minimal_player_age = 7 diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm index b9065156fa3..dc98f48d5c4 100644 --- a/code/modules/jobs/job_types/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/chief_medical_officer.dm @@ -8,7 +8,7 @@ faction = FACTION_STATION total_positions = 1 spawn_positions = 1 - supervisors = "the captain" + supervisors = SUPERVISOR_CAPTAIN selection_color = "#ffddf0" req_admin_notify = 1 minimal_player_age = 7 diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm index cc0a831d72a..5e973fed832 100644 --- a/code/modules/jobs/job_types/clown.dm +++ b/code/modules/jobs/job_types/clown.dm @@ -5,7 +5,7 @@ faction = FACTION_STATION total_positions = 1 spawn_positions = 1 - supervisors = "the head of personnel" + supervisors = SUPERVISOR_HOP selection_color = "#bbe291" exp_granted_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/cook.dm b/code/modules/jobs/job_types/cook.dm index 1621b95378a..167455d0d1b 100644 --- a/code/modules/jobs/job_types/cook.dm +++ b/code/modules/jobs/job_types/cook.dm @@ -5,7 +5,7 @@ faction = FACTION_STATION total_positions = 2 spawn_positions = 1 - supervisors = "the head of personnel" + supervisors = SUPERVISOR_HOP selection_color = "#bbe291" exp_granted_type = EXP_TYPE_CREW var/cooks = 0 //Counts cooks amount diff --git a/code/modules/jobs/job_types/curator.dm b/code/modules/jobs/job_types/curator.dm index c0a2dda2a54..e0a5c4df6b3 100644 --- a/code/modules/jobs/job_types/curator.dm +++ b/code/modules/jobs/job_types/curator.dm @@ -6,7 +6,7 @@ faction = FACTION_STATION total_positions = 1 spawn_positions = 1 - supervisors = "the head of personnel" + supervisors = SUPERVISOR_HOP selection_color = "#bbe291" exp_granted_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm index 7b6e0c3ae38..b4d45878b3d 100644 --- a/code/modules/jobs/job_types/detective.dm +++ b/code/modules/jobs/job_types/detective.dm @@ -7,7 +7,7 @@ faction = FACTION_STATION total_positions = 1 spawn_positions = 1 - supervisors = "the head of security" + supervisors = SUPERVISOR_HOS selection_color = "#ffeeee" minimal_player_age = 7 exp_requirements = 300 diff --git a/code/modules/jobs/job_types/geneticist.dm b/code/modules/jobs/job_types/geneticist.dm index 017d71e43cb..f1428835af3 100644 --- a/code/modules/jobs/job_types/geneticist.dm +++ b/code/modules/jobs/job_types/geneticist.dm @@ -5,7 +5,7 @@ faction = FACTION_STATION total_positions = 2 spawn_positions = 2 - supervisors = "the research director" + supervisors = SUPERVISOR_RD selection_color = "#ffeeff" exp_requirements = 60 exp_required_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index b86d7c08b50..c29e2c5e920 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -8,7 +8,7 @@ faction = FACTION_STATION total_positions = 1 spawn_positions = 1 - supervisors = "the captain" + supervisors = SUPERVISOR_HOP selection_color = "#ddddff" req_admin_notify = 1 minimal_player_age = 10 diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index 576f7564909..1ccf4884da2 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -8,7 +8,7 @@ faction = FACTION_STATION total_positions = 1 spawn_positions = 1 - supervisors = "the captain" + supervisors = SUPERVISOR_CAPTAIN selection_color = "#ffdddd" req_admin_notify = 1 minimal_player_age = 14 diff --git a/code/modules/jobs/job_types/janitor.dm b/code/modules/jobs/job_types/janitor.dm index 23852862ad4..1298c1a93c9 100644 --- a/code/modules/jobs/job_types/janitor.dm +++ b/code/modules/jobs/job_types/janitor.dm @@ -5,7 +5,7 @@ faction = FACTION_STATION total_positions = 2 spawn_positions = 1 - supervisors = "the head of personnel" + supervisors = SUPERVISOR_HOP selection_color = "#bbe291" exp_granted_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/lawyer.dm b/code/modules/jobs/job_types/lawyer.dm index 4327572f0ec..8e1477f375d 100644 --- a/code/modules/jobs/job_types/lawyer.dm +++ b/code/modules/jobs/job_types/lawyer.dm @@ -6,7 +6,7 @@ faction = FACTION_STATION total_positions = 2 spawn_positions = 2 - supervisors = "the head of personnel" + supervisors = SUPERVISOR_HOP selection_color = "#bbe291" exp_granted_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index 77329ff10ee..677a273262a 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -6,7 +6,7 @@ faction = FACTION_STATION total_positions = 5 spawn_positions = 3 - supervisors = "the chief medical officer" + supervisors = SUPERVISOR_CMO selection_color = "#ffeef0" exp_granted_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm index ad5cd1637db..38899d55f0f 100644 --- a/code/modules/jobs/job_types/mime.dm +++ b/code/modules/jobs/job_types/mime.dm @@ -5,7 +5,7 @@ faction = FACTION_STATION total_positions = 1 spawn_positions = 1 - supervisors = "the head of personnel" + supervisors = SUPERVISOR_HOP selection_color = "#bbe291" exp_granted_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm index ccf2f9f23e9..74c8a5f8174 100644 --- a/code/modules/jobs/job_types/paramedic.dm +++ b/code/modules/jobs/job_types/paramedic.dm @@ -6,7 +6,7 @@ faction = FACTION_STATION total_positions = 2 spawn_positions = 2 - supervisors = "the chief medical officer" + supervisors = SUPERVISOR_CMO selection_color = "#ffeef0" exp_granted_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/psychologist.dm b/code/modules/jobs/job_types/psychologist.dm index 5872ca4b42a..6efb3db4d1a 100644 --- a/code/modules/jobs/job_types/psychologist.dm +++ b/code/modules/jobs/job_types/psychologist.dm @@ -6,7 +6,7 @@ faction = FACTION_STATION total_positions = 1 spawn_positions = 1 - supervisors = "the head of personnel and the chief medical officer" + supervisors = "the Head of Personnel and the Chief Medical Officer" selection_color = "#bbe291" exp_granted_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/quartermaster.dm b/code/modules/jobs/job_types/quartermaster.dm index 3f5d392af17..048aafc1c76 100644 --- a/code/modules/jobs/job_types/quartermaster.dm +++ b/code/modules/jobs/job_types/quartermaster.dm @@ -9,7 +9,7 @@ total_positions = 1 spawn_positions = 1 minimal_player_age = 7 - supervisors = "the captain" + supervisors = SUPERVISOR_CAPTAIN selection_color = "#d7b088" exp_required_type_department = EXP_TYPE_SUPPLY exp_granted_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm index fd3f39ede34..1b45bde2d20 100644 --- a/code/modules/jobs/job_types/research_director.dm +++ b/code/modules/jobs/job_types/research_director.dm @@ -9,7 +9,7 @@ faction = FACTION_STATION total_positions = 1 spawn_positions = 1 - supervisors = "the captain" + supervisors = SUPERVISOR_CAPTAIN selection_color = "#ffddff" req_admin_notify = 1 minimal_player_age = 7 diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm index c6e17839d16..04918aa9981 100644 --- a/code/modules/jobs/job_types/roboticist.dm +++ b/code/modules/jobs/job_types/roboticist.dm @@ -5,7 +5,7 @@ faction = FACTION_STATION total_positions = 2 spawn_positions = 2 - supervisors = "the research director" + supervisors = SUPERVISOR_RD selection_color = "#ffeeff" exp_requirements = 60 exp_required_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/scientist.dm b/code/modules/jobs/job_types/scientist.dm index 2978c9572e9..8c630838ef8 100644 --- a/code/modules/jobs/job_types/scientist.dm +++ b/code/modules/jobs/job_types/scientist.dm @@ -5,7 +5,7 @@ faction = FACTION_STATION total_positions = 5 spawn_positions = 3 - supervisors = "the research director" + supervisors = SUPERVISOR_RD selection_color = "#ffeeff" exp_requirements = 60 exp_required_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index f8ca3126735..0b9293b71b4 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -7,7 +7,7 @@ faction = FACTION_STATION total_positions = 5 //Handled in /datum/controller/occupations/proc/setup_officer_positions() spawn_positions = 5 //Handled in /datum/controller/occupations/proc/setup_officer_positions() - supervisors = "the head of security, and the head of your assigned department (if applicable)" + supervisors = "the Head of Security, and the head of your assigned department (if applicable)" selection_color = "#ffeeee" minimal_player_age = 7 exp_requirements = 300 diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index c04f2b9788a..6c887c1f6bf 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -6,7 +6,7 @@ faction = FACTION_STATION total_positions = 3 spawn_positions = 3 - supervisors = "the quartermaster" + supervisors = SUPERVISOR_QM selection_color = "#dcba97" exp_granted_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm index 05efd5cc62b..31eb4ea7551 100644 --- a/code/modules/jobs/job_types/station_engineer.dm +++ b/code/modules/jobs/job_types/station_engineer.dm @@ -6,7 +6,7 @@ faction = FACTION_STATION total_positions = 5 spawn_positions = 5 - supervisors = "the chief engineer" + supervisors = SUPERVISOR_CE selection_color = "#fff5cc" exp_requirements = 60 exp_required_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/virologist.dm b/code/modules/jobs/job_types/virologist.dm index db807809762..6666340437f 100644 --- a/code/modules/jobs/job_types/virologist.dm +++ b/code/modules/jobs/job_types/virologist.dm @@ -6,7 +6,7 @@ faction = FACTION_STATION total_positions = 1 spawn_positions = 1 - supervisors = "the chief medical officer" + supervisors = SUPERVISOR_CMO selection_color = "#ffeef0" exp_requirements = 60 exp_required_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index e5ed4565b80..8e9d994f828 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -8,7 +8,7 @@ faction = FACTION_STATION total_positions = 1 spawn_positions = 1 - supervisors = "the head of security" + supervisors = SUPERVISOR_HOS selection_color = "#ffeeee" minimal_player_age = 7 exp_requirements = 300