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
@@ -17,10 +17,9 @@
 		to_chat(H, "<span class='notice'>Your morale is increased by [user]'s banner!</span>")
 		H.adjustBruteLoss(-15)
 		H.adjustFireLoss(-15)
-		H.AdjustStunned(-2)
-		H.AdjustWeakened(-2)
-		H.AdjustParalysis(-2)
-
+		H.AdjustStun(-40)
+		H.AdjustKnockdown(-40)
+		H.AdjustUnconscious(-40)

 /obj/item/weapon/banner/red
 	name = "red banner"