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
@@ -39,8 +39,8 @@
 		if((D.stat != DEAD) && prob(knockout_prob))
 			D.visible_message("<span class='danger'>[A] has knocked [D] out with a haymaker!</span>", \
 								"<span class='userdanger'>[A] has knocked [D] out with a haymaker!</span>")
-			D.apply_effect(10,WEAKEN,armor_block)
-			D.SetSleeping(5)
+			D.apply_effect(200,KNOCKDOWN,armor_block)
+			D.SetSleeping(100)
 			D.forcesay(GLOB.hit_appends)
 			add_logs(A, D, "knocked out (boxing) ")
 		else if(D.lying)