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
+3 -5
View File
@@ -477,12 +477,10 @@ SUBSYSTEM_DEF(job)
else
handle_auto_deadmin_roles(M.client, rank)
//Skyrat changes
var/display_rank = rank
if(M.client && M.client.prefs && M.client.prefs.alt_titles_preferences[rank])
display_rank = M.client.prefs.alt_titles_preferences[rank]
//End of skyrat changes
to_chat(M, "<b>You are the [display_rank].</b>") //Skyrat change
if(M.client && M.client.prefs && M.client?.prefs?.alt_titles_preferences[rank])
display_rank = M.client?.prefs?.alt_titles_preferences[rank]
to_chat(M, "<b>You are the [display_rank].</b>")
if(job)
to_chat(M, "<b>As the [display_rank] you answer directly to [job.supervisors]. Special circumstances may change this.</b>") //Skyrat change
job.radio_help_message(M)