From e71fc67c46f4e8cd95d61a34c07037d709c0a772 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 15 Mar 2023 01:52:02 +0100 Subject: [PATCH] [MIRROR] Fixes malf camera upgrade appearing on security camera consoles [MDB IGNORE] (#19870) * Fixes malf camera upgrade appearing on security camera consoles (#73970) ## About The Pull Request Wow that was easier than I thought Malf AI camera upgrade no longer shows up camera consoles. Advanced Camera consoles probably still show it but those are harder to get so someone else can fix those ## Why It's Good For The Game It is admittedly very funny to instantly valid a malf ai but probably not fun ## Changelog :cl: Melbert fix: Malf AI's xray camera upgrade no longer shows on station security camera consoles /:cl: * Fixes malf camera upgrade appearing on security camera consoles --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> --- code/game/machinery/computer/camera.dm | 2 +- code/modules/modular_computers/file_system/programs/secureye.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 8292d77b289..0ec7183e7e2 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -144,7 +144,7 @@ last_camera_turf = new_cam_turf //Here we gather what's visible from the camera's POV based on its view_range and xray modifier if present - var/list/visible_things = active_camera.isXRay() ? range(active_camera.view_range, new_cam_turf) : view(active_camera.view_range, new_cam_turf) + var/list/visible_things = active_camera.isXRay(ignore_malf_upgrades = TRUE) ? range(active_camera.view_range, new_cam_turf) : view(active_camera.view_range, new_cam_turf) for(var/turf/visible_turf in visible_things) visible_turfs += visible_turf diff --git a/code/modules/modular_computers/file_system/programs/secureye.dm b/code/modules/modular_computers/file_system/programs/secureye.dm index 67cfd6dcecb..d3f1dbbab38 100644 --- a/code/modules/modular_computers/file_system/programs/secureye.dm +++ b/code/modules/modular_computers/file_system/programs/secureye.dm @@ -149,7 +149,7 @@ last_camera_turf = new_cam_turf //Here we gather what's visible from the camera's POV based on its view_range and xray modifier if present - var/list/visible_things = active_camera.isXRay() ? range(active_camera.view_range, new_cam_turf) : view(active_camera.view_range, new_cam_turf) + var/list/visible_things = active_camera.isXRay(ignore_malf_upgrades = TRUE) ? range(active_camera.view_range, new_cam_turf) : view(active_camera.view_range, new_cam_turf) for(var/turf/visible_turf in visible_things) visible_turfs += visible_turf