Skip to content

Commit

Permalink
addressed further review
Browse files Browse the repository at this point in the history
  • Loading branch information
Birdtalon committed Nov 12, 2023
1 parent 140fadb commit 928154b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
5 changes: 4 additions & 1 deletion code/modules/cm_aliens/structures/egg.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -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."
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -119,3 +123,4 @@
xeno.update_icons()

#undef EGGSAC_OFF_WEED_EGGCAP
#undef EGGSAC_EGG_SUSTAIN_DISTANCE

0 comments on commit 928154b

Please sign in to comment.