diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index 7d8fab5dd77..fd0533c9c94 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -42,6 +42,7 @@ return ITEM_INTERACT_BLOCKING return ..() +/* NOVA EDIT CHANGE BEGIN - MOVED TO modular_nova/master_files/code/modules/power/tesla/coil.dm /obj/machinery/power/energy_accumulator/tesla_coil/RefreshParts() . = ..() var/power_multiplier = 0 @@ -50,6 +51,7 @@ power_multiplier += capacitor.tier zap_cooldown -= (capacitor.tier * 20) input_power_multiplier = max(1 * (power_multiplier / 8), 0.25) //Max out at 50% efficency. +*/// NOVA EDIT CHANGE END /obj/machinery/power/energy_accumulator/tesla_coil/examine(mob/user) . = ..() diff --git a/modular_nova/master_files/code/modules/power/tesla/coil.dm b/modular_nova/master_files/code/modules/power/tesla/coil.dm new file mode 100644 index 00000000000..93b2c5a6e70 --- /dev/null +++ b/modular_nova/master_files/code/modules/power/tesla/coil.dm @@ -0,0 +1,9 @@ +/obj/machinery/power/energy_accumulator/tesla_coil/RefreshParts() + . = ..() + var/new_power_multiplier = 0.44 + zap_cooldown = 10 SECONDS + for(var/datum/stock_part/capacitor/capacitor in component_parts) + new_power_multiplier += capacitor.tier * 0.12 + zap_cooldown -= (capacitor.tier * 2 SECONDS) + + input_power_multiplier = clamp(new_power_multiplier, 0.44, 0.92) diff --git a/tgstation.dme b/tgstation.dme index d0d1b3677f8..fbb165473eb 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6643,6 +6643,7 @@ #include "modular_nova\master_files\code\modules\power\powernet.dm" #include "modular_nova\master_files\code\modules\power\lighting\light_mapping_helpers.dm" #include "modular_nova\master_files\code\modules\power\singularity\containment_field.dm" +#include "modular_nova\master_files\code\modules\power\tesla\coil.dm" #include "modular_nova\master_files\code\modules\projectiles\boxes_magazines\external\shotgun.dm" #include "modular_nova\master_files\code\modules\projectiles\boxes_magazines\external\smg.dm" #include "modular_nova\master_files\code\modules\projectiles\guns\ballistic.dm"