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

Fixes age restrictions not working when jobs were restricted by species (#7931)

Browse Source 
- fixes #7928
This commit is contained in:
Alberyk
2020-01-06 22:54:44 +02:00
committed by Erki
parent e831268dff
commit ebd8640a52
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/occupation/occupation.dm
+5 -5
View File
@@ -175,11 +175,6 @@
if(ban_reason == "WHITELISTED")
dat += "<del>[dispRank]</del></td><td><b> \[WHITELISTED]</b></td></tr>"
continue
else if(job.blacklisted_species) // check for restricted species
var/datum/species/S = all_species[pref.species]
if(S.name in job.blacklisted_species)
dat += "<del>[dispRank]</del></td><td><b> \[SPECIES RESTRICTED]</b></td></tr>"
continue
else if (ban_reason == "AGE WHITELISTED")
var/available_in_days = player_old_enough_for_role(user.client, rank)
dat += "<del>[dispRank]</del></td><td> \[IN [(available_in_days)] DAYS]</td></tr>"
@@ -190,6 +185,11 @@
else if (ban_reason)
dat += "<del>[dispRank]</del></td><td><b> \[<a href='?src=\ref[user.client];view_jobban=\ref[rank];'>BANNED</a>]</b></td></tr>"
continue
if(job.blacklisted_species) // check for restricted species
var/datum/species/S = all_species[pref.species]
if(S.name in job.blacklisted_species)
dat += "<del>[dispRank]</del></td><td><b> \[SPECIES RESTRICTED]</b></td></tr>"
continue
if((pref.job_civilian_low & ASSISTANT) && (rank != "Assistant"))
dat += "<font color=orange>[dispRank]</font></td><td></td></tr>"
continue