From c6149c4cc96c569672142e8c80b228f242e551c1 Mon Sep 17 00:00:00 2001 From: Fira Date: Wed, 6 Dec 2023 19:45:27 +0000 Subject: [PATCH 1/2] fix warrior hell pull --- code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm b/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm index d3d34af98908..31e74b086db5 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm @@ -96,7 +96,8 @@ if(should_neckgrab && living_mob.mob_size < MOB_SIZE_BIG) living_mob.drop_held_items() living_mob.apply_effect(get_xeno_stun_duration(living_mob, 2), WEAKEN) - living_mob.pulledby = src + if(living_mob.pulledby != src) + return // Garb was broken, probably as Stun sideeffect (eg. target getting knocked away from a manned M56D) visible_message(SPAN_XENOWARNING("[src] grabs [living_mob] by the throat!"), \ SPAN_XENOWARNING("You grab [living_mob] by the throat!")) lunging = TRUE From 7439c57ecc54c8bba6ab356fecbd73d85381c754 Mon Sep 17 00:00:00 2001 From: fira Date: Wed, 6 Dec 2023 20:44:22 +0000 Subject: [PATCH 2/2] Update code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm Co-authored-by: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com> --- code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm b/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm index 31e74b086db5..2e7ca294dc86 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm @@ -97,7 +97,7 @@ living_mob.drop_held_items() living_mob.apply_effect(get_xeno_stun_duration(living_mob, 2), WEAKEN) if(living_mob.pulledby != src) - return // Garb was broken, probably as Stun sideeffect (eg. target getting knocked away from a manned M56D) + return // Grab was broken, probably as Stun side effect (eg. target getting knocked away from a manned M56D) visible_message(SPAN_XENOWARNING("[src] grabs [living_mob] by the throat!"), \ SPAN_XENOWARNING("You grab [living_mob] by the throat!")) lunging = TRUE