mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-25 14:08:31 +01:00
[SEMI-MODULAR] Brings back custom Ash Walkers and Primal Podpeople, also fixes job banned species checks (#8665)
* initial commit * whoops hahah you don't need that comment * species check on the prefs menu * species check actually works now, podpeople quirks * goof was right
This commit is contained in:
@@ -45,6 +45,7 @@
|
||||
data["job_preferences"] = preferences.job_preferences
|
||||
// SKYRAT EDIT
|
||||
data["job_alt_titles"] = preferences.alt_job_titles
|
||||
data["species_restricted_jobs"] = get_unavailable_jobs_for_species()
|
||||
// SKYRAT EDIT END
|
||||
|
||||
return data
|
||||
@@ -99,3 +100,16 @@
|
||||
data += job.title
|
||||
|
||||
return data
|
||||
|
||||
//SKYRAT EDIT ADDITION BEGIN - CHECKING FOR INCOMPATIBLE SPECIES
|
||||
//This returns a list of jobs that are unavailable for the player's current species
|
||||
/datum/preference_middleware/jobs/proc/get_unavailable_jobs_for_species()
|
||||
var/list/data = list()
|
||||
|
||||
for (var/datum/job/job as anything in SSjob.all_occupations)
|
||||
if (job.has_banned_species(preferences))
|
||||
data += job.title
|
||||
|
||||
return data
|
||||
|
||||
//SKYRAT EDIT ADDITION END
|
||||
|
||||
@@ -24,6 +24,11 @@
|
||||
for (var/species_id in get_selectable_species())
|
||||
values += GLOB.species_list[species_id]
|
||||
|
||||
//SKYRAT EDIT ADDITION
|
||||
for (var/species_id in get_customizable_races())
|
||||
values += GLOB.species_list[species_id]
|
||||
//SKYRAT EDIT END
|
||||
|
||||
return values
|
||||
|
||||
/datum/preference/choiced/species/apply_to_human(mob/living/carbon/human/target, value, datum/preferences/prefs)
|
||||
@@ -49,7 +54,7 @@
|
||||
|
||||
var/list/food_flags = FOOD_FLAGS
|
||||
|
||||
for (var/species_id in get_selectable_species())
|
||||
for (var/species_id in (get_selectable_species() + get_customizable_races())) //SKYRAT EDIT CHANGE - ORIGINAL: for (var/species_id in get_selectable_species())
|
||||
var/species_type = GLOB.species_list[species_id]
|
||||
var/datum/species/species = new species_type
|
||||
|
||||
|
||||
Reference in New Issue
Block a user