diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index ce71bdb212..b46dd58555 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -133,7 +133,7 @@ var/slowdown_priority = 50 //to make sure the stronger effect overrides var/affect_crawl = FALSE var/nextmove_modifier = 1 - var/stamdmg_per_ds = 1 //a 20 duration would do 20 stamdmg, disablers do 24 or something + var/stamdmg_per_ds = 0 //a 20 duration would do 20 stamdmg, disablers do 24 or something var/last_tick = 0 //fastprocess processing speed is a goddamn sham, don't trust it. /datum/status_effect/electrode/on_creation(mob/living/new_owner, set_duration) @@ -172,6 +172,7 @@ slowdown_priority = 100 nextmove_modifier = 2 blocks_combatmode = TRUE + stamdmg_per_ds = 1 /datum/status_effect/electrode/no_combat_mode/on_creation(mob/living/new_owner, set_duration) . = ..() diff --git a/code/modules/projectiles/projectile/energy/stun.dm b/code/modules/projectiles/projectile/energy/stun.dm index 6ae6564671..bc5992a6ba 100644 --- a/code/modules/projectiles/projectile/energy/stun.dm +++ b/code/modules/projectiles/projectile/energy/stun.dm @@ -9,7 +9,8 @@ stutter = 10 jitter = 20 hitsound = 'sound/weapons/taserhit.ogg' - range = 7 + range = 14 + speed = 0.6 tracer_type = /obj/effect/projectile/tracer/stun muzzle_type = /obj/effect/projectile/muzzle/stun impact_type = /obj/effect/projectile/impact/stun @@ -42,7 +43,6 @@ knockdown_stamoverride = 0 knockdown_stam_max = 0 strong_tase = FALSE - range = 12 /obj/item/projectile/energy/electrode/security/hos knockdown = 100