Merge pull request #4874 from Citadel-Station-13/upstream-merge-34505

[MIRROR] Fix Camera Failure crashing the server if there are no cameras
This commit is contained in:
LetterJay
2018-01-16 13:50:10 -06:00
committed by GitHub
+6 -3
View File
@@ -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