diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm
index 1599d18be79..f8d4342bfe7 100644
--- a/code/game/objects/devices/PDA/PDA.dm
+++ b/code/game/objects/devices/PDA/PDA.dm
@@ -197,8 +197,8 @@
if (0)
dat += "
PERSONAL DATA ASSISTANT v.1.2
"
dat += "Owner: [owner], [ownjob]
"
- dat += text("ID: []
", src, (id ? "[id.registered], [id.assignment]" : "----------"))
- dat += text("[]
", src, (id ? "Update PDA Info" : ""))
+ dat += text("ID: [id ? "[id.registered], [id.assignment]" : "----------"]")
+ dat += text("[id ? "Update PDA Info" : ""]
")
dat += "Station Time: [round(world.time / 36000)+12]:[(world.time / 600 % 60) < 10 ? add_zero(world.time / 600 % 60, 1) : world.time / 600 % 60]"//:[world.time / 100 % 6][world.time / 100 % 10]"
@@ -687,19 +687,36 @@
U << browse(null, "window=pda")
return
+/obj/item/device/pda/proc/remove_id()
+ if (id)
+ if (istype(loc, /mob))
+ var/mob/M = loc
+ if(M.equipped() == null)
+ M.put_in_hand(id)
+ id = null
+ usr << "\blue You remove the ID from the [name]."
+ return
+ id.loc = get_turf(src)
+ id = null
+
+/obj/item/device/pda/verb/verb_remove_id()
+ set category = "Object"
+ set name = "Remove id"
+ set src in usr
+
+ if ( !(usr.stat || usr.restrained()) )
+ if(id)
+ remove_id()
+ else
+ usr << "\blue This PDA does not have an ID in it."
+ else
+ usr << "\blue You cannot do this while restrained."
+
+
/obj/item/device/pda/proc/id_check(mob/user as mob, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use.
if(choice == 1)
if (id)
- if (istype(loc, /mob))
- var/obj/item/W = loc:equipped()
- var/emptyHand = (W == null)
- if(emptyHand)
- id.DblClick()
- if(!istype(id.loc, /obj/item/device/pda))
- id = null
- else
- id.loc = loc
- id = null
+ remove_id()
else
var/obj/item/I = user.equipped()
if (istype(I, /obj/item/weapon/card/id))
diff --git a/html/changelog.html b/html/changelog.html
index 51548fd1cb4..9fc8573a221 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -40,49 +40,23 @@
-
-
+
+
+
+
+
Monday, April 20th 2012
+
Erro updated:
+
+ - Added a verb to the PDA which you can use to remove an ID in it. If your active hand is empy, it puts it there otherwise it puts it on the floor under you.
+
+
+
April 27 2012
Cheridan updated: