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 some issues with ghosts #3641

Merged
merged 3 commits into from
Jun 16, 2023
Merged

Fixes some issues with ghosts #3641

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43b9ec1
init
ihatethisengine Jun 15, 2023
78fe8b3
init2
ihatethisengine Jun 15, 2023
e492373
+hacks
ihatethisengine Jun 15, 2023
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/modules/mob/dead/observer/observer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,8 +387,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(check_rights(R_MOD))
options = list("Aghost") + options
var/text_prompt = "Are you -sure- you want to ghost?\n(You are alive. If you ghost, you won't be able to return to your body. You can't change your mind so choose wisely!)"
var/is_nested = (buckled && istype(buckled, /obj/structure/bed/nest))
var/obj/structure/bed/nest/nest
var/is_nested = (buckled && istype(buckled, /obj/structure/bed/nest)) ? TRUE : FALSE
var/obj/structure/bed/nest/nest = FALSE
if(is_nested)
text_prompt += "\nSince you're nested, you will be given a chance to reenter your body upon being freed."
nest = buckled
Expand All @@ -407,6 +407,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
ghost.timeofdeath = world.time
if(is_nested && nest && !QDELETED(nest))
ghost.can_reenter_corpse = FALSE
nest.ghost_of_buckled_mob = ghost

/mob/dead/observer/Move(atom/newloc, direct)
following = null
Expand Down