mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-15 20:22:07 +00:00
Fixes crank weapons never charging using the crank. Fixes stun batons having functionally infinite charge. (#82189)
## About The Pull Request https://github.com/tgstation/tgstation/pull/81579 overlooked some areas. I suspect there are others. We'll find them eventually I'm sure. ## Why It's Good For The Game These values weren't utilizing any define, so when power itself was changed to use not only a define but one with a value immensely disproportionate to the magic numbers added to these items, well...you get these problems. ## Changelog 🆑 fix: Crank weapons now can actually be charged using their crank. fix: Stun batons and their variants now actually meaningfully consume charge when used. /🆑 --------- Co-authored-by: Pickle-Coding <58013024+Pickle-Coding@users.noreply.github.com>
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
AddComponent( \
|
||||
/datum/component/crank_recharge, \
|
||||
charging_cell = get_cell(), \
|
||||
charge_amount = 500, \
|
||||
charge_amount = STANDARD_CELL_CHARGE * 0.5, \
|
||||
cooldown_time = 2 SECONDS, \
|
||||
charge_sound = 'sound/weapons/laser_crank.ogg', \
|
||||
charge_sound_cooldown_time = 1.8 SECONDS, \
|
||||
@@ -50,7 +50,7 @@
|
||||
AddComponent( \
|
||||
/datum/component/crank_recharge, \
|
||||
charging_cell = get_cell(), \
|
||||
charge_amount = 1000, \
|
||||
charge_amount = STANDARD_CELL_CHARGE, \
|
||||
cooldown_time = 2 SECONDS, \
|
||||
charge_sound = 'sound/weapons/laser_crank.ogg', \
|
||||
charge_sound_cooldown_time = 1.8 SECONDS, \
|
||||
@@ -97,7 +97,7 @@
|
||||
/datum/component/crank_recharge, \
|
||||
charging_cell = get_cell(), \
|
||||
spin_to_win = TRUE, \
|
||||
charge_amount = 125, \
|
||||
charge_amount = LASER_SHOTS(8, STANDARD_CELL_CHARGE), \
|
||||
cooldown_time = 0.8 SECONDS, \
|
||||
charge_sound = 'sound/weapons/kinetic_reload.ogg', \
|
||||
charge_sound_cooldown_time = 0.8 SECONDS, \
|
||||
|
||||
Reference in New Issue
Block a user