NTTC now uses rank for formatting if the job title is non-standard (#19623)

* NTTC now uses rank for formatting

NTTC now checks rank as well as job title on the ID when it decides how to format a message.

This allows Acting Heads to keep their departmental color.

* NTTC now uses rank for formatting if the job title is non-standard

Removes unnecessary value assignments

* Removed extra space

whoopsie daisy, a bit too generous there...

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
This commit is contained in:
Xsingular
2022-11-11 14:48:01 +01:00
committed by GitHub
co-authored by S34N
parent eea6b82b15
commit 28d5379f08
3 changed files with 34 additions and 5 deletions
@@ -385,6 +385,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
var/displayname = M.name // grab the display name (name you get when you hover over someone's icon)
var/voicemask = 0 // the speaker is wearing a voice mask
var/jobname // the mob's "job"
var/rankname // the formatting to be used for the mob's job
if(jammed)
Gibberish_all(message_pieces, 100)
@@ -393,6 +394,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
if(ishuman(M))
var/mob/living/carbon/human/H = M
jobname = H.get_assignment()
rankname = H.get_authentification_rank()
// --- Carbon Nonhuman ---
else if(iscarbon(M)) // Nonhuman carbon mob
@@ -427,6 +429,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
if(syndiekey && syndiekey.change_voice && connection.frequency == SYND_FREQ)
displayname = syndiekey.fake_name
jobname = "Unknown"
rankname = "Unknown"
voicemask = TRUE
// Copy the message pieces so we can safely edit comms line without affecting the actual line
@@ -438,6 +441,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
var/datum/tcomms_message/tcm = new
tcm.sender_name = displayname
tcm.sender_job = jobname
tcm.sender_rank = rankname
tcm.message_pieces = message_pieces_copy
tcm.source_level = position.z
tcm.freq = connection.frequency