You can now stick IDs in PDAs.

If you look at your PDA window, there should be an option to stick an ID in, like with some computers.
  While carrying an ID, a PDA can be used for almost everything an ID can.
    While ID scanners can read cards through a PDA, it is difficult to shove a PDA into the ID slot on some computers.
    It is possible I missed some functions, but I was quite thorough in my sweep through the code.
    In the event of PDA destruction, any inserted ID is ejected unharmed.

It is now possible to stick PDAs in your jumpsuit's ID slot.
  Since PDAs are named, you can disguise yourself as someone else using one.
  Beepsky/ED-209 can see through a PDA disguise if you stick your real ID in for access.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@592 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/objects/closets/secure/personal.dm

@@ -16,7 +16,10 @@
 			src.MouseDrop_T(W:affecting, user)      //act like they were dragged onto the closet
 		user.drop_item()
 		if (W) W.loc = src.loc
-	else if (istype(W, /obj/item/weapon/card/id))
+	else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
+		if(istype(W, /obj/item/device/pda))
+			var/obj/item/device/pda/pda = W
+			W = pda.id
 		if(src.broken)
 			user << "\red It appears to be broken."
 			return

code/game/objects/devices/PDA.dm

@@ -34,6 +34,8 @@
 	var/obj/item/weapon/integrated_uplink/uplink = null
 	var/message1	// used for status_displays
 	var/message2
+	var/obj/item/weapon/card/id/id = null //Making it possible to slot an ID card into the PDA so it can function as both.
+	var/ownjob = null //related to above
 
 /obj/item/device/pda/medical
 	default_cartridge = /obj/item/weapon/cartridge/medical
@@ -494,7 +496,9 @@
 		switch (src.mode)
 			if (0)
 				dat += "<h2>PERSONAL DATA ASSISTANT</h2>"
-				dat += "Owner: [src.owner]<br><br>"
+				dat += "Owner: [src.owner], [src.ownjob]<br>"
+				dat += text("ID: <A href='?src=\ref[];auth=1'>[]</A>", src, (src.id ? "[src.id.registered], [src.id.assignment]" : "----------"))
+				dat += "<br><br>"
 
 				dat += "<h4>General Functions</h4>"
 				dat += "<ul>"
@@ -1051,6 +1055,25 @@ Code:
 		src.add_fingerprint(usr)
 		usr.machine = src
 
+		if (href_list["auth"])
+			if (src.id)
+				if (istype(src.loc, /mob))
+					var/obj/item/W = src.loc:equipped()
+					var/emptyHand = (W == null)
+
+					if(emptyHand)
+						src.id.DblClick()
+			//			src.id.loc = src.loc
+//				else if (istype(src.loc, /turf)) src.id.loc = src.loc
+				else src.id.loc = src.loc
+				src.id = null
+			else
+				var/obj/item/I = usr.equipped()
+				if (istype(I, /obj/item/weapon/card/id))
+					usr.drop_item()
+					I.loc = src
+					src.id = I
+
 		if (href_list["mm"])
 			src.mode = 0
 
@@ -1396,6 +1419,7 @@ Code:
 
 	else if (istype(C, /obj/item/weapon/card/id) && !src.owner && C:registered)
 		src.owner = C:registered
+		src.ownjob = C:assignment
 		src.name = "PDA-[src.owner]"
 		user << "\blue Card scanned."
 		src.updateUsrDialog()
@@ -1474,6 +1498,13 @@ Code:
 	del(src)
 	return
 
+/obj/item/device/pda/Del()
+	if (src.id)
+		if(istype(src.loc, /mob))
+			src.id.loc = src.loc.loc
+		else src.id.loc = src.loc
+	..()
+
 /obj/item/device/pda/clown/HasEntered(AM as mob|obj) //Clown PDA is slippery.
 	if (istype(AM, /mob/living/carbon))
 		var/mob/M =	AM

code/game/objects/radio/radio.dm

@@ -147,7 +147,13 @@ Frequency:
 
 	if (istype(M, /mob/living/carbon))
 		if (M:wear_id)
-			eqjobname = M:wear_id:assignment
+			var/obj/item/weapon/card/id/id
+			if (istype(M:wear_id, /obj/item/device/pda))
+				var/obj/item/device/pda/pda = M:wear_id
+				id = pda.id
+			else id = M:wear_id
+			if (id.assignment) eqjobname = M:wear_id:assignment
+			else eqjobname = "No job"
 		else
 			eqjobname = "No id"
 	else if (istype(M,/mob/living/silicon/ai))