From 21bce86db4afd079f4e80804d1cd0be4c42bb3ee Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Wed, 31 Mar 2021 05:12:32 -0400 Subject: [PATCH] Merge pull request #10052 from VOREStation/upstream-merge-8001 [MIRROR] Fixes runtime in prison_break.dm, line 214 --- code/modules/gamemaster/event2/events/security/prison_break.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/gamemaster/event2/events/security/prison_break.dm b/code/modules/gamemaster/event2/events/security/prison_break.dm index 52f7e6d242..e7daadb9f0 100644 --- a/code/modules/gamemaster/event2/events/security/prison_break.dm +++ b/code/modules/gamemaster/event2/events/security/prison_break.dm @@ -211,7 +211,7 @@ /datum/event2/event/prison_break/proc/flicker_area() for(var/area/A in areas_to_break) var/obj/machinery/power/apc/apc = A.get_apc() - if(apc.operating) //If the apc's off, it's a little hard to overload the lights. + if(istype(apc) && apc.operating) //If the apc's off, it's a little hard to overload the lights. for(var/obj/machinery/light/L in A) L.flicker(10)