mirror of
https://github.com/KabKebab/GS13.git
synced 2026-02-10 07:37:42 +00:00
fixed some errors
Co-Authored-By: Azarak <azarak@users.noreply.github.com>
This commit is contained in:
@@ -542,7 +542,7 @@
|
||||
return
|
||||
|
||||
var/displayed_rank = rank
|
||||
if(character.client && character.client.prefs && character.client.prefs.alt_titles_preference[rank])
|
||||
if(character.client && character.client.prefs && character.client.prefs.alt_titles_preferences[rank])
|
||||
displayed_rank = character.client.prefs.alt_titles_preferences[rank]
|
||||
var/obj/machinery/announcement_system/announcer = pick(GLOB.announcement_systems)
|
||||
announcer.announce("ARRIVAL", character.real_name, rank, displayed_rank, list()) //make the list empty to make it announce it in common
|
||||
|
||||
@@ -219,12 +219,13 @@
|
||||
H.real_name = "[J.title] #[rand(10000, 99999)]"
|
||||
|
||||
var/obj/item/card/id/C = H.wear_id
|
||||
var/client/preference_source = H.client
|
||||
if(istype(C))
|
||||
C.access = J.get_access()
|
||||
shuffle_inplace(C.access) // Shuffle access list to make NTNet passkeys less predictable
|
||||
C.registered_name = H.real_name
|
||||
C.assignment = J.title
|
||||
if(preferences_source && preference_source.prefs && preference_source.prefs.alt_titles_preferences[J.title])
|
||||
if(preference_source && preference_source.prefs && preference_source.prefs.alt_titles_preferences[J.title])
|
||||
C.update_label(C.registered_name, preference_source.prefs.alt_titles_preferences[J.title])
|
||||
else
|
||||
C.update_label()
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
S["alt_titles_preferences"] >> alt_titles_preferences
|
||||
alt_titles_preferences = SANITIZE_LIST(alt_titles_preferences)
|
||||
if(SSjob)
|
||||
for(var/datum/job/job in sortList(SSjob.occupations, /proc/cmp_job_display_asc))
|
||||
for(var/datum/job/job in SSjob.occupations)
|
||||
if(alt_titles_preferences[job.title])
|
||||
if(!(alt_titles_preferences[job.title] in job.alt_titles))
|
||||
alt_titles_preferences.Remove(job.title)
|
||||
|
||||
Reference in New Issue
Block a user