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.

Sign up for GitHub

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] Fixes crank weapons never charging using the crank. Fixes stun batons having functionally infinite charge. #2561

Merged
merged 1 commit into from
Mar 25, 2024
Merged

[MIRROR] Fixes crank weapons never charging using the crank. Fixes stun batons having functionally infinite charge. #2561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions code/game/objects/items/melee/baton.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@
var/throw_stun_chance = 35
var/obj/item/stock_parts/cell/cell
var/preload_cell_type //if not empty the baton starts with this type of cell
var/cell_hit_cost = 1000
var/cell_hit_cost = STANDARD_CELL_CHARGE
var/can_remove_cell = TRUE
var/convertible = TRUE //if it can be converted with a conversion kit

Expand Down Expand Up @@ -694,7 +694,7 @@
w_class = WEIGHT_CLASS_HUGE
force = 3
throwforce = 5
cell_hit_cost = 2000
cell_hit_cost = STANDARD_CELL_CHARGE * 2
throw_stun_chance = 10
slot_flags = ITEM_SLOT_BACK
convertible = FALSE
Expand Down Expand Up @@ -758,7 +758,7 @@
force = 5
throwforce = 5
throw_range = 5
cell_hit_cost = 2000
cell_hit_cost = STANDARD_CELL_CHARGE * 2
throw_stun_chance = 99 //Have you prayed today?
convertible = FALSE
custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/glass = SHEET_MATERIAL_AMOUNT*2, /datum/material/silver = SHEET_MATERIAL_AMOUNT*5, /datum/material/gold = SHEET_MATERIAL_AMOUNT)
Expand Down
6 changes: 3 additions & 3 deletions code/modules/projectiles/guns/energy/crank_guns.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, \
Expand Down Expand Up @@ -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, \
Expand Down Expand Up @@ -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, \
Expand Down
Loading