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
@@ -52,7 +52,7 @@
 	if(!.)
 		return
 	if(!buckled && knockdown)
-		Weaken(3)
+		Knockdown(60)

 /obj/effect/abstract/proximity_checker/onShuttleMove()
 	//timer so it only happens once