diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 4edd3434b4e..474451c763f 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -35,9 +35,6 @@ /// Supervisors, who this person answers to directly var/supervisors = "" - /// Selection screen color - var/selection_color = "#ffffff" - /// What kind of mob type joining players with this job as their assigned role are spawned as. var/spawn_type = /mob/living/carbon/human diff --git a/code/modules/jobs/job_types/ai.dm b/code/modules/jobs/job_types/ai.dm index f44ab9b89d8..22763cee110 100644 --- a/code/modules/jobs/job_types/ai.dm +++ b/code/modules/jobs/job_types/ai.dm @@ -6,7 +6,6 @@ total_positions = 1 spawn_positions = 1 supervisors = "your laws" - selection_color = "#ccffcc" spawn_type = /mob/living/silicon/ai req_admin_notify = TRUE minimal_player_age = 30 diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm index 89429781679..ca688fb54c6 100644 --- a/code/modules/jobs/job_types/assistant.dm +++ b/code/modules/jobs/job_types/assistant.dm @@ -10,7 +10,6 @@ Assistant total_positions = 5 spawn_positions = 5 supervisors = "absolutely everyone" - selection_color = "#dddddd" exp_granted_type = EXP_TYPE_CREW outfit = /datum/outfit/job/assistant plasmaman_outfit = /datum/outfit/plasmaman diff --git a/code/modules/jobs/job_types/atmospheric_technician.dm b/code/modules/jobs/job_types/atmospheric_technician.dm index 0176bc6eb79..b5c38f4fe58 100644 --- a/code/modules/jobs/job_types/atmospheric_technician.dm +++ b/code/modules/jobs/job_types/atmospheric_technician.dm @@ -6,7 +6,6 @@ total_positions = 3 spawn_positions = 2 supervisors = SUPERVISOR_CE - selection_color = "#fff5cc" exp_requirements = 60 exp_required_type = EXP_TYPE_CREW exp_granted_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/bartender.dm b/code/modules/jobs/job_types/bartender.dm index 9fc56f186a8..ec526e10d91 100644 --- a/code/modules/jobs/job_types/bartender.dm +++ b/code/modules/jobs/job_types/bartender.dm @@ -6,7 +6,6 @@ total_positions = 1 spawn_positions = 1 supervisors = SUPERVISOR_HOP - selection_color = "#bbe291" exp_granted_type = EXP_TYPE_CREW config_tag = "BARTENDER" diff --git a/code/modules/jobs/job_types/botanist.dm b/code/modules/jobs/job_types/botanist.dm index 2ea1c14fcd9..9486cc6e4c3 100644 --- a/code/modules/jobs/job_types/botanist.dm +++ b/code/modules/jobs/job_types/botanist.dm @@ -6,7 +6,6 @@ total_positions = 3 spawn_positions = 2 supervisors = SUPERVISOR_HOP - selection_color = "#bbe291" exp_granted_type = EXP_TYPE_CREW config_tag = "BOTANIST" diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index 254a62b3201..865b37e307b 100755 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -9,7 +9,6 @@ total_positions = 1 spawn_positions = 1 supervisors = "Nanotrasen officials and Space Law" - selection_color = "#ccccff" req_admin_notify = 1 minimal_player_age = 14 exp_requirements = 180 diff --git a/code/modules/jobs/job_types/cargo_technician.dm b/code/modules/jobs/job_types/cargo_technician.dm index 53807a195ae..0887ea0c084 100644 --- a/code/modules/jobs/job_types/cargo_technician.dm +++ b/code/modules/jobs/job_types/cargo_technician.dm @@ -8,7 +8,6 @@ total_positions = 3 spawn_positions = 2 supervisors = SUPERVISOR_QM - selection_color = "#dcba97" exp_granted_type = EXP_TYPE_CREW config_tag = "CARGO_TECHNICIAN" diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm index 850c10dece1..c1ec62d792f 100644 --- a/code/modules/jobs/job_types/chaplain.dm +++ b/code/modules/jobs/job_types/chaplain.dm @@ -7,7 +7,6 @@ total_positions = 1 spawn_positions = 1 supervisors = SUPERVISOR_HOP - selection_color = "#bbe291" exp_granted_type = EXP_TYPE_CREW config_tag = "CHAPLAIN" diff --git a/code/modules/jobs/job_types/chemist.dm b/code/modules/jobs/job_types/chemist.dm index ab8b0914d13..07becbc4140 100644 --- a/code/modules/jobs/job_types/chemist.dm +++ b/code/modules/jobs/job_types/chemist.dm @@ -7,7 +7,6 @@ total_positions = 2 spawn_positions = 2 supervisors = SUPERVISOR_CMO - selection_color = "#ffeef0" exp_requirements = 60 exp_required_type = EXP_TYPE_CREW exp_granted_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 4496505279a..4a4ae8828bb 100644 --- a/code/modules/jobs/job_types/chief_engineer.dm +++ b/code/modules/jobs/job_types/chief_engineer.dm @@ -9,7 +9,6 @@ total_positions = 1 spawn_positions = 1 supervisors = SUPERVISOR_CAPTAIN - selection_color = "#ffeeaa" req_admin_notify = 1 minimal_player_age = 7 exp_requirements = 180 diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm index 91d95cec470..d0ddc0e27d0 100644 --- a/code/modules/jobs/job_types/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/chief_medical_officer.dm @@ -9,7 +9,6 @@ total_positions = 1 spawn_positions = 1 supervisors = SUPERVISOR_CAPTAIN - selection_color = "#ffddf0" req_admin_notify = 1 minimal_player_age = 7 exp_requirements = 180 diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm index f2b2846e568..e9f0346e3e1 100644 --- a/code/modules/jobs/job_types/clown.dm +++ b/code/modules/jobs/job_types/clown.dm @@ -6,7 +6,6 @@ total_positions = 1 spawn_positions = 1 supervisors = SUPERVISOR_HOP - selection_color = "#bbe291" exp_granted_type = EXP_TYPE_CREW config_tag = "CLOWN" diff --git a/code/modules/jobs/job_types/cook.dm b/code/modules/jobs/job_types/cook.dm index 0a65dca8953..b76f8a1e7a5 100644 --- a/code/modules/jobs/job_types/cook.dm +++ b/code/modules/jobs/job_types/cook.dm @@ -6,7 +6,6 @@ total_positions = 2 spawn_positions = 1 supervisors = SUPERVISOR_HOP - selection_color = "#bbe291" exp_granted_type = EXP_TYPE_CREW config_tag = "COOK" 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 218b162afdb..54dd4cbb61d 100644 --- a/code/modules/jobs/job_types/curator.dm +++ b/code/modules/jobs/job_types/curator.dm @@ -7,7 +7,6 @@ total_positions = 1 spawn_positions = 1 supervisors = SUPERVISOR_HOP - selection_color = "#bbe291" config_tag = "CURATOR" exp_granted_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/cyborg.dm b/code/modules/jobs/job_types/cyborg.dm index 55c0eb1d860..377fb7d62de 100644 --- a/code/modules/jobs/job_types/cyborg.dm +++ b/code/modules/jobs/job_types/cyborg.dm @@ -6,7 +6,6 @@ total_positions = 0 spawn_positions = 1 supervisors = "your laws and the AI" //Nodrak - selection_color = "#ddffdd" spawn_type = /mob/living/silicon/robot minimal_player_age = 21 exp_requirements = 120 diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm index 45db504a997..27e41629561 100644 --- a/code/modules/jobs/job_types/detective.dm +++ b/code/modules/jobs/job_types/detective.dm @@ -8,7 +8,6 @@ total_positions = 1 spawn_positions = 1 supervisors = SUPERVISOR_HOS - selection_color = "#ffeeee" minimal_player_age = 7 exp_requirements = 300 exp_required_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/geneticist.dm b/code/modules/jobs/job_types/geneticist.dm index 6d09163d51f..1c11925bcd3 100644 --- a/code/modules/jobs/job_types/geneticist.dm +++ b/code/modules/jobs/job_types/geneticist.dm @@ -6,7 +6,6 @@ total_positions = 2 spawn_positions = 2 supervisors = SUPERVISOR_RD - selection_color = "#ffeeff" exp_requirements = 60 exp_required_type = EXP_TYPE_CREW exp_granted_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 8444c401e06..6ec118df9d1 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -9,7 +9,6 @@ total_positions = 1 spawn_positions = 1 supervisors = SUPERVISOR_HOP - selection_color = "#ddddff" req_admin_notify = 1 minimal_player_age = 10 exp_requirements = 180 diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index b91dee443de..e9994ec122e 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -9,7 +9,6 @@ total_positions = 1 spawn_positions = 1 supervisors = SUPERVISOR_CAPTAIN - selection_color = "#ffdddd" req_admin_notify = 1 minimal_player_age = 14 exp_requirements = 300 diff --git a/code/modules/jobs/job_types/janitor.dm b/code/modules/jobs/job_types/janitor.dm index c5350e14ab3..d946fe9e93e 100644 --- a/code/modules/jobs/job_types/janitor.dm +++ b/code/modules/jobs/job_types/janitor.dm @@ -6,7 +6,6 @@ total_positions = 2 spawn_positions = 1 supervisors = SUPERVISOR_HOP - selection_color = "#bbe291" exp_granted_type = EXP_TYPE_CREW config_tag = "JANITOR" diff --git a/code/modules/jobs/job_types/lawyer.dm b/code/modules/jobs/job_types/lawyer.dm index 431fca96f32..38d55e85c28 100644 --- a/code/modules/jobs/job_types/lawyer.dm +++ b/code/modules/jobs/job_types/lawyer.dm @@ -7,7 +7,6 @@ total_positions = 2 spawn_positions = 2 supervisors = SUPERVISOR_HOP - selection_color = "#bbe291" exp_granted_type = EXP_TYPE_CREW config_tag = "LAWYER" diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index 1662d6ba744..e8f064fd545 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -7,7 +7,6 @@ total_positions = 5 spawn_positions = 3 supervisors = SUPERVISOR_CMO - selection_color = "#ffeef0" exp_granted_type = EXP_TYPE_CREW config_tag = "MEDICAL_DOCTOR" diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm index fb421d4d133..dd6240e75a5 100644 --- a/code/modules/jobs/job_types/mime.dm +++ b/code/modules/jobs/job_types/mime.dm @@ -6,7 +6,6 @@ total_positions = 1 spawn_positions = 1 supervisors = SUPERVISOR_HOP - selection_color = "#bbe291" exp_granted_type = EXP_TYPE_CREW config_tag = "MIME" diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm index f84b1e7c138..608cfb7ba0d 100644 --- a/code/modules/jobs/job_types/paramedic.dm +++ b/code/modules/jobs/job_types/paramedic.dm @@ -7,7 +7,6 @@ total_positions = 2 spawn_positions = 2 supervisors = SUPERVISOR_CMO - selection_color = "#ffeef0" exp_granted_type = EXP_TYPE_CREW config_tag = "PARAMEDIC" diff --git a/code/modules/jobs/job_types/prisoner.dm b/code/modules/jobs/job_types/prisoner.dm index ea62b64e964..3fc56fa1b68 100644 --- a/code/modules/jobs/job_types/prisoner.dm +++ b/code/modules/jobs/job_types/prisoner.dm @@ -6,7 +6,6 @@ total_positions = 0 spawn_positions = 2 supervisors = "the security team" - selection_color = "#ffe1c3" exp_granted_type = EXP_TYPE_CREW paycheck = PAYCHECK_LOWER config_tag = "PRISONER" diff --git a/code/modules/jobs/job_types/psychologist.dm b/code/modules/jobs/job_types/psychologist.dm index 18e47208ae5..b39babc0045 100644 --- a/code/modules/jobs/job_types/psychologist.dm +++ b/code/modules/jobs/job_types/psychologist.dm @@ -7,7 +7,6 @@ total_positions = 1 spawn_positions = 1 supervisors = "the Head of Personnel and the Chief Medical Officer" - selection_color = "#bbe291" exp_granted_type = EXP_TYPE_CREW config_tag = "PSYCHOLOGIST" diff --git a/code/modules/jobs/job_types/quartermaster.dm b/code/modules/jobs/job_types/quartermaster.dm index 9d755caaa44..0d755c14865 100644 --- a/code/modules/jobs/job_types/quartermaster.dm +++ b/code/modules/jobs/job_types/quartermaster.dm @@ -10,7 +10,6 @@ spawn_positions = 1 minimal_player_age = 7 supervisors = SUPERVISOR_CAPTAIN - selection_color = "#d7b088" exp_required_type_department = EXP_TYPE_SUPPLY exp_granted_type = EXP_TYPE_CREW config_tag = "QUARTERMASTER" diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm index 06d1d4479b2..8dd3c92d213 100644 --- a/code/modules/jobs/job_types/research_director.dm +++ b/code/modules/jobs/job_types/research_director.dm @@ -10,7 +10,6 @@ total_positions = 1 spawn_positions = 1 supervisors = SUPERVISOR_CAPTAIN - selection_color = "#ffddff" req_admin_notify = 1 minimal_player_age = 7 exp_required_type_department = EXP_TYPE_SCIENCE diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm index 2b6bbe9d012..83e3bd7395d 100644 --- a/code/modules/jobs/job_types/roboticist.dm +++ b/code/modules/jobs/job_types/roboticist.dm @@ -6,7 +6,6 @@ total_positions = 2 spawn_positions = 2 supervisors = SUPERVISOR_RD - selection_color = "#ffeeff" exp_requirements = 60 exp_required_type = EXP_TYPE_CREW exp_granted_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/scientist.dm b/code/modules/jobs/job_types/scientist.dm index 7dfe2621ff7..709d4b76c87 100644 --- a/code/modules/jobs/job_types/scientist.dm +++ b/code/modules/jobs/job_types/scientist.dm @@ -6,7 +6,6 @@ total_positions = 5 spawn_positions = 3 supervisors = SUPERVISOR_RD - selection_color = "#ffeeff" exp_requirements = 60 exp_required_type = EXP_TYPE_CREW exp_granted_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 3ad3fe7de16..cd258484260 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -8,7 +8,6 @@ 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)" - selection_color = "#ffeeee" minimal_player_age = 7 exp_requirements = 300 exp_required_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index 9afd4f4f34c..b566713ca60 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -7,7 +7,6 @@ total_positions = 3 spawn_positions = 3 supervisors = SUPERVISOR_QM - selection_color = "#dcba97" exp_granted_type = EXP_TYPE_CREW config_tag = "SHAFT_MINER" diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm index 26e413add01..5c1420c6787 100644 --- a/code/modules/jobs/job_types/station_engineer.dm +++ b/code/modules/jobs/job_types/station_engineer.dm @@ -7,7 +7,6 @@ total_positions = 5 spawn_positions = 5 supervisors = SUPERVISOR_CE - selection_color = "#fff5cc" exp_requirements = 60 exp_required_type = EXP_TYPE_CREW exp_granted_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/virologist.dm b/code/modules/jobs/job_types/virologist.dm index 5f33a9e98fb..a844b8abcdc 100644 --- a/code/modules/jobs/job_types/virologist.dm +++ b/code/modules/jobs/job_types/virologist.dm @@ -7,7 +7,6 @@ total_positions = 1 spawn_positions = 1 supervisors = SUPERVISOR_CMO - selection_color = "#ffeef0" exp_requirements = 60 exp_required_type = EXP_TYPE_CREW exp_granted_type = EXP_TYPE_CREW diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index 21307c6bdf4..2179908c57d 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -9,7 +9,6 @@ total_positions = 1 spawn_positions = 1 supervisors = SUPERVISOR_HOS - selection_color = "#ffeeee" minimal_player_age = 7 exp_requirements = 300 exp_required_type = EXP_TYPE_CREW