Skip to content
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

Jump to bottom

Fix queen death not readmitting banished xenos fully #5281

Merged
merged 1 commit into from
Dec 25, 2023
Merged

Fix queen death not readmitting banished xenos fully #5281

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
17 changes: 14 additions & 3 deletions code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,13 +792,24 @@
return TRUE

/mob/living/carbon/xenomorph/queen/death(cause, gibbed)
if(hive.living_xeno_queen == src)
if(src == hive?.living_xeno_queen)
hive.xeno_queen_timer = world.time + XENO_QUEEN_DEATH_DELAY
hive.banished_ckeys = list() // Reset the banished ckey list

// Reset the banished ckey list
if(length(hive.banished_ckeys))
for(var/mob/living/carbon/xenomorph/target_xeno in hive.totalXenos)
Drulikar marked this conversation as resolved.
Show resolved Hide resolved
if(!target_xeno.ckey)
continue
for(var/mob_name in hive.banished_ckeys)
if(target_xeno.ckey == hive.banished_ckeys[mob_name])
target_xeno.banished = FALSE
target_xeno.hud_update_banished()
target_xeno.lock_evolve = FALSE
hive.banished_ckeys = list()

icon = queen_standing_icon
return ..()


/mob/living/carbon/xenomorph/queen/proc/mount_ovipositor()
if(ovipositor)
return //sanity check
Expand Down
Loading