cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 01:34:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Job refactor 2: less hardcoded lists (#60578)

Browse Source 
* Job refactor 2: less hardcoded lists

* Obsessed can happen
This commit is contained in:
Rohesie
2021-08-05 16:13:05 -03:00
committed by GitHub
parent 392a74693d
commit 6c4134d1ea
67 changed files with 644 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/client/preferences.dm
View File

@@ -913,7 +913,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/datum/job/lastJob
var/datum/job/overflow_role = SSjob.GetJobType(SSjob.overflow_role)
for(var/datum/job/job as anything in sortList(SSjob.joinable_occupations, /proc/cmp_job_display_asc))
for(var/datum/job/job as anything in SSjob.joinable_occupations)
index += 1
if(index >= limit)
@@ -942,7 +942,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if((job_preferences[overflow_role.title] == JP_LOW) && (rank != overflow_role.title) && !is_banned_from(user.ckey, overflow_role.title))
HTML += "<font color=orange>[rank]</font></td><td></td></tr>"
continue
if((rank in GLOB.command_positions) || (rank == "AI"))//Bold head jobs
if(job.job_flags & JOB_BOLD_SELECT_TEXT)//Bold head jobs
HTML += "<b><span class='dark'>[rank]</span></b>"
else
HTML += "<span class='dark'>[rank]</span>"
@@ -1964,7 +1964,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
/datum/preferences/proc/should_be_random_hardcore(datum/job/job, datum/mind/mind)
if(!randomise[RANDOM_HARDCORE])
return FALSE
if(job.departments & DEPARTMENT_COMMAND) //No command staff
if(job.departments_bitflags & DEPARTMENT_BITFLAG_COMMAND) //No command staff
return FALSE
for(var/datum/antagonist/antag as anything in mind.antag_datums)
if(antag.get_team()) //No team antags