From 5e7e4c934d890444651aff7e63426170f44053d3 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 16 Jan 2018 09:38:56 -0500 Subject: [PATCH 1/2] Merge pull request #34505 from AutomaticFrenzy/patch/camera-failure-crash Fix Camera Failure crashing the server if there are no cameras --- code/modules/events/camerafailure.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/events/camerafailure.dm b/code/modules/events/camerafailure.dm index cbc2d95776..d411857852 100644 --- a/code/modules/events/camerafailure.dm +++ b/code/modules/events/camerafailure.dm @@ -10,10 +10,13 @@ /datum/round_event/camera_failure/start() var/iterations = 1 - var/obj/machinery/camera/C = pick(GLOB.cameranet.cameras) + var/list/cameras = GLOB.cameranet.cameras.Copy() while(prob(round(100/iterations))) - while(!("SS13" in C.network)) - C = pick(GLOB.cameranet.cameras) + var/obj/machinery/camera/C = pick_n_take(cameras) + if (!C) + break + if (!("SS13" in C.network)) + continue if(C.status) C.toggle_cam(null, 0) iterations *= 2.5