From e73047ba3979d14b74af729ff1b1fcb8d79fbae6 Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Mon, 20 Dec 2021 16:46:20 -0500 Subject: [PATCH] Advanced camera consoles no longer crash when you search for a camera (#63394) --- code/game/machinery/computer/camera_advanced.dm | 2 ++ code/modules/tgui/tgui_input_list.dm | 3 +++ 2 files changed, 5 insertions(+) diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index e102f5ad556..ea4cd14d9a9 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -285,6 +285,8 @@ for (var/obj/machinery/camera/netcam in L) var/list/tempnetwork = netcam.network & origin.networks if (tempnetwork.len) + if(!netcam.c_tag) + continue T["[netcam.c_tag][netcam.can_use() ? null : " (Deactivated)"]"] = netcam playsound(origin, 'sound/machines/terminal_prompt.ogg', 25, FALSE) diff --git a/code/modules/tgui/tgui_input_list.dm b/code/modules/tgui/tgui_input_list.dm index 1a764633e13..d62014ae091 100644 --- a/code/modules/tgui/tgui_input_list.dm +++ b/code/modules/tgui/tgui_input_list.dm @@ -91,6 +91,9 @@ var/static/regex/whitelistedWords = regex(@{"([^\u0020-\u8000]+)"}) for(var/i in items) + if(!i) + continue + var/string_key = whitelistedWords.Replace("[i]", "") //avoids duplicated keys E.g: when areas have the same name