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

port ckey in deadchat from yogs #2187

Merged
merged 5 commits into from
Aug 3, 2023
Merged

port ckey in deadchat from yogs #2187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ea144a2
Update mob_say.dm
GenericDM Jul 21, 2023
aecd643
Update preferences.dm
GenericDM Jul 21, 2023
d4c7469
Update mob_say.dm
GenericDM Jul 21, 2023
6003769
Update preferences_toggles.dm
GenericDM Jul 21, 2023
c65630f
inversion my beloved
Jul 21, 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
1 change: 1 addition & 0 deletions code/__DEFINES/preferences.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#define CHAT_GHOSTLAWS (1<<11)
#define CHAT_LOOC (1<<12)
#define CHAT_LOGIN_LOGOUT (1<<13)
#define CHAT_GHOSTCKEY (1<<14)

#define TOGGLES_DEFAULT_CHAT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_PULLR|CHAT_GHOSTWHISPER|CHAT_GHOSTPDA|CHAT_GHOSTRADIO|CHAT_BANKCARD|CHAT_GHOSTLAWS|CHAT_LOOC|CHAT_LOGIN_LOGOUT)

Expand Down
11 changes: 11 additions & 0 deletions code/modules/client/preferences_toggles.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,17 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/settings, listen_looc)()
return C.prefs.chat_toggles & CHAT_LOOC
//EndWS Edit

TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, chat_ghostckey)()
set name = "Show/Hide ckey in deadchat"
set category = "Preferences"
set desc = "Toggle if players will see your ckey in deadchat"
usr.client.prefs.chat_toggles ^= CHAT_GHOSTCKEY
usr.client.prefs.save_preferences()
to_chat(usr, "Your ckey is [(usr.client.prefs.chat_toggles & CHAT_GHOSTCKEY) ? "now" : "no longer"] visible in deadchat.")
SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle ckey in Deadchat", "[usr.client.prefs.toggles & CHAT_GHOSTCKEY ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/verbs/menu/Settings/chat_ghostckey/Get_checked(client/C)
return C.prefs.chat_toggles & CHAT_GHOSTCKEY

TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, listen_bank_card)()
set name = "Show/Hide Income Updates"
set category = "Preferences"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/mob_say.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
alt_name = " (died as [real_name])"

var/spanned = say_quote(say_emphasis(message))
var/source = "<span class='game'><span class='prefix'>DEAD:</span> <span class='name'>[name]</span>[alt_name]"
var/source = "<span class='game'><span class='prefix'>DEAD:</span> <span class='name'>[(src.client.prefs.chat_toggles & CHAT_GHOSTCKEY) ? "([src.key]) " : ""][name]</span>[alt_name]"
var/rendered = " <span class='message'>[emoji_parse(spanned)]</span></span>"
log_talk(message, LOG_SAY, tag="DEAD")
if(SEND_SIGNAL(src, COMSIG_MOB_DEADSAY, message) & MOB_DEADSAY_SIGNAL_INTERCEPT)
Expand Down