From afa17a66bd4ce355a42051cf8c6179dbbcf98fdb Mon Sep 17 00:00:00 2001 From: PKPenguin321 Date: Mon, 29 Aug 2016 21:11:03 -0700 Subject: [PATCH 1/2] blacklists lattices from the tesla --- code/modules/power/tesla/energy_ball.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index ee835dac8fb..6af4d863856 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -15,7 +15,8 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics, /obj/machinery/field/containment, /obj/structure/disposalpipe, /obj/structure/sign, - /obj/machinery/gateway)) + /obj/machinery/gateway, + /obj/structure/lattice)) /obj/singularity/energy_ball name = "energy ball" From a785adb94fdaded9c4ef1f927cbf1e7d9380bf8b Mon Sep 17 00:00:00 2001 From: PKPenguin321 Date: Tue, 30 Aug 2016 15:51:07 -0700 Subject: [PATCH 2/2] fixes bomb testing camera exploding forever Fixes https://github.com/tgstation/tgstation/issues/20231 --- code/game/machinery/camera/camera.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 0bc318a5494..d58b2f71d03 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -109,6 +109,7 @@ if(isEmpProof()) return ..() + qdel(src)//to prevent bomb testing camera from exploding over and over forever /obj/machinery/camera/blob_act(obj/effect/blob/B) if(B && B.loc == loc)