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

Fixes being unable to re-enter your body when you're unnested #3747

Merged
merged 1 commit into from
Jun 29, 2023
Merged

Fixes being unable to re-enter your body when you're unnested #3747

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
5 changes: 3 additions & 2 deletions code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,11 +289,12 @@
if(buckled_human.stat == DEAD )
buckled_mob_density = FALSE

. = ..()

var/mob/dead/observer/G = ghost_of_buckled_mob
var/datum/mind/M = G?.mind
ghost_of_buckled_mob = null

. = ..() //Very important that this comes after, since it deletes the nest and clears ghost_of_buckled_mob

if(!istype(buckled_human) || !istype(G) || !istype(M) || buckled_human.undefibbable || buckled_human.mind || M.original != buckled_human || buckled_human.chestburst)
return // Zealous checking as most is handled by ghost code
to_chat(G, FONT_SIZE_HUGE(SPAN_DANGER("You have been freed from your nest and may go back to your body! (Look for 'Re-enter Corpse' in Ghost verbs, or <a href='?src=\ref[G];reentercorpse=1'>click here</a>!)")))
Expand Down
Loading