mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-21 20:27:42 +01:00
powder that makes you say yes
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user