Update click.dm

cmss13-devs · Oct 6, 2023 · 2dbd52b · 2dbd52b
1 parent 4877821
commit 2dbd52b
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
@@ -126,11 +126,14 @@
 	if (!isturf(loc))
 		return
 
-	if (world.time <= next_move && A.loc != src && src.a_intent != INTENT_GRAB) // Attack click cooldown check
+	if(A.Adjacent(src) && src.a_intent == INTENT_GRAB && !W)
+		click_adjacent(A, W, mods)
+		return
+
+	if (world.time <= next_move && A.loc != src) // Attack click cooldown check
 		return
 
-	if (src.a_intent != INTENT_GRAB)
-		next_move = world.time
+	next_move = world.time
 	// If standing next to the atom clicked.
 	if(A.Adjacent(src))
 		click_adjacent(A, W, mods)
@@ -158,9 +161,8 @@
 
 			W.afterattack(A, src, 1, mods)
 	else
-		if(!isitem(A) && !issurface(A))
-			if (a_intent != INTENT_GRAB)
-				next_move += 4
+		if(!isitem(A) && !issurface(A) && src.a_intent != INTENT_GRAB)
+			next_move += 4
 		UnarmedAttack(A, 1, mods)
 
 /mob/proc/check_click_intercept(params,A)