diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 164edd55dfa..20188d3dd6c 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -396,8 +396,12 @@ //Select Receiver if("Recepient") //Get out list of viable PDAs + var/list/obj/item/device/pda/sendPDAs = list() + for(var/obj/item/device/pda/P in PDAs) + if(!P.owner || P.toff) continue + sendPDAs += P if(PDAs && PDAs.len > 0) - customrecepient = input(usr, "Select a PDA from the list.") as null|anything in PDAs + customrecepient = input(usr, "Select a PDA from the list.") as null|anything in sortList(sendPDAs) else customrecepient = null diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm index e75514b69e9..8ef5cd730f0 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/code/modules/mob/new_player/preferences.dm @@ -210,20 +210,12 @@ datum/preferences user << browse(dat, "window=preferences;size=300x710") - proc/SetChoices(mob/user, limit = 17, list/splitJobs, width = 550, height = 500) + proc/SetChoices(mob/user, limit = 17, list/splitJobs = list("Chief Engineer"), width = 550, height = 500) //limit - The amount of jobs allowed per column. Defaults to 17 to make it look nice. //splitJobs - Allows you split the table by job. You can make different tables for each department by including their heads. Defaults to CE to make it look nice. //width - Screen' width. Defaults to 550 to make it look nice. //height - Screen's height. Defaults to 500 to make it look nice. - // Modify this if you added more jobs and it looks like a mess. Add the jobs in the splitJobs that you want to trigger and intitate a new table. - - if(splitJobs == null) - if (ticker && ticker.current_state >= GAME_STATE_PLAYING) - splitJobs = list() - else - splitJobs = list("Chief Engineer") - var/HTML = "" HTML += "
" @@ -284,7 +276,7 @@ datum/preferences HTML += " \[NEVER]" HTML += "" - HTML += "" + HTML += "" HTML += "
"