Merge branch 'master' into weapon-removal

code/modules/security levels/keycard authentication.dm

@@ -30,9 +30,15 @@
 	if(stat & (NOPOWER|BROKEN))
 		to_chat(user, "This device is not powered.")
 		return
+<<<<<<< HEAD
 	if(istype(W,/obj/item/card/id))
 		var/obj/item/card/id/ID = W
 		if(access_keycard_auth in ID.access)
+=======
+	if(istype(W,/obj/item/weapon/card/id))
+		var/obj/item/weapon/card/id/ID = W
+		if(access_keycard_auth in ID.GetAccess())
+>>>>>>> master
 			if(active == 1)
 				//This is not the device that made the initial request. It is the device confirming the request.
 				if(event_source)