From 02ce9332974ef306464d66d51cc525e2e7ff3bc5 Mon Sep 17 00:00:00 2001 From: Intercross21 Date: Sun, 4 May 2014 18:11:11 +0400 Subject: [PATCH 1/5] Larger job and preferences windows but still lesser than 764. More choices in "Quick Create Object" menu. --- code/modules/admin/create_object.dm | 5 +++-- code/modules/client/preferences.dm | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm index 5b5f926e4b..779cb7bc90 100644 --- a/code/modules/admin/create_object.dm +++ b/code/modules/admin/create_object.dm @@ -15,8 +15,9 @@ var/quick_create_object_html = null var/pathtext = null - pathtext = input("Select the path of the object you wish to create.", "Path", "/obj") in list("/obj","/obj/structure","/obj/item","/obj/item/weapon","/obj/machinery") - + pathtext = input("Select the path of the object you wish to create.", "Path", "/obj") as null|anything in list("/obj","/obj/structure","/obj/item","/obj/item/weapon","/obj/item/clothing","/obj/machinery","/obj/mecha") + if(!pathtext) + return var path = text2path(pathtext) if (!quick_create_object_html) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index aa618fd5ad..85feebb4d6 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -404,9 +404,9 @@ datum/preferences dat += "Reset Setup" dat += "" - user << browse(dat, "window=preferences;size=560x580") + user << browse(dat, "window=preferences;size=560x720") - proc/SetChoices(mob/user, limit = 16, list/splitJobs = list("Chief Medical Officer"), width = 550, height = 550) + proc/SetChoices(mob/user, limit = 16, list/splitJobs = list("Chief Medical Officer"), width = 550, height = 650) if(!job_master) return From 11e5c64c787d5c6f9709f0d037dd534e814be341 Mon Sep 17 00:00:00 2001 From: Intercross21 Date: Sun, 4 May 2014 18:37:42 +0400 Subject: [PATCH 2/5] Unified interface for options of admin --- code/modules/admin/admin.dm | 24 ++++++++++++++++++++++++ code/modules/admin/verbs/adminhelp.dm | 2 +- code/modules/admin/verbs/adminpm.dm | 6 +++--- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 19768f7465..4170c82b5c 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1099,6 +1099,30 @@ var/global/floorIsLava = 0 if(istype(H)) H.regenerate_icons() +proc/get_options_bar(whom, detail = 2, name = 0, link = 1) + if(!whom) + return "(*null*)" + var/mob/M + var/client/C + if(istype(whom, /client)) + C = whom + M = C.mob + else if(istype(whom, /mob)) + M = whom + C = M.client + else + return "(*not an mob*)" + switch(detail) + if(0) + return "[key_name(C, link, name)]" + if(1) + return "[key_name(C, link, name)](?)" + if(2) + var/ref_mob = "\ref[M]" + return "[key_name(C, link, name)](?) (PP) (VV) (SM) (JMP) (CA)" + + + // // //ALL DONE diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index e2504a0465..1d57a79342 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -87,7 +87,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey"," if(!mob) return //this doesn't happen var/ref_mob = "\ref[mob]" - msg = "\blue HELP: [key_name(src, 1)] (?) (PP) (VV) (SM) (JMP) (CA) [ai_found ? " (CL)" : ""]: [msg]" + msg = "\blue HELP: [get_options_bar(mob, 2, 0, 0)][ai_found ? " (CL)" : ""]: [msg]" //send this msg to all admins var/admin_number_afk = 0 diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 0770280a9c..cb43ed3cc8 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -109,9 +109,9 @@ adminhelp(reply) //sender has left, adminhelp instead return - recieve_message = "[recieve_pm_type] PM from-[key_name(src, C, C.holder ? 1 : 0)]: [msg]" + recieve_message = "[recieve_pm_type] PM from-[get_options_bar(C, 1, C.holder ? 1 : 0, 1)]: [msg]" C << recieve_message - src << "[send_pm_type]PM to-[key_name(C, src, holder ? 1 : 0)]: [msg]" + src << "[send_pm_type]PM to-[get_options_bar(C, 1, holder ? 1 : 0, 1)]: [msg]" /*if(holder && !C.holder) C.last_pm_recieved = world.time @@ -209,5 +209,5 @@ if(X == src) continue if((X.holder.rights & R_ADMIN) || (X.holder.rights & R_MOD)) - X << "PM: [key_name(src, X, 0)]->IRC-Admins: \blue [msg]" + X << "PM: [key_name(src, X, 0)]->IRC-Admins: \blue [msg]" From d4ee83666e728dea69a66a4c5b1571172f34147a Mon Sep 17 00:00:00 2001 From: Intercross21 Date: Sun, 4 May 2014 19:41:14 +0400 Subject: [PATCH 3/5] Now AH shows key, prefs.jobs not have scrollbar, prefs is fully visible except undo/save menus. --- code/modules/admin/verbs/adminhelp.dm | 2 +- code/modules/client/preferences.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 1d57a79342..568c8992a9 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -87,7 +87,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey"," if(!mob) return //this doesn't happen var/ref_mob = "\ref[mob]" - msg = "\blue HELP: [get_options_bar(mob, 2, 0, 0)][ai_found ? " (CL)" : ""]: [msg]" + msg = "\blue HELP: [get_options_bar(mob, 2, 1, 0)][ai_found ? " (CL)" : ""]: [msg]" //send this msg to all admins var/admin_number_afk = 0 diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 85feebb4d6..6a4a81e141 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -404,9 +404,9 @@ datum/preferences dat += "Reset Setup" dat += "" - user << browse(dat, "window=preferences;size=560x720") + user << browse(dat, "window=preferences;size=560x736") - proc/SetChoices(mob/user, limit = 16, list/splitJobs = list("Chief Medical Officer"), width = 550, height = 650) + proc/SetChoices(mob/user, limit = 16, list/splitJobs = list("Chief Medical Officer"), width = 550, height = 660) if(!job_master) return From e05efd0f1eae444ff8af47245fdce6ea6c10a40c Mon Sep 17 00:00:00 2001 From: Intercross21 Date: Sun, 4 May 2014 22:06:56 +0400 Subject: [PATCH 4/5] New job menu for ID computer. --- code/game/machinery/computer/card.dm | 53 ++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 74c6d3f8e7..8b9d8f0baf 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -108,10 +108,57 @@ header += "
" var/jobs_all = "" - var/list/alljobs = (istype(src,/obj/machinery/computer/card/centcom)? get_all_centcom_jobs() : joblist) + "Custom" - for(var/job in alljobs) - jobs_all += "[replacetext(job, " ", " ")] " //make sure there isn't a line break in the middle of a job + var/counter = 0 + jobs_all += "" + jobs_all += ""//Captain in special because he is head of heads ~Intercross21 + jobs_all += "" + jobs_all += "" + + counter = 0 + jobs_all += ""//Orange + for(var/job in engineering_positions) + counter++ + if(counter >= 6) + jobs_all += "" + counter = 0 + jobs_all += "" + + counter = 0 + jobs_all += ""//Green + for(var/job in medical_positions) + counter++ + if(counter >= 6) + jobs_all += "" + counter = 0 + jobs_all += "" + + counter = 0 + jobs_all += ""//Purple + for(var/job in science_positions) + counter++ + if(counter >= 6) + jobs_all += "" + counter = 0 + jobs_all += "" + + counter = 0 + jobs_all += ""//Grey + for(var/job in civilian_positions) + counter++ + if(counter >= 6) + jobs_all += "" + counter = 0 + jobs_all += "" + + if(istype(src,/obj/machinery/computer/card/centcom)) + counter = 0 + jobs_all += ""//Brown + for(var/job in get_all_centcom_jobs()) + if(counter >= 6) + jobs_all += "" + counter = 0 + jobs_all += "" var/body if (authenticated && modify) From aa7ad269aee725327e955bb9ab556050cdee18ae Mon Sep 17 00:00:00 2001 From: Intercross21 Date: Mon, 5 May 2014 07:20:26 +0400 Subject: [PATCH 5/5] Little change: "show" button shows job only first time. Now shows job anytime. --- code/game/machinery/computer/card.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 8b9d8f0baf..4498f1bb40 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -185,7 +185,7 @@ } function hideAll(){ var allJobsSlot = document.getElementById('alljobsslot'); - allJobsSlot.innerHTML = "show"; + allJobsSlot.innerHTML = "[(modify.assignment) ? modify.assignment : "Unassgied"]"; } "} carddesc += "
"
Command
SpecialCaptainCustom
Engineering
[replacetext(job, " ", " ")]
Medical
[replacetext(job, " ", " ")]
Science
[replacetext(job, " ", " ")]
Civilian
[replacetext(job, " ", " ")]
CentComm
[replacetext(job, " ", " ")]