From ff65e83ebfbdeeb42fa2f3332a90682cc2faf6ad Mon Sep 17 00:00:00 2001 From: Casey Date: Sun, 6 Nov 2022 11:56:09 -0500 Subject: [PATCH 1/2] Fixes two lobby bugs --- code/modules/mob/say_vr.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm index 4fb9855880..b6954770c3 100644 --- a/code/modules/mob/say_vr.dm +++ b/code/modules/mob/say_vr.dm @@ -61,7 +61,13 @@ var/list/vis_objs = vis["objs"] for(var/mob/M as anything in vis_mobs) +<<<<<<< HEAD if(isobserver(M) && !(is_preference_enabled(/datum/client_preference/whisubtle_vis) || (isbelly(M.loc) && src == M.loc:owner)) && !M.client?.holder) //CHOMPEdit - Added the belly check so that ghosts in bellies can still see their pred's messages. +======= + if(isnewplayer(M)) + continue + if(isobserver(M) && !is_preference_enabled(/datum/client_preference/whisubtle_vis) && !M.client?.holder) +>>>>>>> ec81deaac6... Merge pull request #14025 from Heroman3003/newplayer-fixes spawn(0) M.show_message(undisplayed_message, 2) else @@ -365,6 +371,8 @@ if(M) if(isobserver(M)) message = "[message] ([ghost_follow_link(src, M)])" + if(isnewplayer(M)) + continue if(M.stat == UNCONSCIOUS || M.sleeping > 0) continue to_chat(M, message) From 124eb92559dcbd74b330d9d8549f464eceea4897 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Mon, 7 Nov 2022 17:24:26 -0500 Subject: [PATCH 2/2] powder that makes you say yes --- code/modules/mob/say_vr.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm index b6954770c3..fc100f1a35 100644 --- a/code/modules/mob/say_vr.dm +++ b/code/modules/mob/say_vr.dm @@ -61,13 +61,9 @@ var/list/vis_objs = vis["objs"] for(var/mob/M as anything in vis_mobs) -<<<<<<< HEAD - if(isobserver(M) && !(is_preference_enabled(/datum/client_preference/whisubtle_vis) || (isbelly(M.loc) && src == M.loc:owner)) && !M.client?.holder) //CHOMPEdit - Added the belly check so that ghosts in bellies can still see their pred's messages. -======= if(isnewplayer(M)) continue - if(isobserver(M) && !is_preference_enabled(/datum/client_preference/whisubtle_vis) && !M.client?.holder) ->>>>>>> ec81deaac6... Merge pull request #14025 from Heroman3003/newplayer-fixes + if(isobserver(M) && !(is_preference_enabled(/datum/client_preference/whisubtle_vis) || (isbelly(M.loc) && src == M.loc:owner)) && !M.client?.holder) //CHOMPEdit - Added the belly check so that ghosts in bellies can still see their pred's messages. spawn(0) M.show_message(undisplayed_message, 2) else