From 41d345b46af261461feee13bf58f61c767f56805 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Mon, 20 Nov 2023 11:33:52 +0000 Subject: [PATCH 1/3] lesser drones now die upon ghosting --- .../mob/living/carbon/xenomorph/castes/lesser_drone.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm b/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm index 48bf0d95ddcf..597928dc12f5 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm @@ -95,3 +95,11 @@ if (PF) PF.flags_pass = PASS_MOB_IS_XENO|PASS_MOB_THRU_XENO PF.flags_can_pass_all = PASS_MOB_IS_XENO|PASS_MOB_THRU_XENO + +/mob/living/carbon/xenomorph/lesser_drone/ghostize(can_reenter_corpse = FALSE, aghosted = FALSE) + . = ..() + if(.) + src.gib() + +/mob/living/carbon/xenomorph/lesser_drone/handle_ghost_message() + return From 3e4ca63ebe77f4c2a0522f3df22e40e6bf08211d Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Mon, 20 Nov 2023 12:51:51 +0000 Subject: [PATCH 2/3] aghost check --- code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm b/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm index 597928dc12f5..21dd147b83d8 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm @@ -98,7 +98,7 @@ /mob/living/carbon/xenomorph/lesser_drone/ghostize(can_reenter_corpse = FALSE, aghosted = FALSE) . = ..() - if(.) + if(. && !aghosted) src.gib() /mob/living/carbon/xenomorph/lesser_drone/handle_ghost_message() From 4291ea8756dbcb827ea3d1d94c15198fb2058098 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Wed, 22 Nov 2023 18:33:07 +0000 Subject: [PATCH 3/3] Update code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm Co-authored-by: harryob --- code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm b/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm index 21dd147b83d8..3eb11d155c74 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm @@ -99,7 +99,7 @@ /mob/living/carbon/xenomorph/lesser_drone/ghostize(can_reenter_corpse = FALSE, aghosted = FALSE) . = ..() if(. && !aghosted) - src.gib() + gib() /mob/living/carbon/xenomorph/lesser_drone/handle_ghost_message() return