From 79cb9c33348c0f0ec8eda8dd0283d93a2d8281b8 Mon Sep 17 00:00:00 2001 From: private-tristan Date: Mon, 24 Jun 2024 23:13:37 -0400 Subject: [PATCH 1/3] Facehuggers gib on ghost --- .../mob/living/carbon/xenomorph/castes/Facehugger.dm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm index b5f8bdd17213..0eaf01915da3 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm @@ -1,8 +1,8 @@ /datum/caste_datum/facehugger caste_type = XENO_CASTE_FACEHUGGER tier = 0 - plasma_gain = 0.1 - plasma_max = 10 + plasma_gain = XENO_PLASMA_GAIN_TIER_1 + plasma_max = XENO_NO_PLASMA melee_damage_lower = 5 melee_damage_upper = 5 max_health = XENO_HEALTH_LARVA @@ -250,6 +250,14 @@ /datum/behavior_delegate/facehugger_base name = "Base Facehugger Behavior Delegate" +/mob/living/carbon/xenomorph/facehugger/ghostize(can_reenter_corpse = FALSE, aghosted = FALSE) + . = ..() + if(. && !aghosted) + gib() + +/mob/living/carbon/xenomorph/facehugger/handle_ghost_message() + return + /datum/behavior_delegate/facehugger_base/on_life() if(bound_xeno.body_position == STANDING_UP && !(locate(/obj/effect/alien/weeds) in get_turf(bound_xeno))) bound_xeno.adjustBruteLoss(1) From 707ec0e61cf47a1e29db986b948847cae12d4d71 Mon Sep 17 00:00:00 2001 From: private-tristan Date: Mon, 24 Jun 2024 23:36:37 -0400 Subject: [PATCH 2/3] Makes you turn into NPC hugger instead --- code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm index 0eaf01915da3..fdd5c7d10d27 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm @@ -253,7 +253,8 @@ /mob/living/carbon/xenomorph/facehugger/ghostize(can_reenter_corpse = FALSE, aghosted = FALSE) . = ..() if(. && !aghosted) - gib() + new /obj/item/clothing/mask/facehugger(loc, hivenumber) + qdel(src) /mob/living/carbon/xenomorph/facehugger/handle_ghost_message() return From 3f05d06b8069e8f1fb9ea07d0f2cda4e5f68bada Mon Sep 17 00:00:00 2001 From: private-tristan Date: Tue, 25 Jun 2024 01:06:53 -0400 Subject: [PATCH 3/3] Okay I guess --- .../mob/living/carbon/xenomorph/castes/Facehugger.dm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm index fdd5c7d10d27..9d42eb982d2e 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm @@ -250,15 +250,6 @@ /datum/behavior_delegate/facehugger_base name = "Base Facehugger Behavior Delegate" -/mob/living/carbon/xenomorph/facehugger/ghostize(can_reenter_corpse = FALSE, aghosted = FALSE) - . = ..() - if(. && !aghosted) - new /obj/item/clothing/mask/facehugger(loc, hivenumber) - qdel(src) - -/mob/living/carbon/xenomorph/facehugger/handle_ghost_message() - return - /datum/behavior_delegate/facehugger_base/on_life() if(bound_xeno.body_position == STANDING_UP && !(locate(/obj/effect/alien/weeds) in get_turf(bound_xeno))) bound_xeno.adjustBruteLoss(1)