July 5th TG sync (#1883)

July 5th TG sync
2017-07-05 22:14:19 -05:00
parent 454b9c3d68
commit b1b4826c0c
1264 changed files with 149689 additions and 570309 deletions
@@ -2,7 +2,7 @@ obj/item/projectile/energy/plasmabolt
 	icon = 'icons/obj/VGProjectile.dmi'
 	name = "plasma bolt"
 	icon_state = "plasma"
-	weaken = 0
+	knockdown = 0
 	flag = "energy"
 	damage_type = BURN
 	hitsound = 'sound/weapons/sear.ogg'
@@ -14,17 +14,17 @@ obj/item/projectile/energy/plasmabolt
 	damage = 35
 	icon_state = "plasma2"
 	irradiate = 20
-	weaken = 3
+	knockdown = 60

 /obj/item/projectile/energy/plasmabolt/rifle
 	damage = 50
 	icon_state = "plasma3"
 	irradiate = 35
-	weaken = 5
+	knockdown = 120

 /obj/item/projectile/energy/plasmabolt/MP40k
 	damage = 35
 	eyeblur = 4
 	irradiate = 25
-	weaken = 4
+	knockdown = 100
 	icon_state = "plasma3"