From 8b6bd9dca5ed9242a304cf9ba60828a02ea95be0 Mon Sep 17 00:00:00 2001 From: Kelenius Date: Sun, 6 Jul 2014 21:33:05 +0400 Subject: [PATCH] usr -> user Conflicts: code/_onclick/hud/screen_objects.dm code/game/objects/items/devices/PDA/PDA.dm --- code/_onclick/hud/screen_objects.dm | 4 ++-- code/game/objects/items/devices/PDA/PDA.dm | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index b5b16cb6dfe..7283b735ed6 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -477,12 +477,12 @@ if("PDA - Send Message") if(isAI(usr)) var/mob/living/silicon/ai/AI = usr - AI.cmd_send_pdamesg() + AI.cmd_send_pdamesg(usr) if("PDA - Show Message Log") if(isAI(usr)) var/mob/living/silicon/ai/AI = usr - AI.cmd_show_message_log() + AI.cmd_show_message_log(usr) /* if("Take Image") if(isAI(usr)) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 04f55abb99f..07f9073056c 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -208,17 +208,17 @@ var/global/list/obj/item/device/pda/PDAs = list() //AI verb and proc for sending PDA messages. -/mob/living/silicon/ai/proc/cmd_send_pdamesg() - if(usr.stat == 2) - usr << "You can't send PDA messages because you are dead!" +/mob/living/silicon/ai/proc/cmd_send_pdamesg(mob/user as mob) + if(user.stat == 2) + user << "You can't send PDA messages because you are dead!" return var/list/plist = aiPDA.available_pdas() if (plist) - var/c = input(usr, "Please select a PDA") as null|anything in sortList(plist) + var/c = input(user, "Please select a PDA") as null|anything in sortList(plist) if (!c) // if the user hasn't selected a PDA file we can't send a message return var/selected = plist[c] - aiPDA.create_message(usr, selected) + aiPDA.create_message(user, selected) /obj/item/device/pda/ai/verb/cmd_toggle_pda_receiver() @@ -243,9 +243,9 @@ var/global/list/obj/item/device/pda/PDAs = list() usr << "PDA ringer toggled [(silent ? "Off" : "On")]!" -/mob/living/silicon/ai/proc/cmd_show_message_log() - if(usr.stat == 2) - usr << "You can't do that because you are dead!" +/mob/living/silicon/ai/proc/cmd_show_message_log(mob/user as mob) + if(user.stat == 2) + user << "You can't do that because you are dead!" return var/HTML = "AI PDA Message Log" for(var/index in aiPDA.tnote) @@ -254,7 +254,7 @@ var/global/list/obj/item/device/pda/PDAs = list() else HTML += addtext("← From ", index["owner"],":
", index["message"], "
") HTML +="" - usr << browse(HTML, "window=log;size=400x444;border=1;can_resize=1;can_close=1;can_minimize=0") + user << browse(HTML, "window=log;size=400x444;border=1;can_resize=1;can_close=1;can_minimize=0") /obj/item/device/pda/ai/can_use()