From 19b9164ec05f30146eff5d23f0afc00d8f5e4324 Mon Sep 17 00:00:00 2001 From: Casey Date: Wed, 27 Oct 2021 12:38:56 -0400 Subject: [PATCH 1/2] Merge pull request #11702 from Heroman3003/beyond-18-plus Brings back character age restrictions for certain roles --- code/game/jobs/job/job.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index c28268b09d..509572aa98 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -166,11 +166,12 @@ ///Assigns minimum age by race & brain type. Code says Positronic = mechanical and Drone = digital because nothing can be simple. ///Will first check based on brain type, then based on species. /datum/job/proc/get_min_age(species_name, brain_type) - return 18 // VOREStation Edit - Minimum character age by rules anyway, might as well return 18 instead of 0 or 1 or whatever. - //return (brain_type && LAZYACCESS(min_age_by_species, brain_type)) || LAZYACCESS(min_age_by_species, species_name) || minimum_character_age //VOREStation Edit + return minimum_character_age // VOREStation Edit - Minimum character age by rules is 18, return default which is standard for all species + //return (brain_type && LAZYACCESS(min_age_by_species, brain_type)) || LAZYACCESS(min_age_by_species, species_name) || minimum_character_age //VOREStation Removal /datum/job/proc/get_ideal_age(species_name, brain_type) - return (brain_type && LAZYACCESS(ideal_age_by_species, brain_type)) || LAZYACCESS(ideal_age_by_species, brain_type) || ideal_character_age + return ideal_character_age // VOREStation Edit - Minimum character age by rules is 18, return default which is standard for all species + //return (brain_type && LAZYACCESS(ideal_age_by_species, brain_type)) || LAZYACCESS(ideal_age_by_species, brain_type) || ideal_character_age //VOREStation Removal /datum/job/proc/is_species_banned(species_name, brain_type) return FALSE // VOREStation Edit - Any species can be any job.