From 1ff2ed72a7841dfe90285a616865d12146795fe3 Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Fri, 27 Dec 2024 19:38:08 -0700 Subject: [PATCH] [MIRROR] initial ghost spawn is important... (#9702) Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- code/modules/mob/dead/observer/observer.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 9fc5c5a34c..562e9679ac 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -132,7 +132,7 @@ if(!T && length(latejoin)) T = pick(latejoin) //Safety in case we cannot find the body's position if(T) - forceMove(T) + forceMove(T, just_spawned = TRUE) else moveToNullspace() to_chat(src, span_danger("Could not locate an observer spawn point. Use the Teleport verb to jump to the station map.")) @@ -457,7 +457,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp ManualFollow(M || jumpable_mobs()[mobname]) -/mob/observer/dead/forceMove(atom/destination, direction, movetime) //ChompEDIT - pass movetime through +/mob/observer/dead/forceMove(atom/destination, direction, movetime, just_spawned = FALSE) //ChompEDIT - pass movetime through if(client?.holder) return ..() @@ -469,7 +469,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp //RS Port #658 Start var/area/A = get_area(destination) - if(A?.flag_check(AREA_BLOCK_GHOSTS) && !isbelly(destination) && !admin_ghosted) + if(A?.flag_check(AREA_BLOCK_GHOSTS) && !isbelly(destination) && !admin_ghosted && !just_spawned) to_chat(src,span_warning("Sorry, that area does not allow ghosts.")) if(following) stop_following()