cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 04:22:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement species-based age restriction for jobs (#13806)

Browse Source
This commit is contained in:
Wildkins
2022-05-10 12:59:02 +02:00
committed by GitHub
parent 0957452e58
commit 09b6aa747f
14 changed files with 268 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/occupation/occupation.dm
+2 -2
View File
@@ -179,7 +179,7 @@
dat += "<del>[dispRank]</del></td><td> \[IN [(available_in_days)] DAYS]</td></tr>"
continue
else if(!LAZYLEN(pref.GetValidTitles(job))) // we have no available jobs the character is old enough for
dat += "<del>[dispRank]</del></td><td> \[MINIMUM AGE: [LAZYLEN(job.alt_ages) ? min(job.alt_ages[min(job.alt_ages)], job.minimum_character_age) : job.minimum_character_age]]</td></tr>"
dat += "<del>[dispRank]</del></td><td> \[MINIMUM AGE: [LAZYLEN(job.alt_ages) ? min(job.get_alt_character_age(), job.get_minimum_character_age(user.get_species())) : job.get_minimum_character_age(user.get_species())]]</td></tr>"
continue
else if (ban_reason)
dat += "<del>[dispRank]</del></td><td><b> \[<a href='?src=\ref[user.client];view_jobban=[rank];'>BANNED</a>]</b></td></tr>"
@@ -464,7 +464,7 @@
if((global.all_species[src.species].spawn_flags & NO_AGE_MINIMUM))
return choices
for(var/t in choices)
if (src.age >= (LAZYACCESS(job.alt_ages, t) || job.minimum_character_age))
if (src.age >= (job.get_alt_character_age(t) || job.get_minimum_character_age(species)))
continue
choices -= t
return choices