The ID Code Cleanup and Fixening (tm)

code/modules/modular_computers/file_system/program.dm

@@ -97,14 +97,8 @@
 			card_slot = computer.all_components[MC_CARD]
 			D = card_slot.GetID()
 		var/mob/living/carbon/human/h = user
-		var/obj/item/card/id/I = h.get_idcard()
-		var/obj/item/card/id/C = h.get_active_held_item()
-		if(C)
-			C = C.GetID()
-		if(!(C && istype(C)))
-			C = null
-
-		if(!I && !C && !D)
+		var/obj/item/card/id/I = h.get_idcard(TRUE)
+		if(!I && !D)
 			if(loud)
 				to_chat(user, "<span class='danger'>\The [computer] flashes an \"RFID Error - Unable to scan ID\" warning.</span>")
 			return 0
@@ -112,9 +106,6 @@
 		if(I)
 			if(access_to_check in I.GetAccess())
 				return 1
-		else if(C)
-			if(access_to_check in C.GetAccess())
-				return 1
 		else if(D)
 			if(access_to_check in D.GetAccess())
 				return 1

code/modules/modular_computers/file_system/programs/card.dm

@@ -117,7 +117,7 @@
 	else
 		if(ishuman(user))
 			var/mob/living/carbon/human/h = user
-			user_id_card = h.get_idcard()
+			user_id_card = h.get_idcard(TRUE)
 
 	switch(action)
 		if("PRG_switchm")