From 7a8f8fa12a5ea0ead025b0a42bb1d1c3435e48a5 Mon Sep 17 00:00:00 2001
From: ReturnToZender <110273561+ReturnToZender@users.noreply.github.com>
Date: Sun, 16 Jul 2023 22:25:05 -0500
Subject: [PATCH] [NON-MODULAR] Makes it so ghosts can't see all
 emotes/PDAs/text by default (#348)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Makes it so ghosts can no longer see emotes, PDA messages, and dialogue
by default. This can still be enabled in the game options. Only works on
new players going forward, unfortunately.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
Del: Ghosts hearing all emotes and PDA messages by default
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
---
 code/__DEFINES/preferences.dm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm
index 44d741d00f0..a1d872abb79 100644
--- a/code/__DEFINES/preferences.dm
+++ b/code/__DEFINES/preferences.dm
@@ -35,7 +35,10 @@
 #define CHAT_GHOSTLAWS (1<<11)
 #define CHAT_LOGIN_LOGOUT (1<<12)
 
-#define TOGGLES_DEFAULT_CHAT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_PULLR|CHAT_GHOSTWHISPER|CHAT_GHOSTPDA|CHAT_GHOSTRADIO|CHAT_BANKCARD|CHAT_GHOSTLAWS|CHAT_LOGIN_LOGOUT)
+#define TOGGLES_DEFAULT_CHAT (CHAT_OOC|CHAT_DEAD|CHAT_PRAYER|CHAT_PULLR|CHAT_GHOSTRADIO|CHAT_BANKCARD|CHAT_GHOSTLAWS|CHAT_LOGIN_LOGOUT)
+//BUBBER EDIT: original (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_PULLR|CHAT_GHOSTWHISPER|CHAT_GHOSTPDA|CHAT_GHOSTRADIO|CHAT_BANKCARD|CHAT_GHOSTLAWS|CHAT_LOGIN_LOGOUT)
+//Makes it so that chat_ghostsight, chat_ghostwhisper, chat_ghostpda, chat_ghostears are disabled by DEFAULT. No more seeing others' ERP from anywhere without an opt-in. Note ghosts still see nearby emotes and messages.
+//This will be mildly inconvenient, but it solves the issue of people seeing stuff they aren't supposed to see. For the most part.
 
 #define PARALLAX_INSANE "Insane"
 #define PARALLAX_HIGH "High"