From cd8d4915c779db4bce3ebe6cc1ffcef9da93af8d Mon Sep 17 00:00:00 2001 From: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com> Date: Wed, 20 Feb 2019 08:33:21 +0100 Subject: [PATCH] Tesla coil zapping no longer blows up everything (#42789) the tesla_zap() didnt have any flags specified so it was using default settings aka tesla's zaps --- code/modules/power/tesla/coil.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index 736884a4271..8d8c92567a2 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -13,6 +13,7 @@ circuit = /obj/item/circuitboard/machine/tesla_coil + var/tesla_flags = TESLA_MOB_DAMAGE | TESLA_OBJ_DAMAGE var/power_loss = 2 var/input_power_multiplier = 1 var/zap_cooldown = 100 @@ -102,7 +103,7 @@ var/power = (powernet.avail/2) add_load(power) playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5) - tesla_zap(src, 10, power/(coeff/2)) + tesla_zap(src, 10, power/(coeff/2), tesla_flags) tesla_buckle_check(power/(coeff/2)) // Tesla R&D researcher