diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 4a4c441edc..eaff61e52f 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -114,7 +114,7 @@
 		W.attack_self(src)
 		update_inv_hands()
 		return
-	
+
 	//These are always reachable.
 	//User itself, current loc, and user inventory
 	if(DirectAccess(A))
@@ -125,7 +125,7 @@
 				changeNext_move(CLICK_CD_MELEE)
 			UnarmedAttack(A)
 		return
-	
+
 	//Can't reach anything else in lockers or other weirdness
 	if(!loc.AllowClick())
 		return
@@ -325,9 +325,11 @@
 
 /mob/living/carbon/human/CtrlClick(mob/user)
 	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.next_click = world.time + CLICK_CD_MELEE
+		H.changeNext_move(CLICK_CD_MELEE)
 	else
 		..()
 /*
diff --git a/code/_onclick/click.dm.rej b/code/_onclick/click.dm.rej
deleted file mode 100644
index cf73a2b45a..0000000000
--- a/code/_onclick/click.dm.rej
+++ /dev/null
@@ -1,13 +0,0 @@
-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)