Skip to content

Fix: Strain reseting no longer removes banish lock on evolution #12533

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
MistChristmas wants to merge 3 commits into
base: master
Choose a base branch
from
+5 −3
Open

Fix: Strain reseting no longer removes banish lock on evolution #12533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09fb424
NoMoreFunnyBypass
MistChristmas Jun 26, 2026
3d7b9c8
Bleh
MistChristmas Jun 26, 2026
2617aae
Actually move it here
MistChristmas Jun 26, 2026
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
1 change: 0 additions & 1 deletion code/datums/emergency_calls/forsaken_xenos.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,5 @@
new_member.transfer_to(new_xeno, TRUE)

new_xeno.set_hive_and_update(XENO_HIVE_FORSAKEN)
new_xeno.lock_evolve = TRUE

QDEL_NULL(current_mob)
5 changes: 3 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/Evolution.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ GLOBAL_LIST_EMPTY(deevolved_ckeys)
to_chat(src, SPAN_WARNING("Our link to the hive is being suppressed...we should wait a bit."))
return FALSE

if(lock_evolve)
if(lock_evolve || (hive.evolution_locked && !islarva(src)))
if(banished)
to_chat(src, SPAN_WARNING("We are banished and cannot reach the hivemind."))
else
Expand Down Expand Up @@ -381,7 +381,7 @@ GLOBAL_LIST_EMPTY(deevolved_ckeys)
if(length(caste.deevolves_to) < 1)
to_chat(src, SPAN_XENOWARNING("We can't deevolve any further."))
return
if(lock_evolve)
if(lock_evolve || hive.evolution_locked)
if(banished)
to_chat(src, SPAN_WARNING("We are banished and cannot reach the hivemind."))
else
Expand Down Expand Up @@ -459,6 +459,7 @@ GLOBAL_LIST_EMPTY(deevolved_ckeys)

new_xeno.built_structures = built_structures.Copy()
built_structures = null
new_xeno.lock_evolve = lock_evolve

if(mind)
mind.transfer_to(new_xeno)
Expand Down
2 changes: 2 additions & 0 deletions code/modules/mob/living/carbon/xenomorph/hive_status.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
var/dynamic_evolution = TRUE
var/evolution_rate = 3 // Only has use if dynamic_evolution is false
var/evolution_bonus = 0
var/evolution_locked = FALSE

var/allow_no_queen_actions = FALSE
var/allow_no_queen_evo = FALSE
Expand Down Expand Up @@ -1311,6 +1312,7 @@
latejoin_burrowed = FALSE
see_humans_on_tacmap = TRUE
tacmap_requires_queen_ovi = FALSE
evolution_locked = TRUE

need_round_end_check = TRUE

Expand Down