From 70ade2ed593c97041b1ee1cf082d0da5727b5960 Mon Sep 17 00:00:00 2001 From: Neerti Date: Thu, 19 Nov 2015 08:00:07 -0500 Subject: [PATCH] Fixes access checks ignoring the ID in your hand if already wearing an ID. --- code/game/jobs/access.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 55f603f362..e1fb87e974 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -197,13 +197,13 @@ return botcard /mob/living/carbon/human/GetIdCard() + if(get_active_hand()) + var/obj/item/I = get_active_hand() + return I.GetID() if(wear_id) var/id = wear_id.GetID() if(id) return id - if(get_active_hand()) - var/obj/item/I = get_active_hand() - return I.GetID() /mob/living/silicon/GetIdCard() return idcard