cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 14:08:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4726 from Miauw62/sensualwhispers

Browse Source 
Adds a separate preference for whispers.
This commit is contained in:
Cheridan
2014-09-16 12:42:13 -05:00
parent 351a51626b 65c963c109
commit 2fb2e902dc
5 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+4
View File
@@ -217,6 +217,7 @@ datum/preferences
dat += "<b>Play lobby music:</b> <a href='?_src_=prefs;preference=lobby_music'>[(toggles & SOUND_LOBBY) ? "Yes" : "No"]</a><br>"
dat += "<b>Ghost ears:</b> <a href='?_src_=prefs;preference=ghost_ears'>[(toggles & CHAT_GHOSTEARS) ? "Nearest Creatures" : "All Speech"]</a><br>"
dat += "<b>Ghost sight:</b> <a href='?_src_=prefs;preference=ghost_sight'>[(toggles & CHAT_GHOSTSIGHT) ? "Nearest Creatures" : "All Emotes"]</a><br>"
dat += "<b>Ghost whispers:</b> <a href='?_src_=prefs;preference=ghost_whispers'>[(toggles & CHAT_GHOSTWHISPER) ? "Nearest Creatures" : "All Speech"]</a><br>"
dat += "<b>Pull requests:</b> <a href='?_src_=prefs;preference=pull_requests'>[(toggles & CHAT_PULLR) ? "Yes" : "No"]</a><br>"
if(config.allow_Metadata)
@@ -741,6 +742,9 @@ datum/preferences
if("ghost_sight")
toggles ^= CHAT_GHOSTSIGHT
if("ghost_whispers")
toggles ^= CHAT_GHOSTWHISPER
if("pull_requests")
toggles ^= CHAT_PULLR
code/modules/client/preferences_toggles.dm
+9
View File
@@ -17,6 +17,15 @@
prefs.save_preferences()
feedback_add_details("admin_verb","TGS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/verb/toggle_ghost_whispers()
set name = "Show/Hide GhostWhispers"
set category = "Preferences"
set desc = ".Toggle between hearing all whispers, and only whispers of nearby mobs"
prefs.toggles ^= CHAT_GHOSTWHISPER
src << "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTWHISPER) ? "see all whispers in the world" : "only see whispers from nearby mobs"]."
prefs.save_preferences()
feedback_add_details("admin_verb","TGW") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/toggle_hear_radio()
set name = "Show/Hide RadioChatter"
set category = "Preferences"
code/modules/mob/living/carbon/human/whisper.dm
+3 -2
View File
@@ -42,10 +42,11 @@
var/list/listening_dead = list()
for(var/mob/M in player_list)
if(M.stat == DEAD && (M.client.prefs.toggles & CHAT_GHOSTEARS) && client)
if(M.stat == DEAD && ((M.client.prefs.toggles & CHAT_GHOSTWHISPER) || (get_dist(M, src) <= 7)))
listening_dead |= M
var/list/listening = get_hear(1, src) | listening_dead
var/list/listening = get_hear(1, src)
listening |= listening_dead
var/list/eavesdropping = hearers(2, src)
eavesdropping -= listening
var/list/watching = hearers(5, src)
code/modules/mob/living/say.dm
+1 -1
View File
@@ -144,7 +144,7 @@ var/list/department_radio_keys = list(
var/list/listening = get_hearers_in_view(message_range, source)
var/list/listening_dead = list()
for(var/mob/M in player_list)
if(M.stat == DEAD && (M.client.prefs.toggles & CHAT_GHOSTEARS) && client) // client is so that ghosts don't have to listen to mice
if(M.stat == DEAD && ((M.client.prefs.toggles & CHAT_GHOSTEARS) || (get_dist(M, src) <= 7))&& client) // client is so that ghosts don't have to listen to mice
listening_dead |= M
listening -= listening_dead //so ghosts dont hear stuff twice