From 83517ad545b87d2783f71e93cddd9c92a9170bbc Mon Sep 17 00:00:00 2001 From: Morrow Date: Sun, 18 Jun 2023 15:55:42 -0400 Subject: [PATCH 1/3] Initial --- code/modules/mob/living/carbon/xenomorph/attack_alien.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm index 33cf6142acb1..28c6b31f38ed 100644 --- a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm +++ b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm @@ -287,6 +287,9 @@ SPAN_DANGER("You nudge your head against [src]."), null, 5, CHAT_TYPE_XENO_FLUFF) /mob/living/proc/is_xeno_grabbable() + if(stat == DEAD) + return FALSE + return TRUE /mob/living/carbon/human/is_xeno_grabbable() From dee216215265e42a952496a49d6f76df2f9475d0 Mon Sep 17 00:00:00 2001 From: Morrow Date: Sun, 18 Jun 2023 16:56:23 -0400 Subject: [PATCH 2/3] da larva --- code/modules/mob/living/carbon/xenomorph/attack_alien.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm index 28c6b31f38ed..b601eb63029c 100644 --- a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm +++ b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm @@ -287,7 +287,7 @@ SPAN_DANGER("You nudge your head against [src]."), null, 5, CHAT_TYPE_XENO_FLUFF) /mob/living/proc/is_xeno_grabbable() - if(stat == DEAD) + if(stat == DEAD && !istype(src, /mob/living/carbon/xenomorph/larva)) return FALSE return TRUE From 58f45b33fb54607282ffdcc1e8b120c413a78207 Mon Sep 17 00:00:00 2001 From: Morrow Date: Wed, 28 Jun 2023 02:35:30 -0400 Subject: [PATCH 3/3] the smart way --- code/modules/mob/living/carbon/xenomorph/attack_alien.dm | 2 +- code/modules/mob/living/carbon/xenomorph/castes/Larva.dm | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm index b601eb63029c..28c6b31f38ed 100644 --- a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm +++ b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm @@ -287,7 +287,7 @@ SPAN_DANGER("You nudge your head against [src]."), null, 5, CHAT_TYPE_XENO_FLUFF) /mob/living/proc/is_xeno_grabbable() - if(stat == DEAD && !istype(src, /mob/living/carbon/xenomorph/larva)) + if(stat == DEAD) return FALSE return TRUE diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm b/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm index 04b7e04c2da5..4cf0ff113615 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm @@ -170,3 +170,5 @@ /mob/living/carbon/xenomorph/larva/emote(act, m_type, message, intentional, force_silence) playsound(loc, "alien_roar_larva", 15) +/mob/living/carbon/xenomorph/larva/is_xeno_grabbable() + return TRUE