cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 21:48:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes requested changes

Browse Source 
Fixes usr's to users and should be properly passing arguments
This commit is contained in:
Fruerlund
2017-05-30 20:53:00 +02:00
parent bdf8323be6
commit cf6f963459
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/pda/PDA.dm
+14 -14
View File
@@ -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, "<span class='warning'>This PDA does not have an ID in it!</span>")
/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, "<span class='notice'>You remove the ID from the [name].</span>")
to_chat(user, "<span class='notice'>You remove the ID from the [name].</span>")
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, "<span class='notice'>This PDA does not have an ID in it.</span>")
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, "<span class='notice'>You remove \the [O] from \the [src].</span>")
to_chat(user, "<span class='notice'>You remove the [O] from [src].</span>")
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, "<span class='warning'>This PDA does not have a pen in it.</span>")
to_chat(user, "<span class='warning'>This PDA does not have a pen in it.</span>")
else
to_chat(usr, "<span class='notice'>You cannot do this while restrained.</span>")
to_chat(user, "<span class='notice'>You cannot do this while restrained.</span>")
/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)