Merge branch 'MrSky12:master' into master

2026-07-12 08:27:24 +01:00 · 2024-06-22 20:56:14 +02:00
parent a23ede44cb d70700b0a6
commit aac2917c60
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