From d66d488b76a51769618d0bbbb22129dcf53d2856 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 12 Jan 2022 22:54:29 +0100 Subject: [PATCH] [MIRROR] Fixes security camera range issues v2 [MDB IGNORE] (#10638) * Fixes security camera range issues v2 (#63704) * Created new state * ui_state to ui_status Co-Authored-By: Mothblocks <35135081+Mothblocks@ users.noreply.github.com> * disabled = close Co-Authored-By: LemonInTheDark <58055496+LemonInTheDark@ users.noreply.github.com> * oof habit * removes cringe Co-Authored-By: LemonInTheDark <58055496+LemonInTheDark@ users.noreply.github.com> Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com> Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@ users.noreply.github.com> * Fixes security camera range issues v2 Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com> Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com> Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@ users.noreply.github.com> --- code/game/machinery/computer/camera.dm | 5 +++-- .../modular_computers/file_system/programs/secureye.dm | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 037704dc675..bbc3fc02bbc 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -91,9 +91,10 @@ ui.open() /obj/machinery/computer/security/ui_status(mob/user) - if(!in_range(user, src) && !isobserver(user)) + . = ..() + if(. == UI_DISABLED) return UI_CLOSE - return ..() + return . /obj/machinery/computer/security/ui_data() var/list/data = list() diff --git a/code/modules/modular_computers/file_system/programs/secureye.dm b/code/modules/modular_computers/file_system/programs/secureye.dm index 99a7924938d..21d33498eab 100644 --- a/code/modules/modular_computers/file_system/programs/secureye.dm +++ b/code/modules/modular_computers/file_system/programs/secureye.dm @@ -82,6 +82,12 @@ user.client.register_map_obj(cam_background) return ..() +/datum/computer_file/program/secureye/ui_status(mob/user) + . = ..() + if(. == UI_DISABLED) + return UI_CLOSE + return . + /datum/computer_file/program/secureye/ui_data() var/list/data = get_header_data() data["network"] = network