diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm
index a473d2d6773..3d773f5763e 100755
--- a/code/modules/pda/PDA.dm
+++ b/code/modules/pda/PDA.dm
@@ -302,29 +302,29 @@ var/global/list/obj/item/device/pda/PDAs = list()
/obj/item/device/pda/AltClick(mob/user)
..()
- if(issilicon(usr))
+ if(issilicon(user))
return
if(can_use(user))
if(id)
- remove_id()
+ remove_id(user)
else
to_chat(user, "This PDA does not have an ID in it!")
/obj/item/device/pda/CtrlClick(mob/user)
..()
- if(issilicon(usr))
+ if(issilicon(user))
return
if(can_use(user))
- remove_pen()
+ remove_pen(user)
-/obj/item/device/pda/proc/remove_id()
+/obj/item/device/pda/proc/remove_id(mob/user)
if(id)
if(ismob(loc))
var/mob/M = loc
M.put_in_hands(id)
- to_chat(usr, "You remove the ID from the [name].")
+ to_chat(user, "You remove the ID from the [name].")
else
id.forceMove(get_turf(src))
overlays -= image('icons/goonstation/objects/pda_overlay.dmi', id.icon_state)
@@ -340,7 +340,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if( can_use(usr) )
if(id)
- remove_id()
+ remove_id(usr)
else
to_chat(usr, "This PDA does not have an ID in it.")
else
@@ -350,17 +350,17 @@ var/global/list/obj/item/device/pda/PDAs = list()
set category = "Object"
set name = "Remove pen"
set src in usr
- remove_pen()
+ remove_pen(usr)
-/obj/item/device/pda/proc/remove_pen()
+/obj/item/device/pda/proc/remove_pen(mob/user)
- if(issilicon(usr))
+ if(issilicon(user))
return
- if( can_use(usr) )
+ if( can_use(user) )
var/obj/item/weapon/pen/O = locate() in src
if(O)
- to_chat(usr, "You remove \the [O] from \the [src].")
+ to_chat(user, "You remove the [O] from [src].")
if(istype(loc, /mob))
var/mob/M = loc
if(M.get_active_hand() == null)
@@ -368,9 +368,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
return
O.forceMove(get_turf(src))
else
- to_chat(usr, "This PDA does not have a pen in it.")
+ to_chat(user, "This PDA does not have a pen in it.")
else
- to_chat(usr, "You cannot do this while restrained.")
+ to_chat(user, "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)