From 613605e0d0b47281e4acfbe40165803abb928a79 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Sat, 16 Nov 2019 17:49:12 +0100 Subject: [PATCH] Unborking id consoles. --- code/game/machinery/computer/card.dm | 64 ++++++++++++++-------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 93b71b27e2..fa0cf367d9 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -56,33 +56,34 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) /obj/machinery/computer/card/centcom/get_jobs() return get_all_centcom_jobs() +/obj/machinery/computer/card/Initialize() + . = ..() + change_position_cooldown = CONFIG_GET(number/id_console_jobslot_delay) + /obj/machinery/computer/card/examine(mob/user) . = ..() if(inserted_scan_id || inserted_modify_id) to_chat(user, "Alt-click to eject the ID card.") -/obj/machinery/computer/card/Initialize() - . = ..() - change_position_cooldown = CONFIG_GET(number/id_console_jobslot_delay) - /obj/machinery/computer/card/attackby(obj/I, mob/user, params) if(isidcard(I)) if(check_access(I) && !inserted_scan_id) if(id_insert(user, I, inserted_scan_id)) inserted_scan_id = I updateUsrDialog() - else if(!inserted_modify_id) - if(id_insert(user, I, inserted_modify_id)) - inserted_modify_id = I - updateUsrDialog() + else if(id_insert(user, I, inserted_modify_id)) + inserted_modify_id = I + updateUsrDialog() else return ..() /obj/machinery/computer/card/Destroy() if(inserted_scan_id) - QDEL_NULL(inserted_scan_id) + qdel(inserted_scan_id) + inserted_scan_id = null if(inserted_modify_id) - QDEL_NULL(inserted_modify_id) + qdel(inserted_modify_id) + inserted_modify_id = null return ..() /obj/machinery/computer/card/handle_atom_del(atom/A) @@ -106,7 +107,6 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) /obj/machinery/computer/card/proc/job_blacklisted(jobtitle) return (jobtitle in blacklisted) - //Logic check for Topic() if you can open the job /obj/machinery/computer/card/proc/can_open_job(datum/job/job) if(job) @@ -131,6 +131,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) return JOB_MAX_POSITIONS return JOB_DENIED + /obj/machinery/computer/card/proc/id_insert(mob/user, obj/item/inserting_item, obj/item/target) var/obj/item/card/id/card_to_insert = inserting_item var/holder_item = FALSE @@ -202,8 +203,8 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) if(job.title in blacklisted) continue dat += {"[job.title] - [job.current_positions]/[job.total_positions] - "} + [job.current_positions]/[job.total_positions] + "} switch(can_open_job(job)) if(JOB_ALLOWED) if(authenticated == 2) @@ -224,7 +225,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) dat += "Close Position" else dat += "Close Position" - if(-JOB_COOLDOWN) + if(JOB_COOLDOWN) var/time_to_wait = round(change_position_cooldown - ((world.time / 10) - GLOB.time_last_changed_position), 1) var/mins = round(time_to_wait / 60) var/seconds = time_to_wait - (60*mins) @@ -251,6 +252,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) dat += "" else var/list/header = list() + var/scan_name = inserted_scan_id ? html_encode(inserted_scan_id.name) : "--------" var/target_name = inserted_modify_id ? html_encode(inserted_modify_id.name) : "--------" var/target_owner = (inserted_modify_id && inserted_modify_id.registered_name) ? html_encode(inserted_modify_id.registered_name) : "--------" @@ -261,7 +263,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) Target: [target_name]
Confirm Identity: [scan_name]
"} else - header += {"

" + header += {"

Target: Remove [target_name] || Confirm Identity: Remove [scan_name]
Access Crew Manifest
@@ -297,7 +299,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) allJobsSlot.innerHTML = "show"; } "} - carddesc += {"
" + carddesc += {" registered name: @@ -312,7 +314,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) jobs += "Assignment: [target_rank] (Demote)" var/list/accesses = list() - if(istype(src, /obj/machinery/computer/card/centcom)) //REE + if(istype(src, /obj/machinery/computer/card/centcom)) // REE accesses += "
Central Command:
" for(var/A in get_all_centcom_access()) if(A in inserted_modify_id.access) @@ -340,13 +342,13 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) accesses += "
" accesses += "" accesses += "" - body = "[carddesc.Join()]
[jobs]

[accesses.Join()]
" //CHECK THIS + body = "[carddesc.Join()]
[jobs.Join()]

[accesses.Join()]
" //CHECK THIS else if (!authenticated) - body = {"Log In
+ body = {"Log In
Access Crew Manifest
"} if(!target_dept) - body += "
Job Management
" + body += "Job Management
" dat = list("", header.Join(), body, "
") var/datum/browser/popup = new(user, "id_com", src.name, 900, 620) @@ -366,7 +368,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) usr.set_machine(src) switch(href_list["choice"]) if ("inserted_modify_id") - if (inserted_modify_id && !usr.get_active_held_item()) + if(inserted_modify_id && !usr.get_active_held_item()) if(id_eject(usr, inserted_modify_id)) inserted_modify_id = null updateUsrDialog() @@ -378,7 +380,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) inserted_modify_id = id_to_insert updateUsrDialog() if ("inserted_scan_id") - if (inserted_scan_id && !usr.get_active_held_item()) + if(inserted_scan_id && !usr.get_active_held_item()) if(id_eject(usr, inserted_scan_id)) inserted_scan_id = null updateUsrDialog() @@ -386,7 +388,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) if(usr.get_id_in_hand()) var/obj/item/held_item = usr.get_active_held_item() var/obj/item/card/id/id_to_insert = held_item.GetID() - if(id_insert(usr, held_item, inserted_modify_id)) + if(id_insert(usr, held_item, inserted_scan_id)) inserted_scan_id = id_to_insert updateUsrDialog() if ("auth") @@ -462,7 +464,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) updateUsrDialog() break if(!jobdatum) - to_chat(usr, "No log exists for this job.") + to_chat(usr, "No log exists for this job.") updateUsrDialog() return @@ -475,7 +477,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) inserted_modify_id.assignment = "Unassigned" playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) else - to_chat(usr, "You are not authorized to demote this position.") + to_chat(usr, "You are not authorized to demote this position.") if ("reg") if (authenticated) var/t2 = inserted_modify_id @@ -485,7 +487,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) inserted_modify_id.registered_name = newName playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) else - to_chat(usr, "Invalid name entered.") + to_chat(usr, "Invalid name entered.") updateUsrDialog() return if ("mode") @@ -498,7 +500,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) if("make_job_available") // MAKE ANOTHER JOB POSITION AVAILABLE FOR LATE JOINERS - if(authenticated && (ACCESS_CHANGE_IDS in inserted_scan_id.access) && !target_dept) + if(authenticated && !target_dept) var/edit_job_target = href_list["job"] var/datum/job/j = SSjob.GetJob(edit_job_target) if(!j) @@ -515,7 +517,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) if("make_job_unavailable") // MAKE JOB POSITION UNAVAILABLE FOR LATE JOINERS - if(authenticated && (ACCESS_CHANGE_IDS in inserted_scan_id.access) && !target_dept) + if(authenticated && !target_dept) var/edit_job_target = href_list["job"] var/datum/job/j = SSjob.GetJob(edit_job_target) if(!j) @@ -533,7 +535,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) if ("prioritize_job") // TOGGLE WHETHER JOB APPEARS AS PRIORITIZED IN THE LOBBY - if(authenticated && (ACCESS_CHANGE_IDS in inserted_scan_id.access) && !target_dept) + if(authenticated && !target_dept) var/priority_target = href_list["job"] var/datum/job/j = SSjob.GetJob(priority_target) if(!j) @@ -549,7 +551,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) return else SSjob.prioritized_jobs += j - to_chat(usr, "[j.title] has been successfully [priority ? "prioritized" : "unprioritized"]. Potential employees will notice your request.") + to_chat(usr, "[j.title] has been successfully [priority ? "prioritized" : "unprioritized"]. Potential employees will notice your request.") playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) if ("print") @@ -625,4 +627,4 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) #undef JOB_ALLOWED #undef JOB_COOLDOWN #undef JOB_MAX_POSITIONS -#undef JOB_DENIED \ No newline at end of file +#undef JOB_DENIED