From ebd8640a52e313126fe2609d3b62b416b48e9612 Mon Sep 17 00:00:00 2001
From: Alberyk <Alberyk@users.noreply.github.com>
Date: Mon, 6 Jan 2020 17:54:44 -0300
Subject: [PATCH] Fixes age restrictions not working when jobs were restricted
 by species (#7931)

- fixes #7928
---
 .../client/preference_setup/occupation/occupation.dm   | 10 +++++-----
 html/changelogs/alberyk-restrictionjob.yml             |  6 ++++++
 2 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 html/changelogs/alberyk-restrictionjob.yml

diff --git a/code/modules/client/preference_setup/occupation/occupation.dm b/code/modules/client/preference_setup/occupation/occupation.dm
index 9854b4b6202..fdf9152ab26 100644
--- a/code/modules/client/preference_setup/occupation/occupation.dm
+++ b/code/modules/client/preference_setup/occupation/occupation.dm
@@ -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
diff --git a/html/changelogs/alberyk-restrictionjob.yml b/html/changelogs/alberyk-restrictionjob.yml
new file mode 100644
index 00000000000..b192f7fb779
--- /dev/null
+++ b/html/changelogs/alberyk-restrictionjob.yml
@@ -0,0 +1,6 @@
+author: Alberyk
+
+delete-after: True
+
+changes: 
+  - bugfix: "Fixed age restrictions not working when jobs were restricted by species."