Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Mosley
2024-11-21 22:44:41 -05:00
26 changed files with 522 additions and 237 deletions
@@ -610,15 +610,14 @@
var/command_bold = ""
if(job in GLOB.command_positions)
command_bold = " command"
//Sandstorm changes
var/jobline = "[job_datum.title]"
if(job_datum in SSjob.prioritized_jobs)
jobline = "<span class='priority'>[jobline]</span>"
if(client && client.prefs && client.prefs.alt_titles_preferences[job_datum.title])
jobline = "[jobline]<br><span style='color:#BBBBBB; font-style: italic;'>(as [client.prefs.alt_titles_preferences[job_datum.title]])</span>"
jobline = "<a class='job[command_bold]' style='display:block;width:170px' href='byond://?src=[REF(src)];SelectedJob=[job_datum.title]'>[jobline] ([num_positions_current]/[num_positions_total])</a>"
dept_dat += jobline
//End of Sandstorm changes
dept_dat += "<a class='job[command_bold]' style='display:block;width:170px' href='byond://?src=[REF(src)];SelectedJob=[job_datum.title]'><span class='priority'>[job_datum.title] ([num_positions_current]/[num_positions_total])</span>"
else
dept_dat += "<a class='job[command_bold]' style='display:block;width:170px' href='byond://?src=[REF(src)];SelectedJob=[job_datum.title]'>[job_datum.title] ([num_positions_current]/[num_positions_total])"
if(client && client.prefs && client?.prefs?.alt_titles_preferences[job_datum.title])
dept_dat += "<br><span style='color:#BBBBBB; font-style: italic;'>as [client?.prefs?.alt_titles_preferences[job_datum.title]]</span>"
dept_dat += "</a>"
if(!dept_dat.len)
dept_dat += "<span class='nopositions'>No positions open.</span>"
dat += jointext(dept_dat, "")