From 7484f4faf163f841513628945e98f543bdc1a79b Mon Sep 17 00:00:00 2001 From: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Mon, 28 Aug 2023 08:05:45 -0400 Subject: [PATCH] IDs in your PDA no longer affect the color your radio chatter (#22102) * Fixes PDA rank coloring * Cinna review --- .../modules/mob/living/carbon/human/human_mob.dm | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_mob.dm b/code/modules/mob/living/carbon/human/human_mob.dm index 89df066d838..8b202ba9970 100644 --- a/code/modules/mob/living/carbon/human/human_mob.dm +++ b/code/modules/mob/living/carbon/human/human_mob.dm @@ -435,18 +435,10 @@ // Get rank from ID, ID inside PDA, PDA, ID in wallet, etc. /mob/living/carbon/human/proc/get_authentification_rank(if_no_id = "No id", if_no_job = "No job") - var/obj/item/pda/pda = wear_id - if(istype(pda)) - if(pda.id) - return pda.id.rank - else - return pda.ownrank - else - var/obj/item/card/id/id = get_idcard() - if(id) - return id.rank ? id.rank : if_no_job - else - return if_no_id + var/obj/item/card/id/id = wear_id.GetID() + if(istype(id)) + return id.rank || if_no_job + return if_no_id //gets assignment from ID, PDA, Wallet, etc. //This should not be relied on for authentication, because PDAs show their owner's job, even if an ID is not inserted