From a31a6b9fb869b3a271a16bdf38f997b30fc7e9bf Mon Sep 17 00:00:00 2001
From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com>
Date: Sun, 24 Sep 2023 17:07:58 +0300
Subject: [PATCH 1/4] a

---
 code/_onclick/click.dm                                | 2 +-
 code/modules/mob/living/carbon/xenomorph/Xenomorph.dm | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 86390718b6ca..df7dd48a1dd1 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -210,7 +210,7 @@
 		return TRUE
 
 	if (mods["ctrl"])
-		if (Adjacent(user) && user.next_move < world.time)
+		if (Adjacent(user))
 			user.start_pulling(src)
 		return TRUE
 	return FALSE
diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
index 90c22e19c483..5c9a0f025c0e 100644
--- a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
+++ b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
@@ -759,8 +759,6 @@
 		return FALSE
 	var/atom/A = AM.handle_barriers(src)
 	if(A != AM)
-		A.attack_alien(src)
-		xeno_attack_delay(src)
 		return FALSE
 	return ..()
 

From 48778219ceeff52a99f4eeec532c983596d5ea2a Mon Sep 17 00:00:00 2001
From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com>
Date: Fri, 29 Sep 2023 10:53:41 +0300
Subject: [PATCH 2/4] Brings grab intent in line with ctrl click

---
 code/_onclick/click.dm                                   | 8 +++++---
 code/modules/mob/living/carbon/xenomorph/attack_alien.dm | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index df7dd48a1dd1..bd35800e67ab 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -126,10 +126,11 @@
 	if (!isturf(loc))
 		return
 
-	if (world.time <= next_move && A.loc != src) // Attack click cooldown check
+	if (world.time <= next_move && A.loc != src && src.a_intent != INTENT_GRAB) // Attack click cooldown check
 		return
 
-	next_move = world.time
+	if (src.a_intent != INTENT_GRAB)
+		next_move = world.time
 	// If standing next to the atom clicked.
 	if(A.Adjacent(src))
 		click_adjacent(A, W, mods)
@@ -158,7 +159,8 @@
 			W.afterattack(A, src, 1, mods)
 	else
 		if(!isitem(A) && !issurface(A))
-			next_move += 4
+			if (a_intent != INTENT_GRAB)
+				next_move += 4
 		UnarmedAttack(A, 1, mods)
 
 /mob/proc/check_click_intercept(params,A)
diff --git a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm
index 25f6108c14f6..2c5a7df71a23 100644
--- a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm
+++ b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm
@@ -39,6 +39,7 @@
 
 			if(Adjacent(M)) //Logic!
 				M.start_pulling(src)
+				return XENO_NO_DELAY_ACTION
 
 		if(INTENT_HARM)
 			if(M.can_not_harm(src))

From 2dbd52bb0a597cde42875f21cde0bc977f6df799 Mon Sep 17 00:00:00 2001
From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com>
Date: Fri, 6 Oct 2023 19:14:34 +0300
Subject: [PATCH 3/4] Update click.dm

---
 code/_onclick/click.dm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index bd35800e67ab..758a45674487 100644
--- 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)

From 950deac68affe775b8bc8088769c31b64db32b39 Mon Sep 17 00:00:00 2001
From: Git-Nivrak <59925169+Git-Nivrak@users.noreply.github.com>
Date: Fri, 6 Oct 2023 20:38:15 +0300
Subject: [PATCH 4/4] Update click.dm

---
 code/_onclick/click.dm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 758a45674487..98792d1c59f6 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -126,7 +126,9 @@
 	if (!isturf(loc))
 		return
 
-	if(A.Adjacent(src) && src.a_intent == INTENT_GRAB && !W)
+	var/adjacent = A.Adjacent(src)
+
+	if(adjacent && src.a_intent == INTENT_GRAB && !W)
 		click_adjacent(A, W, mods)
 		return
 
@@ -135,7 +137,7 @@
 
 	next_move = world.time
 	// If standing next to the atom clicked.
-	if(A.Adjacent(src))
+	if(adjacent)
 		click_adjacent(A, W, mods)
 		return