From 928154bf45ada30899a4f4295d4d580e8121582f Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Sun, 12 Nov 2023 20:15:15 +0000 Subject: [PATCH] addressed further review --- code/modules/cm_aliens/structures/egg.dm | 5 ++++- .../xenomorph/mutators/strains/carrier/eggsac.dm | 11 ++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index a2d7b9d54f68..860fe0d0f2ff 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -307,8 +307,11 @@ SPECIAL EGG USED BY EGG CARRIER /obj/effect/alien/egg/carrier_egg name = "fragile egg" desc = "It looks like a weird, fragile egg." + ///Owner of the fragile egg, must be a mob/living/carbon/xenomorph/carrier var/mob/living/carbon/xenomorph/carrier/owner = null + ///Time that the carrier was last within refresh range of the egg (14 tiles) var/last_refreshed = null + /// Timer holder for the maximum lifetime of the egg as defined CARRIER_EGG_MAXIMUM_LIFE var/life_timer = null /obj/effect/alien/egg/carrier_egg/Initialize(mapload, hivenumber, planter = null) @@ -326,7 +329,7 @@ SPECIAL EGG USED BY EGG CARRIER if(life_timer) deltimer(life_timer) owner = null - . = ..() + return ..() /// Set the owner of the egg to the planter. /obj/effect/alien/egg/carrier_egg/proc/set_owner(mob/living/carbon/xenomorph/carrier/planter) diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm index af006604f14e..afbc7b968474 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/carrier/eggsac.dm @@ -1,5 +1,3 @@ -#define EGGSAC_OFF_WEED_EGGCAP 4 - /datum/xeno_mutator/eggsac name = "STRAIN: Carrier - Eggsac" description = "In exchange for your ability to store huggers and place traps, you gain larger plasma stores, strong pheromones, and the ability to lay eggs by using your plasma stores. In addition, you can now carry twelve eggs at once and can place eggs one pace further than normal. \n\nYou can also place a small number of fragile eggs on normal weeds. These eggs have a lifetime of five minutes while you remain within 14 tiles. Or one minute if you leave this range." @@ -46,11 +44,17 @@ apply_behavior_holder(carrier) return TRUE +#define EGGSAC_OFF_WEED_EGGCAP 4 +#define EGGSAC_EGG_SUSTAIN_DISTANCE 14 + /datum/behavior_delegate/carrier_eggsac name = "Eggsac Carrier Behavior Delegate" + ///List of /obj/effect/alien/egg/carrier_egg sustained by the carrier on normal weeds var/list/eggs_sustained = list() + ///Total number of eggs which can be sustained defined as EGGSAC_OFF_WEED_EGGCAP var/egg_sustain_cap = EGGSAC_OFF_WEED_EGGCAP - var/sustain_distance = 14 + ///Distance from the egg that the carrier can go before it stops sustaining it + var/sustain_distance = EGGSAC_EGG_SUSTAIN_DISTANCE /datum/behavior_delegate/carrier_eggsac/append_to_stat() . = list() @@ -119,3 +123,4 @@ xeno.update_icons() #undef EGGSAC_OFF_WEED_EGGCAP +#undef EGGSAC_EGG_SUSTAIN_DISTANCE