From 24b867cd7657bcef5f9657e421bb113d804b1238 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Sat, 24 Feb 2018 16:33:48 +0000 Subject: [PATCH 1/2] removes printing photos from security consoles --- code/game/machinery/computer/security.dm | 9 --------- nano/templates/secure_data.tmpl | 3 --- 2 files changed, 12 deletions(-) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 464381f0fa5..f26dee2b7ba 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -369,15 +369,6 @@ P.name = "paper - 'Security Record'" printing = 0 - else if(href_list["print_p"]) - if(!printing) - printing = 1 - playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) - sleep(50) - if(istype(active1, /datum/data/record) && data_core.general.Find(active1)) - create_record_photo(active1) - printing = 0 - else if(href_list["printlogs"]) if(cell_logs.len && !printing) var/obj/item/weapon/paper/P = input(usr, "Select log to print", "Available Cell Logs") as null|anything in cell_logs diff --git a/nano/templates/secure_data.tmpl b/nano/templates/secure_data.tmpl index d4d129e808b..78cf3b9c332 100644 --- a/nano/templates/secure_data.tmpl +++ b/nano/templates/secure_data.tmpl @@ -143,9 +143,6 @@ Used In File(s): \code\game\machinery\computer\security.dm {{if data.general.has_photos}} -
-
{{:helper.link('Print photo', 'camera', {'print_p' : 1})}}
-
{{for data.general.photos}} {{if value.photo}} From e2039350c7e1226cf7a66af8d6c7f233a3615c79 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Mon, 26 Feb 2018 18:19:49 +0000 Subject: [PATCH 2/2] Comments out photo printing parts of security console and associated proc --- code/game/machinery/computer/security.dm | 15 +++++++++++++ nano/templates/secure_data.tmpl | 27 ++++++++++++++---------- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index f26dee2b7ba..8289e8714e3 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -369,6 +369,17 @@ P.name = "paper - 'Security Record'" printing = 0 +/* Removed due to BYOND issue + else if(href_list["print_p"]) + if(!printing) + printing = 1 + playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) + sleep(50) + if(istype(active1, /datum/data/record) && data_core.general.Find(active1)) + create_record_photo(active1) + printing = 0 +*/ + else if(href_list["printlogs"]) if(cell_logs.len && !printing) var/obj/item/weapon/paper/P = input(usr, "Select log to print", "Available Cell Logs") as null|anything in cell_logs @@ -501,6 +512,8 @@ /obj/machinery/computer/secure_data/proc/setTemp(text, list/buttons = list()) temp = list("text" = text, "buttons" = buttons, "has_buttons" = buttons.len > 0) +/* Proc disabled due to BYOND Issue + /obj/machinery/computer/secure_data/proc/create_record_photo(datum/data/record/R) // basically copy-pasted from the camera code but different enough that it has to be redone var/icon/photoimage = get_record_photo(R) @@ -527,6 +540,8 @@ var/obj/item/weapon/photo/PH = new/obj/item/weapon/photo(loc) PH.construct(P) +*/ + /obj/machinery/computer/secure_data/proc/get_record_photo(datum/data/record/R) // similar to the code to make a photo, but of course the actual rendering is completely different var/icon/res = icon('icons/effects/96x96.dmi', "") diff --git a/nano/templates/secure_data.tmpl b/nano/templates/secure_data.tmpl index 78cf3b9c332..bba32023a7f 100644 --- a/nano/templates/secure_data.tmpl +++ b/nano/templates/secure_data.tmpl @@ -29,24 +29,24 @@ Used In File(s): \code\game\machinery\computer\security.dm hidden.parent("td").parent("tr").hide() } } - + function selectTextField(){ var filter_text = document.getElementById('filter'); filter_text.focus(); filter_text.select(); } - + $(window).load(function() { selectTextField(); updateSearch(); }); - + $("#filter").keyup(function() { updateSearch(); }); {{/if}} -