Revert "Necropolis IPCs (#8334)" (#8369)

code/game/jobs/faction/eridani.dm

@@ -49,14 +49,6 @@
 		"Corporate Liaison" = /datum/outfit/job/representative/eridani
 	)
 
-	job_species_blacklist = list(
-		"Corporate Liaison" = list(
-			"Tajara",
-			"M'sai Tajara",
-			"Zhan-Khazan Tajara"
-		)
-	)
-
 /datum/outfit/job/officer/eridani
 	name = "Security Officer - Eridani"
 	uniform = /obj/item/clothing/under/rank/security/eridani

code/game/jobs/faction/faction.dm

@@ -5,7 +5,6 @@
 
 	var/list/allowed_role_types
 	var/list/allowed_species_types
-	var/list/job_species_blacklist //will override the normal job species list for a member of this faction
 
 	var/is_default = FALSE
 
@@ -26,10 +25,7 @@
 	. = list()
 
 	for (var/path in allowed_role_types)
-		var/datum/job/role = SSjobs.type_occupations[path]
-		if(LAZYACCESS(job_species_blacklist, role.title))
-			role.blacklisted_species = job_species_blacklist[role.title]
-		. += role
+		. += SSjobs.type_occupations[path]
 
 /datum/faction/proc/get_selection_error(datum/preferences/prefs)
 	if (!length(allowed_species_types))
@@ -64,4 +60,4 @@
 			objective = pick("Collect [rand(3,7)] pictures of secure station areas",
 							"Make sure that [rand(2,4)] complaints related to contractors are solved on the station")
 
-	return objective
+	return objective

code/game/jobs/faction/hephaestus.dm

@@ -66,14 +66,6 @@
 		"Corporate Liaison" = /datum/outfit/job/representative/hephaestus
 	)
 
-	job_species_blacklist = list(
-		"Corporate Liaison" = list(
-			"Tajara",
-			"M'sai Tajara",
-			"Zhan-Khazan Tajara"
-		)
-	)
-
 /datum/outfit/job/engineer/hephaestus
 	name = "Station Engineer - Hephaestus"
 	uniform = /obj/item/clothing/under/rank/hephaestus

code/game/jobs/faction/idris.dm

@@ -66,14 +66,6 @@
 		"Corporate Liaison" = /datum/outfit/job/representative/idris
 	)
 
-	job_species_blacklist = list(
-		"Corporate Liaison" = list(
-			"Tajara",
-			"M'sai Tajara",
-			"Zhan-Khazan Tajara"
-		)
-	)
-
 /datum/outfit/job/officer/idris
 	name = "Security Officer - Idris"
 	uniform = /obj/item/clothing/under/rank/security/idris

code/game/jobs/faction/necropolis.dm

@@ -48,8 +48,7 @@
 		/datum/species/human,
 		/datum/species/skrell,
 		/datum/species/unathi,
-		/datum/species/diona,
-		/datum/species/machine
+		/datum/species/diona
 	)
 
 	titles_to_loadout = list(
@@ -73,20 +72,6 @@
 		"Corporate Liaison" = /datum/outfit/job/representative/necropolis
 	)
 
-	job_species_blacklist = list(
-		"Corporate Liaison" = list(
-			"Baseline Frame",
-			"Hephaestus G1 Industrial Frame",
-			"Hephaestus G2 Industrial Frame",
-			"Xion Industrial Frame",
-			"Zeng-Hu Mobility Frame",
-			"Bishop Accessory Frame",
-			"Shell Frame"
-		)
-	)
-
-
-
 /datum/outfit/job/officer/necropolis
 	name = "Security Officer - Necropolis"
 	uniform = /obj/item/clothing/under/rank/security/necropolis

code/modules/client/preference_setup/occupation/occupation.dm

@@ -284,17 +284,10 @@
 	if (!SSjobs.name_factions[pref.faction])
 		pref.faction = SSjobs.default_faction.name
 
-		to_client_chat(SPAN_DANGER("Your faction selection has been reset to [pref.faction]."))
-		to_client_chat(SPAN_DANGER("Your jobs have been reset due to this!"))
+		to_client_chat("<span class='danger'>Your faction selection has been reset to [pref.faction].</span>")
+		to_client_chat("<span class='danger'>Your jobs have been reset due to this!</span>")
 		ResetJobs()
 
-	var/datum/faction/faction = SSjobs.name_factions[pref.faction]
-	for(var/datum/job/job in faction.get_occupations())
-		if(pref.species in job.blacklisted_species)
-			to_client_chat(SPAN_DANGER("Your faction selection does not permit this species-occupation combination."))
-			to_client_chat(SPAN_DANGER("Your jobs have been reset due to this!"))
-			ResetJobs()
-
 /datum/category_item/player_setup_item/occupation/proc/SetPlayerAltTitle(datum/job/job, new_title)
 	// remove existing entry
 	pref.player_alt_titles -= job.title