From 6a52656ea012bb99faa7a74acef3b9aca168afd7 Mon Sep 17 00:00:00 2001 From: skull132 Date: Wed, 3 Jun 2015 15:54:46 +0300 Subject: [PATCH] Fixes #583 --- code/modules/mob/living/carbon/human/human.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index b7e9aea9..decf0bf3 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -492,6 +492,8 @@ if(istype(wear_id, /obj/item/weapon/storage/wallet)) var/obj/item/weapon/storage/wallet/Wallet = wear_id ID = Wallet.GetID() + if(istype(wear_id, /obj/item/weapon/card/id)) + ID = wear_id if(!ID) return if_no_id return ID.rank ? ID.rank : if_no_job @@ -509,6 +511,8 @@ if(istype(wear_id, /obj/item/weapon/storage/wallet)) var/obj/item/weapon/storage/wallet/Wallet = wear_id ID = Wallet.GetID() + if(istype(wear_id, /obj/item/weapon/card/id)) + ID = wear_id if(!ID) return if_no_id return ID.assignment ? ID.assignment : if_no_job @@ -526,6 +530,8 @@ if(istype(wear_id, /obj/item/weapon/storage/wallet)) var/obj/item/weapon/storage/wallet/Wallet = wear_id ID = Wallet.GetID() + if(istype(wear_id, /obj/item/weapon/card/id)) + ID = wear_id if(!ID) return if_no_id return ID.registered_name