Skip to content

Xeno Support Caste Rebalancing #12743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ammoniacres wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Xeno Support Caste Rebalancing #12743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions code/modules/cm_aliens/structures/fruit.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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)
Expand All @@ -469,10 +475,8 @@
SPAN_HELPFUL("[user] <b>starts feeding</b> you <b>[current_fruit]</b>."),
SPAN_NOTICE("[user] starts [user == affected_xeno ? "eating" : "feeding [affected_xeno]"] <b>[current_fruit]</b>."))

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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
burrow_cooldown = 2 SECONDS
tunnel_cooldown = 7 SECONDS

aura_strength = 2

minimum_evolve_time = 7 MINUTES

minimap_icon = "burrower"
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
1 change: 0 additions & 1 deletion code/modules/mob/living/carbon/xenomorph/strains/castes/carrier/eggsac.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
1 change: 0 additions & 1 deletion code/modules/mob/living/carbon/xenomorph/strains/castes/drone/healer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down