cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-19 03:49:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Alt Title Age Requirements (#7130)

Browse Source 
Job age requirements now take into account alt titles. Alt titles are automatically limited to only ones a character is old enough for.
    The latejoin screen now shows what alt-title you have selected.
    The occupation preferences screen now functions differently if only one alt-title is available, or if the base job is not available.
    Tidies up the job age requirement system.
This commit is contained in:
MarinaGryphon
2019-10-09 15:07:52 -05:00
committed by Erki
parent 9fe517f4b6
commit 300d0fc8d8
6 changed files with 53 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/abstract/new_player/new_player.dm
+3 -5
View File
@@ -283,9 +283,7 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player)
if (!(job.type in faction.allowed_role_types))
return FALSE
var/character_age = client.prefs.age
var/datum/species/species = global.all_species[client.prefs.species]
if((character_age < job.minimum_character_age) && !(species.spawn_flags & NO_AGE_MINIMUM))
if(!(rank in client.prefs.GetValidTitles(job))) // does age/species check for us!
return FALSE
return TRUE
@@ -388,9 +386,9 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player)
var/active = 0
// Only players with the job assigned and AFK for less than 10 minutes count as active
for(var/mob/M in player_list) //Added isliving check here, so it won't check ghosts and qualify them as active
if(isliving(M) && M.mind && M.client && M.mind.assigned_role == job.title && M.client.inactivity <= 10 * 60 * 10)
if(isliving(M) && M.mind && M.client && M.mind.assigned_role == job.title && M.client.inactivity <= 10 MINUTES)
active++
dat += "<a href='byond://?src=\ref[src];SelectedJob=[job.title]'>[job.title] ([job.current_positions]) (Active: [active])</a><br>"
dat += "<a href='byond://?src=\ref[src];SelectedJob=[job.title]'>[client.prefs.GetPlayerAltTitle(job)] ([job.current_positions]) (Active: [active])</a><br>"
dat += "</center>"
send_theme_resources(src)