Merge pull request #14337 from kiwedespars/we-hate-cqc

nerfs cqc (probably)
2021-03-10 01:32:14 -07:00
parent 563b4a1d8f 081b669345
commit 18fdd0c6cf
2 changed files with 6 additions and 6 deletions
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -3,9 +3,8 @@

 /obj/item/melee/proc/check_martial_counter(mob/living/carbon/human/target, mob/living/carbon/human/user)
 	if(target.check_martial_melee_block())
-		target.visible_message("<span class='danger'>[target.name] blocks [src] and twists [user]'s arm behind [user.p_their()] back!</span>",
+		target.visible_message("<span class='danger'>[target.name] blocks your attack!</span>",
 					"<span class='userdanger'>You block the attack!</span>")
-		user.Stun(40)
 		return TRUE

 /obj/item/melee/chainofcommand