From b98fb70da832cf9a5c59f4eb718f605f63b93fc6 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Sat, 3 Mar 2018 22:28:55 -0600 Subject: [PATCH] Fixes Tesla Coil Circuits and contruction --- .../items/circuitboards/machine_circuitboards.dm | 14 +++++--------- code/modules/power/tesla/coil.dm | 2 -- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 71eaa330d1..bb0357b4b1 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -537,18 +537,14 @@ req_components = list(/obj/item/stock_parts/capacitor = 1) needs_anchored = FALSE -#define PATH_POWERCOIL /obj/item/circuitboard/machine/tesla_coil/power -#define PATH_RPCOIL /obj/item/circuitboard/machine/tesla_coil/research +#define PATH_POWERCOIL /obj/machinery/power/tesla_coil/power +#define PATH_RPCOIL /obj/machinery/power/tesla_coil/research /obj/item/circuitboard/machine/tesla_coil/Initialize() . = ..() - if(!build_path) - if(prob(50)) - name = "Tesla Coil (Machine Board)" - build_path = PATH_POWERCOIL - else - name = "Tesla Corona Researcher (Machine Board)" - build_path = PATH_RPCOIL + if(build_path) + name = "Tesla Coil (Machine Board)" + build_path = PATH_POWERCOIL /obj/item/circuitboard/machine/tesla_coil/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/screwdriver)) diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index 6c94d6c11a..85fc5b234b 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -114,8 +114,6 @@ /obj/machinery/power/tesla_coil/research/tesla_act(var/power) if(anchored && !panel_open) obj_flags |= BEING_SHOCKED - //don't lose arc power when it's not connected to anything - //please place tesla coils all around the station to maximize effectiveness var/power_produced = powernet ? power / power_loss : power add_avail(power_produced*input_power_multiplier) flick("rpcoilhit", src)