diff --git a/code/modules/cm_aliens/structures/fruit.dm b/code/modules/cm_aliens/structures/fruit.dm index 8ea425e4d3c7..3e7621d1ee07 100644 --- a/code/modules/cm_aliens/structures/fruit.dm +++ b/code/modules/cm_aliens/structures/fruit.dm @@ -443,6 +443,9 @@ // Xenos eating fruit /obj/item/reagent_container/food/snacks/resin_fruit/attack(mob/living/carbon/xenomorph/affected_xeno, mob/user) + var/pick_delay = consume_delay + var/mob/living/carbon/xenomorph/x_user = user + if(istype(user, /mob/living/carbon/xenomorph)) // Prevents xenos from feeding capped/dead marines fruit var/mob/living/carbon/xenomorph/feeding_xeno = user if(!feeding_xeno.can_not_harm(affected_xeno)) @@ -456,6 +459,9 @@ to_chat(user, SPAN_WARNING("That sister is already dead, they won't benefit from the fruit now...")) return + if(istype(x_user.strain, /datum/xeno_strain/gardener)) + consume_delay = 0 + var/obj/effect/alien/resin/fruit/current_fruit = new fruit_type(affected_xeno) var/cant_consume = current_fruit.prevent_consume(affected_xeno) if(cant_consume) @@ -469,10 +475,8 @@ SPAN_HELPFUL("[user] starts feeding you [current_fruit]."), SPAN_NOTICE("[user] starts [user == affected_xeno ? "eating" : "feeding [affected_xeno]"] [current_fruit].")) - var/pick_delay = consume_delay - var/mob/living/carbon/xenomorph/x_user = user if(istype(x_user.strain, /datum/xeno_strain/gardener)) - pick_delay /= 2 + pick_delay = 0 if(!do_after(user, pick_delay, INTERRUPT_ALL, BUSY_ICON_FRIENDLY, affected_xeno, INTERRUPT_MOVED, BUSY_ICON_MEDICAL)) return FALSE @@ -528,7 +532,7 @@ F.picked = TRUE var/pick_delay = F.consume_delay if(istype(src.strain, /datum/xeno_strain/gardener)) - pick_delay /= 2 //Decrease time by half, if strain is gardener + pick_delay = 0 // Removes pick delay for gardeners if(!do_after(src, pick_delay, INTERRUPT_ALL, BUSY_ICON_FRIENDLY)) F.picked = FALSE return diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm b/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm index f3837947db9f..432e2195e3e8 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm @@ -31,6 +31,8 @@ burrow_cooldown = 2 SECONDS tunnel_cooldown = 7 SECONDS + aura_strength = 2 + minimum_evolve_time = 7 MINUTES minimap_icon = "burrower" @@ -61,6 +63,7 @@ /datum/action/xeno_action/activable/tail_stab, /datum/action/xeno_action/activable/corrosive_acid, /datum/action/xeno_action/activable/place_construction, + /datum/action/xeno_action/onclick/emit_pheromones, /datum/action/xeno_action/onclick/build_tunnel, /datum/action/xeno_action/onclick/plant_weeds, //first macro /datum/action/xeno_action/onclick/place_trap, //second macro diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm b/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm index 8196ea906bbf..5227b856541b 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm @@ -8,7 +8,7 @@ melee_vehicle_damage = XENO_DAMAGE_TIER_3 max_health = XENO_HEALTH_TIER_9 plasma_gain = XENO_PLASMA_GAIN_TIER_6 - plasma_max = XENO_PLASMA_TIER_5 + plasma_max = XENO_PLASMA_TIER_6 xeno_explosion_resistance = XENO_EXPLOSIVE_ARMOR_TIER_2 armor_deflection = XENO_NO_ARMOR evasion = XENO_EVASION_NONE @@ -34,7 +34,7 @@ tacklestrength_min = 4 tacklestrength_max = 5 - aura_strength = 2 + aura_strength = 3 //Prae level pheromones hugger_throw_delay = 5 DECISECONDS egg_cooldown = 25 SECONDS diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/carrier/eggsac.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/carrier/eggsac.dm index 015dde5b15c1..104400c33046 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/carrier/eggsac.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/carrier/eggsac.dm @@ -19,7 +19,6 @@ /datum/xeno_strain/eggsac/apply_strain(mob/living/carbon/xenomorph/carrier/carrier) carrier.plasma_types = list(PLASMA_EGG) - carrier.phero_modifier += XENO_PHERO_MOD_LARGE // praetorian level pheremones carrier.recalculate_plasma() carrier.recalculate_pheromones() diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/healer.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/healer.dm index a8754381d393..c8efda7996c0 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/healer.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/healer.dm @@ -23,7 +23,6 @@ behavior_delegate_type = /datum/behavior_delegate/drone_healer /datum/xeno_strain/healer/apply_strain(mob/living/carbon/xenomorph/drone/drone) - drone.phero_modifier += XENO_PHERO_MOD_LARGE drone.plasma_types += PLASMA_PHEROMONE drone.damage_modifier -= XENO_DAMAGE_MOD_VERY_SMALL drone.tackle_chance_modifier -= 5