Skip to content

Commit

Permalink
attack alien and evo changes
Browse files Browse the repository at this point in the history
  • Loading branch information
InsaneRed committed Dec 11, 2023
1 parent 8092213 commit 0201220
Show file tree
Hide file tree
Showing 2 changed files with 100 additions and 100 deletions.
36 changes: 18 additions & 18 deletions code/modules/mob/living/carbon/xenomorph/Evolution.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
castes_available -= caste

if(!length(castes_available))
to_chat(src, SPAN_WARNING("The Hive is not capable of supporting any castes you can evolve to yet."))
to_chat(src, SPAN_WARNING("The Hive is not capable of supporting any castes we can evolve to yet."))
return
var/castepick
if((client.prefs && client.prefs.no_radials_preference) || !hive.evolution_menu_images)
Expand All @@ -47,28 +47,28 @@
return

if((!hive.living_xeno_queen) && castepick != XENO_CASTE_QUEEN && !islarva(src) && !hive.allow_no_queen_evo)
to_chat(src, SPAN_WARNING("The Hive is shaken by the death of the last Queen. You can't find the strength to evolve."))
to_chat(src, SPAN_WARNING("The Hive is shaken by the death of the last Queen. We can't find the strength to evolve."))
return

if(castepick == XENO_CASTE_QUEEN) //Special case for dealing with queenae
if(!hardcore)
if(SSticker.mode && hive.xeno_queen_timer > world.time)
to_chat(src, SPAN_WARNING("You must wait about [DisplayTimeText(hive.xeno_queen_timer - world.time, 1)] for the hive to recover from the previous Queen's death."))
to_chat(src, SPAN_WARNING("We must wait about [DisplayTimeText(hive.xeno_queen_timer - world.time, 1)] for the hive to recover from the previous Queen's death."))
return

if(plasma_stored >= 500)
if(hive.living_xeno_queen)
to_chat(src, SPAN_WARNING("There already is a living Queen."))
return
else
to_chat(src, SPAN_WARNING("You require more plasma! Currently at: [plasma_stored] / 500."))
to_chat(src, SPAN_WARNING("We require more plasma! Currently at: [plasma_stored] / 500."))
return
else
to_chat(src, SPAN_WARNING("Nuh-uhh."))
return
if(evolution_threshold && castepick != XENO_CASTE_QUEEN) //Does the caste have an evolution timer? Then check it
if(evolution_stored < evolution_threshold)
to_chat(src, SPAN_WARNING("You must wait before evolving. Currently at: [evolution_stored] / [evolution_threshold]."))
to_chat(src, SPAN_WARNING("We must wait before evolving. Currently at: [evolution_stored] / [evolution_threshold]."))
return

// Used for restricting benos to evolve to drone/queen when they're the only potential queen
Expand Down Expand Up @@ -97,16 +97,16 @@

if(!can_evolve(castepick, potential_queens))
return
to_chat(src, SPAN_XENONOTICE("It looks like the hive can support your evolution to [SPAN_BOLD(castepick)]!"))
to_chat(src, SPAN_XENONOTICE("It looks like the hive can support our evolution to [SPAN_BOLD(castepick)]!"))

visible_message(SPAN_XENONOTICE("\The [src] begins to twist and contort."), \
SPAN_XENONOTICE("You begin to twist and contort."))
SPAN_XENONOTICE("We begin to twist and contort."))
xeno_jitter(25)
evolving = TRUE
var/level_to_switch_to = get_vision_level()

if(!do_after(src, 2.5 SECONDS, INTERRUPT_INCAPACITATED, BUSY_ICON_HOSTILE)) // Can evolve while moving
to_chat(src, SPAN_WARNING("You quiver, but nothing happens. Hold still while evolving."))
to_chat(src, SPAN_WARNING("We quiver, but nothing happens. Hold still while evolving."))
evolving = FALSE
return

Expand All @@ -122,7 +122,7 @@
to_chat(src, SPAN_WARNING("There already is a Queen."))
return
if(!hive.allow_queen_evolve)
to_chat(src, SPAN_WARNING("You can't find the strength to evolve into a Queen"))
to_chat(src, SPAN_WARNING("We can't find the strength to evolve into a Queen"))
return
else if(!can_evolve(castepick, potential_queens))
return
Expand Down Expand Up @@ -176,7 +176,7 @@
built_structures = null

new_xeno.visible_message(SPAN_XENODANGER("A [new_xeno.caste.caste_type] emerges from the husk of \the [src]."), \
SPAN_XENODANGER("You emerge in a greater form from the husk of your old body. For the hive!"))
SPAN_XENODANGER("We emerge in a greater form from the husk of our old body. For the hive!"))

if(hive.living_xeno_queen && hive.living_xeno_queen.observed_xeno == src)
hive.living_xeno_queen.overwatch(new_xeno)
Expand All @@ -202,7 +202,7 @@
return FALSE

if(!isturf(loc))
to_chat(src, SPAN_WARNING("You can't evolve here."))
to_chat(src, SPAN_WARNING("We can't evolve here."))
return FALSE

if(hardcore)
Expand All @@ -218,19 +218,19 @@
return FALSE

if(handcuffed || legcuffed)
to_chat(src, SPAN_WARNING("The restraints are too restricting to allow you to evolve."))
to_chat(src, SPAN_WARNING("The restraints are too restricting to allow us to evolve."))
return FALSE

if(isnull(caste.evolves_to))
to_chat(src, SPAN_WARNING("You are already the apex of form and function. Go forth and spread the hive!"))
to_chat(src, SPAN_WARNING("We are already the apex of form and function. Go forth and spread the hive!"))
return FALSE

if(health < maxHealth)
to_chat(src, SPAN_WARNING("You must be at full health to evolve."))
to_chat(src, SPAN_WARNING("We must be at full health to evolve."))
return FALSE

if(agility || fortify || crest_defense)
to_chat(src, SPAN_WARNING("You cannot evolve while in this stance."))
to_chat(src, SPAN_WARNING("We cannot evolve while in this stance."))
return FALSE

if(world.time < (SSticker.mode.round_time_lobby + XENO_ROUNDSTART_PROGRESS_TIME_2))
Expand Down Expand Up @@ -260,15 +260,15 @@
return

if(health < maxHealth)
to_chat(src, SPAN_XENOWARNING("You are too weak to deevolve, regain your health first."))
to_chat(src, SPAN_XENOWARNING("We are too weak to deevolve, we must regain our health first."))
return

if(length(caste.deevolves_to) < 1)
to_chat(src, SPAN_XENOWARNING("You can't deevolve any further."))
to_chat(src, SPAN_XENOWARNING("We can't deevolve any further."))
return

if(lock_evolve)
to_chat(src, SPAN_WARNING("You are banished and cannot reach the hivemind."))
to_chat(src, SPAN_WARNING("We are banished and cannot reach the hivemind."))
return FALSE


Expand Down
Loading

0 comments on commit 0201220

Please sign in to comment.