From 31f6898a871ca5f02e6fdb705ad67733c757dc3d Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Sun, 24 Sep 2017 17:57:58 -0500 Subject: [PATCH 1/2] Stops AIs from giving the borg a free secondary light (#30913) * Stops AIs from giving the borg a free secondary light * Using a camera var now * Wrong if * My brain is not working --- code/game/machinery/camera/camera.dm | 2 ++ code/modules/mob/living/silicon/ai/ai.dm | 2 +- code/modules/mob/living/silicon/robot/robot.dm | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index bc6833f84a..d7832622c5 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -39,6 +39,8 @@ // Upgrades bitflag var/upgrades = 0 + var/internal_light = TRUE //Whether it can light up when an AI views it + /obj/machinery/camera/Initialize(mapload) . = ..() assembly = new(src) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 4264ab74c4..3bf2223047 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -740,7 +740,7 @@ var/list/obj/machinery/camera/visible = list() for (var/datum/camerachunk/CC in eyeobj.visibleCameraChunks) for (var/obj/machinery/camera/C in CC.cameras) - if (!C.can_use() || get_dist(C, eyeobj) > 7) + if (!C.can_use() || get_dist(C, eyeobj) > 7 || !C.internal_light) continue visible |= C diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 8fab4c3286..01baf578ee 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -129,6 +129,7 @@ builtInCamera = new (src) builtInCamera.c_tag = real_name builtInCamera.network = list("SS13") + builtInCamera.internal_light = FALSE if(wires.is_cut(WIRE_CAMERA)) builtInCamera.status = 0 module = new /obj/item/robot_module(src)