properly fixes quickgrab exploit

2017-05-21 22:27:54 -05:00
parent 5fd5e32628
commit 1989e3d5ea
1 changed files with 13 additions and 0 deletions
@@ -0,0 +1,13 @@
+diff a/code/_onclick/click.dm b/code/_onclick/click.dm	(rejected hunks)
+@@ -324,9 +324,9 @@
+ 		ML.pulled(src)
+ 
+ /mob/living/carbon/human/CtrlClick(mob/user)
+-	if(world.time < user.next_move)
+-		return FALSE
+ 	if(ishuman(user) && Adjacent(user))
+		if(world.time < user.next_move)
+			return FALSE
+ 		var/mob/living/carbon/human/H = user
+ 		H.dna.species.grab(H, src, H.martial_art)
+ 		H.changeNext_move(CLICK_CD_MELEE)