diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index d5fd7d18964..ee2caeae9bf 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -105,13 +105,12 @@ var/global/list/obj/item/device/pda/PDAs = list() var/dat = "Personal Data Assistant" - dat += " Close" + dat += " Refresh" if ((!isnull(cartridge)) && (mode == 0)) dat += " | Eject [cartridge]" if (mode) dat += " | Return" - dat += " | Refresh" dat += "
" @@ -279,7 +278,7 @@ var/global/list/obj/item/device/pda/PDAs = list() dat += cart dat += "" - user << browse(dat, "window=pda;size=400x444;border=1;can_resize=1;can_close=0;can_minimize=0") + user << browse(dat, "window=pda;size=400x450;border=1;can_resize=1;can_minimize=0") onclose(user, "pda", src) /obj/item/device/pda/Topic(href, href_list) @@ -287,7 +286,7 @@ var/global/list/obj/item/device/pda/PDAs = list() var/mob/living/U = usr //Looking for master was kind of pointless since PDAs don't appear to have one. - if(usr.canUseTopic(src)) + if(usr.canUseTopic(src) && !href_list["close"]) add_fingerprint(U) U.set_machine(src) @@ -295,10 +294,6 @@ var/global/list/obj/item/device/pda/PDAs = list() //BASIC FUNCTIONS=================================== - if("Close")//Self explanatory - U.unset_machine() - U << browse(null, "window=pda") - return if("Refresh")//Refresh, goes to the end of the proc. if("Return")//Return if(mode<=9) diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm index 9928eea9eda..3e8296a4b46 100644 --- a/code/modules/client/asset_cache.dm +++ b/code/modules/client/asset_cache.dm @@ -193,7 +193,6 @@ You can set verify to TRUE if you want send() to sleep until the client has the "pda_crate.png" = 'icons/pda_icons/pda_crate.png', "pda_cuffs.png" = 'icons/pda_icons/pda_cuffs.png', "pda_eject.png" = 'icons/pda_icons/pda_eject.png', - "pda_exit.png" = 'icons/pda_icons/pda_exit.png', "pda_flashlight.png" = 'icons/pda_icons/pda_flashlight.png', "pda_honk.png" = 'icons/pda_icons/pda_honk.png', "pda_mail.png" = 'icons/pda_icons/pda_mail.png',