cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 09:02:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Factions may now have their own specific job blacklists for species + some blacklists (#9532)

Browse Source 
* Factions may now have their own specific job blacklists for species.

* Fixes CL blacklists for NT, EPMC, Heph, Idris, Zavod and Zeng-Hu

* Update changelog.

Co-authored-by: ParadoxSpace <takyahasu@gmail.com>
This commit is contained in:
mikomyazaki
2020-08-20 21:27:15 +01:00
committed by GitHub
parent 1a21676536
commit 4e0e08c447
11 changed files with 91 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/modules/client/preference_setup/occupation/occupation.dm
View File

@@ -281,10 +281,20 @@
/datum/category_item/player_setup_item/occupation/proc/sanitize_faction()
if (!SSjobs.name_factions[pref.faction])
pref.faction = SSjobs.default_faction.name
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>")
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!"))
ResetJobs()
return TOPIC_REFRESH_UPDATE_PREVIEW
var/datum/faction/faction = SSjobs.name_factions[pref.faction]
for(var/datum/job/job in faction.get_occupations())
for(var/department = 1 to NUM_JOB_DEPTS)
if(pref.GetJobDepartment(job, department) & job.flag)
if(pref.species in job.blacklisted_species)
to_client_chat(SPAN_DANGER("Your faction selection does not permit this species-occupation combination, [pref.species] as [job.title]."))
to_client_chat(SPAN_DANGER("Your jobs have been reset due to this!"))
ResetJobs()
return TOPIC_REFRESH_UPDATE_PREVIEW
/datum/category_item/player_setup_item/occupation/proc/SetPlayerAltTitle(datum/job/job, new_title)
// remove existing entry