Merge pull request #2637 from ZeroNetAlpha/Taser-Tweaks

Buffs Stun Weapons
ARF-SS13 · Jul 15, 2023 · 3ecbbc3 · 3ecbbc3
2 parents c2e8b81 + 3229289
commit 3ecbbc3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
@@ -381,6 +381,7 @@
 	tracer_type = /obj/effect/projectile/tracer/disabler
 	muzzle_type = /obj/effect/projectile/muzzle/disabler
 	impact_type = /obj/effect/projectile/impact/disabler
+	is_reflectable = FALSE
 
 
 /obj/item/projectile/beam/laser/recharger/hitscan //hitscan recharger pistol

diff --git a/code/modules/projectiles/projectile/energy/stun.dm b/code/modules/projectiles/projectile/energy/stun.dm
@@ -2,7 +2,7 @@
 	name = "electrode"
 	icon_state = "spark"
 	color = "#FFFF00"
-	nodamage = TRUE
+	nodamage = FALSE
 	knockdown = 60
 	knockdown_stamoverride = 36
 	knockdown_stam_max = 50
@@ -16,6 +16,8 @@
 	impact_type = /obj/effect/projectile/impact/stun
 	var/tase_duration = 50
 	var/strong_tase = TRUE
+	damage = 75
+	damage_type = STAMINA
 
 /obj/item/projectile/energy/electrode/on_hit(atom/target, blocked = FALSE)
 	. = ..()