Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Tesla coil input multiplier balance #2990

Merged
merged 1 commit into from
Apr 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions code/modules/power/tesla/coil.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
. = ..()
Expand Down
9 changes: 9 additions & 0 deletions modular_nova/master_files/code/modules/power/tesla/coil.dm
Original file line number Diff line number Diff line change
@@ -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)
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading