diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index d1f5deae4c..dd856bc615 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -58,7 +58,6 @@ "Engine Technician" = /datum/alt_title/engine_tech, "Electrician" = /datum/alt_title/electrician) minimal_player_age = 3 - minimum_character_age = 1 min_age_by_species = list(SPECIES_PROMETHEAN = 2) outfit_type = /decl/hierarchy/outfit/job/engineering/engineer @@ -99,7 +98,6 @@ minimal_access = list(access_eva, access_engine, access_atmospherics, access_maint_tunnels, access_emergency_storage, access_construction, access_external_airlocks) minimal_player_age = 3 - minimum_character_age = 1 min_age_by_species = list(SPECIES_PROMETHEAN = 2) outfit_type = /decl/hierarchy/outfit/job/engineering/atmos diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index eac19f5cee..6413e050f7 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -61,7 +61,6 @@ "Nurse" = /datum/alt_title/nurse, "Virologist" = /datum/alt_title/virologist) - minimum_character_age = 1 min_age_by_species = list(SPECIES_PROMETHEAN = 3) //Medical Doctor Alt Titles @@ -109,7 +108,6 @@ access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics) minimal_access = list(access_medical, access_medical_equip, access_chemistry) minimal_player_age = 3 - minimum_character_age = 0 min_age_by_species = list(SPECIES_PROMETHEAN = 3) outfit_type = /decl/hierarchy/outfit/job/medical/chemist @@ -196,7 +194,6 @@ alt_titles = list("Emergency Medical Technician" = /datum/alt_title/emt) banned_job_species = list(SPECIES_DIONA) - minimum_character_age = 1 min_age_by_species = list(SPECIES_PROMETHEAN = 2) // Paramedic Alt Titles diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index b1b3a2558c..e44eee5a8a 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -107,7 +107,6 @@ banned_job_species = list("digital") minimal_player_age = 14 - minimum_character_age = 1 min_age_by_species = list(SPECIES_PROMETHEAN = 2) outfit_type = /decl/hierarchy/outfit/job/science/xenobiologist @@ -138,7 +137,6 @@ access = list(access_robotics, access_tox, access_tox_storage, access_tech_storage, access_morgue, access_research) //As a job that handles so many corpses, it makes sense for them to have morgue access. minimal_access = list(access_robotics, access_tech_storage, access_morgue, access_research) //As a job that handles so many corpses, it makes sense for them to have morgue access. minimal_player_age = 7 - minimum_character_age = 1 min_age_by_species = list(SPECIES_PROMETHEAN = 2) banned_job_species = list("digital") diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 6cab6a65f1..7e5dee4e6f 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -125,7 +125,6 @@ No one is above the Law, not Security or Command." alt_titles = list("Junior Officer" = /datum/alt_title/junior_officer) - minimum_character_age = 1 min_age_by_species = list(SPECIES_PROMETHEAN = 3) // Security Officer Alt Titles diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 146ecf5a2e..a6891ea628 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -54,7 +54,7 @@ var/global/datum/controller/occupations/job_master var/datum/job/job = GetJob(rank) if(!job) return 0 - if(job.minimum_character_age && (player.client.prefs.age < job.get_min_age(player.client.prefs.species, player.client.prefs.organ_data["brain"]))) + if((job.minimum_character_age || job.min_age_by_species) && (player.client.prefs.age < job.get_min_age(player.client.prefs.species, player.client.prefs.organ_data["brain"]))) return 0 if(jobban_isbanned(player, rank)) return 0 @@ -111,7 +111,7 @@ var/global/datum/controller/occupations/job_master if(!job) continue - if(job.minimum_character_age && (player.client.prefs.age < job.get_min_age(player.client.prefs.species, player.client.prefs.organ_data["brain"]))) + if((job.minimum_character_age || job.min_age_by_species) && (player.client.prefs.age < job.get_min_age(player.client.prefs.species, player.client.prefs.organ_data["brain"]))) continue if(job.is_species_banned(player.client.prefs.species, player.client.prefs.organ_data["brain"]) == TRUE) diff --git a/code/modules/client/preference_setup/occupation/occupation.dm b/code/modules/client/preference_setup/occupation/occupation.dm index 95e0d02524..b9ffcb32e8 100644 --- a/code/modules/client/preference_setup/occupation/occupation.dm +++ b/code/modules/client/preference_setup/occupation/occupation.dm @@ -126,7 +126,7 @@ if(job.is_species_banned(user.client.prefs.species, user.client.prefs.organ_data["brain"]) == TRUE) . += "[rank] \[THIS RACE/BRAIN TYPE CANNOT TAKE THIS ROLE.\]" continue - if(job.minimum_character_age && user.client && (user.client.prefs.age < job.get_min_age(user.client.prefs.species, user.client.prefs.organ_data["brain"]))) + if((job.minimum_character_age || job.min_age_by_species) && user.client && (user.client.prefs.age < job.get_min_age(user.client.prefs.species, user.client.prefs.organ_data["brain"]))) . += "[rank] \[MINIMUM CHARACTER AGE FOR SELECTED RACE/BRAIN TYPE: [job.get_min_age(user.client.prefs.species, user.client.prefs.organ_data["brain"])]\]" continue if((pref.job_civilian_low & ASSISTANT) && job.type != /datum/job/assistant) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 47ba7d669f..a2c074d6a5 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -494,7 +494,7 @@ for(var/datum/job/job in job_master.occupations) if(job && IsJobAvailable(job.title)) // Checks for jobs with minimum age requirements - if(job.minimum_character_age && (client.prefs.age < job.get_min_age(client.prefs.species, client.prefs.organ_data["brain"]))) + if((job.minimum_character_age || job.min_age_by_species) && (client.prefs.age < job.get_min_age(client.prefs.species, client.prefs.organ_data["brain"]))) continue // Checks for jobs set to "Never" in preferences //TODO: Figure out a better way to check for this if(!(client.prefs.GetJobDepartment(job, 1) & job.flag)) diff --git a/maps/southern_cross/southern_cross_jobs.dm b/maps/southern_cross/southern_cross_jobs.dm index 5978af3f3e..2f379dcb2e 100644 --- a/maps/southern_cross/southern_cross_jobs.dm +++ b/maps/southern_cross/southern_cross_jobs.dm @@ -109,7 +109,6 @@ var/const/access_explorer = 43 economic_modifier = 4 access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_eva, access_maint_tunnels, access_external_airlocks, access_psychiatrist, access_explorer) minimal_access = list(access_medical, access_medical_equip, access_morgue, access_explorer) - minimum_character_age = 1 min_age_by_species = list(SPECIES_PROMETHEAN = 2) outfit_type = /decl/hierarchy/outfit/job/medical/sar