Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/modules/antagonists/villain/vampire/actions.dm
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
src.last_telepathy_use = world.time

var/message = span_narsie("<B>A message from <span style='color:#[voice_color]'>[real_name]</span>: [msg]</B>")
log_telepathy("[key_name(src)] used vampiric telepathy to say: [msg]")
to_chat(clan?.clan_members, message)

/mob/living/carbon/human/proc/disguise_button()
Expand Down
48 changes: 24 additions & 24 deletions code/modules/mob/living/living_say.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,37 +59,37 @@

if(ic_blocked)
//The filter warning message shows the sanitized message though.
to_chat(src, "<span class='warning'>That message contained a word prohibited in IC chat! Consider reviewing the server rules.\n<span replaceRegex='show_filtered_ic_chat'>\"[message]\"</span></span>")
to_chat(src, span_warning("That message contained a word prohibited in IC chat! Consider reviewing the server rules.\n<span replaceRegex='show_filtered_ic_chat'>\"[message]\"</span>"))
SSblackbox.record_feedback("tally", "ic_blocked_words", 1, lowertext(config.ic_filter_regex.match))
return

var/list/message_mods = list()
var/original_message = message
message = get_message_mods(message, message_mods)
var/datum/saymode/saymode = SSradio.saymodes[message_mods[RADIO_KEY]]
var/in_critical = InCritical()

if(message_mods[RADIO_EXTENSION] == MODE_ADMIN)
if(client)
client.cmd_admin_say(message)
return

if(message_mods[RADIO_EXTENSION] == MODE_DEADMIN)
if(client)
client.dsay(message)
return
if(client)
switch(message_mods[RADIO_EXTENSION])
if(MODE_ADMIN)
client.cmd_admin_say(message)
return
if(MODE_DEADMIN)
client.dsay(message)
return

if(stat == DEAD)
say_dead(original_message)
return

if(check_emote(original_message, forced) || !can_speak_basic(original_message, ignore_spam, forced))
if(!can_speak_basic(original_message, ignore_spam, forced))
return

if(check_whisper(original_message, forced) || !can_speak_basic(original_message, ignore_spam, forced))
if(check_emote(original_message, forced))
return
if(check_whisper(original_message, forced))
return

if(in_critical) // There are cheaper ways to do this, but they're less flexible, and this isn't ran all that often
var/in_crit = InCritical()
if(in_crit) // There are cheaper ways to do this, but they're less flexible, and this isn't ran all that often
var/end = TRUE
for(var/index in message_mods)
if(crit_allowed_modes[index])
Expand All @@ -107,17 +107,19 @@
return

language = message_mods[LANGUAGE_EXTENSION] || get_default_language()
var/datum/language/speaker_language = GLOB.language_datum_instances[language]
var/signed = speaker_language?.flags & SIGNLANG

if(!can_speak_vocal(message))
to_chat(src, "<span class='warning'>I can't talk.</span>")
if(signed && !can_speak_vocal(message))
to_chat(src, span_warning("I can't talk."))
return

var/message_range = 7

var/succumbed = FALSE

var/fullcrit = InFullCritical()
if((InCritical() && !fullcrit) || message_mods[WHISPER_MODE] == MODE_WHISPER)
if((in_crit && !fullcrit) || message_mods[WHISPER_MODE] == MODE_WHISPER)
message_range = 1
message_mods[WHISPER_MODE] = MODE_WHISPER
src.log_talk("whispered: [message]", LOG_WHISPER)
Expand Down Expand Up @@ -151,16 +153,15 @@

spans |= speech_span

if(language)
var/datum/language/L = GLOB.language_datum_instances[language]
if(speaker_language)
if(ishuman(src))
var/mob/living/carbon/human/H = src
if(H.dna?.species)
var/list/stuff = H.dna.species.get_span_language(L)
var/list/stuff = H.dna.species.get_span_language(speaker_language)
if(stuff)
spans |= stuff
else
spans |= L.spans
spans |= speaker_language.spans

if(message_mods[MODE_SING])
var/randomnote = pick("\u2669", "\u266A", "\u266B", "\u266C")
Expand All @@ -185,8 +186,7 @@
if(radio_return & NOPASS)
return TRUE

var/datum/language/speaker_language = GLOB.language_datum_instances[language]
if(speaker_language?.flags & SIGNLANG)
if(signed)
send_speech_sign(message, message_range, src, bubble_type, spans, language, message_mods, original_message)
else
send_speech(message, message_range, src, bubble_type, spans, language, message_mods, original_message)
Expand Down
Loading