From 0425b60d663731e89113d2f2a758135dbfee99d3 Mon Sep 17 00:00:00 2001
From: PsiOmegaDelta <git@psiomega.se>
Date: Wed, 30 Dec 2015 12:07:13 +0100
Subject: [PATCH] The GetIdCard() proc now priorities held id cards.

Fixes #11824 to the maximum degree I'm prepared to go.
---
 code/game/jobs/access.dm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index f7ddc380b75..06a03445a8c 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(wear_id)
-		var/id = wear_id.GetID()
+	var/obj/item/I = get_active_hand()
+	if(I)
+		var/id = I.GetID()
 		if(id)
 			return id
-	if(get_active_hand())
-		var/obj/item/I = get_active_hand()
-		return I.GetID()
+	if(wear_id)
+		return wear_id.GetID()
 
 /mob/living/silicon/GetIdCard()
 	return idcard