Skip to content

Disabler changes #12746

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

Open
zzzmike wants to merge 2 commits into
base: master
Choose a base branch
from
+2 −2
Open

Disabler changes #12746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db56064
Update energy.dm
zzzmike Jul 27, 2026
cff5d0b
Update energy.dm
zzzmike Jul 27, 2026
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: 1 addition & 1 deletion code/datums/ammo/energy.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
flags_ammo_behavior = AMMO_ENERGY|AMMO_IGNORE_RESIST|AMMO_ALWAYS_FF //Not that ignoring will do much right now.
stamina_damage = 45
accuracy = HIT_ACCURACY_TIER_8
shell_speed = AMMO_SPEED_TIER_1 // Slightly faster
shell_speed = AMMO_SPEED_TIER_2 // Slightly faster
hit_effect_color = "#FFFF00"

/datum/ammo/energy/taser/on_hit_mob(mob/mobs, obj/projectile/P)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/energy.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@
fire_sound = 'sound/weapons/Taser.ogg'
w_class = SIZE_MEDIUM
ammo = /datum/ammo/energy/taser/precise
charge_cost = 625 // approx 16 shots.
charge_cost = 1000 // approx 10 shots.
has_charge_meter = TRUE
charge_icon = "+taser"
black_market_value = 20
Expand Down