Merge branch 'master' of https://github.com/Alphas00/GS13

2026-07-13 08:57:01 +01:00 · 2024-06-29 11:51:23 +02:00
parent 6564e22761 aac2917c60
commit 9fc21c4656
3 changed files with 4 additions and 4 deletions
@@ -14,7 +14,7 @@
 	icon_state = "spark"
 	color = "#FFFF00"
 	nodamage = 1
-	knockdown = 100
+	knockdown = 50
 	stutter = 5
 	jitter = 20
 	hitsound = 'sound/weapons/taserhit.ogg'
@@ -160,7 +160,7 @@
 	damage = 8
 	damage_type = TOX
 	nodamage = 0
-	knockdown = 100
+	knockdown = 50
 	stutter = 5

 /obj/item/projectile/energy/bolt/halloween
@@ -4,7 +4,7 @@
 	damage = 8
 	damage_type = TOX
 	nodamage = 0
-	knockdown = 100
+	knockdown = 50
 	stutter = 5
 	drowsy = 50

@@ -201,7 +201,7 @@
 	icon = 'modular_citadel/icons/obj/projectiles.dmi'
 	color = null
 	nodamage = 1
-	knockdown = 100
+	knockdown = 50
 	stamina = 5
 	stutter = 5
 	jitter = 20