From 5b3f6dca2968bc98a852428b8f36fd383b6a7d3e Mon Sep 17 00:00:00 2001
From: JTGSZ <46565256+JTGSZ@users.noreply.github.com>
Date: Mon, 23 Sep 2019 23:58:57 -0400
Subject: [PATCH] Species Job Check

---
 code/controllers/subsystem/job.dm               | 11 +++++++++++
 code/modules/client/preferences.dm              |  6 ++++++
 code/modules/mob/living/carbon/human/species.dm |  8 ++++----
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
index a0d9226e14..ea7e7ce812 100644
--- a/code/controllers/subsystem/job.dm
+++ b/code/controllers/subsystem/job.dm
@@ -110,6 +110,9 @@ SUBSYSTEM_DEF(job)
 		if(job.required_playtime_remaining(player.client))
 			JobDebug("FOC player not enough xp, Player: [player]")
 			continue
+		if(!player.client.prefs.pref_species.qualifies_for_rank(job.title, player.client.prefs.features))
+			JobDebug("FOC non-human failed, Player: [player]")
+			continue
 		if(flag && (!(flag in player.client.prefs.be_special)))
 			JobDebug("FOC flag failed, Player: [player], Flag: [flag], ")
 			continue
@@ -145,6 +148,10 @@ SUBSYSTEM_DEF(job)
 			JobDebug("GRJ player not old enough, Player: [player]")
 			continue
 
+		if(!player.client.prefs.pref_species.qualifies_for_rank(job.title, player.client.prefs.features))
+			JobDebug("GRJ non-human failed, Player: [player]")
+			continue
+
 		if(job.required_playtime_remaining(player.client))
 			JobDebug("GRJ player not enough xp, Player: [player]")
 			continue
@@ -327,6 +334,10 @@ SUBSYSTEM_DEF(job)
 				if(job.required_playtime_remaining(player.client))
 					JobDebug("DO player not enough xp, Player: [player], Job:[job.title]")
 					continue
+			
+				if(!player.client.prefs.pref_species.qualifies_for_rank(job.title, player.client.prefs.features))
+					JobDebug("DO non-human failed, Player: [player], Job:[job.title]")
+					continue
 
 				if(player.mind && job.title in player.mind.restricted_roles)
 					JobDebug("DO incompatible with antagonist role, Player: [player], Job:[job.title]")
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index f9fc7b9221..ae6de5ba05 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1039,6 +1039,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				var/available_in_days = job.available_in_days(user.client)
 				HTML += "<font color=red>[rank]</font></td><td><font color=red> \[IN [(available_in_days)] DAYS\]</font></td></tr>"
 				continue
+			if(!user.client.prefs.pref_species.qualifies_for_rank(rank, user.client.prefs.features))
+				if(user.client.prefs.pref_species.id == "human")
+					HTML += "<font color=red>[rank]</font></td><td><font color=red><b> \[MUTANT\]</b></font></td></tr>"
+				else
+					HTML += "<font color=red>[rank]</font></td><td><font color=red><b> \[NON-HUMAN\]</b></font></td></tr>"
+				continue
 			if((job_preferences["[SSjob.overflow_role]"] == JP_LOW) && (rank != SSjob.overflow_role) && !jobban_isbanned(user, SSjob.overflow_role))
 				HTML += "<font color=orange>[rank]</font></td><td></td></tr>"
 				continue
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index c23ca34188..d2e8cab240 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -133,10 +133,10 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	return
 
 //Please override this locally if you want to define when what species qualifies for what rank if human authority is enforced.
-/datum/species/proc/qualifies_for_rank(rank, list/features)
-	if(rank in GLOB.command_positions)
-		return 0
-	return 1
+/datum/species/proc/qualifies_for_rank(rank, list/features) //SPECIES JOB RESTRICTIONS
+	//if(rank in GLOB.command_positions) Left as an example: The format qualifies for rank takes.
+	//	return 0 //It returns false when it runs the proc so they don't get jobs from the global list.
+	return 1 //It returns 1 to say they are a-okay to continue.
 
 //Will regenerate missing organs
 /datum/species/proc/regenerate_organs(mob/living/carbon/C,datum/species/old_species,replace_current=TRUE)