mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-19 20:06:28 +01:00
Fix double sanitization breaking chat in certain places (#11744)
This commit is contained in:
@@ -1,6 +1,4 @@
|
||||
/mob/abstract/observer/say(var/message)
|
||||
message = sanitize(message)
|
||||
|
||||
if (!message)
|
||||
return
|
||||
|
||||
|
||||
@@ -164,8 +164,6 @@
|
||||
/mob/living/bot/say(var/message)
|
||||
var/verb = "beeps"
|
||||
|
||||
message = sanitize(message)
|
||||
|
||||
..(message, null, verb)
|
||||
|
||||
/mob/living/bot/Collide(atom/A)
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
if (silent)
|
||||
return
|
||||
|
||||
message = sanitize(message)
|
||||
|
||||
if(!(container && istype(container, /obj/item/device/mmi)))
|
||||
return //No MMI, can't speak, bucko./N
|
||||
else
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
/mob/living/carbon/slime/say(var/message)
|
||||
|
||||
message = sanitize(message)
|
||||
|
||||
var/verb = say_quote(message)
|
||||
|
||||
if(copytext(message,1,2) == "*")
|
||||
@@ -36,4 +34,4 @@
|
||||
speech_buffer = list()
|
||||
speech_buffer.Add(speaker)
|
||||
speech_buffer.Add(lowertext(html_decode(message)))
|
||||
return ..()
|
||||
return ..()
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
/mob/living/parasite/captive_brain/say(var/message)
|
||||
if(istype(src.loc,/mob/living/parasite/meme))
|
||||
|
||||
message = sanitize(message)
|
||||
if (!message)
|
||||
return
|
||||
log_say("[key_name(src)] : [message]",ckey=key_name(src))
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
return ..(message)
|
||||
|
||||
if(local_transmit)
|
||||
message = sanitize(message)
|
||||
|
||||
if(stat == DEAD)
|
||||
return say_dead(message)
|
||||
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
/mob/living/silicon/say(message, sanitize = TRUE)
|
||||
return ..(sanitize ? sanitize(message) : message)
|
||||
|
||||
/mob/living/silicon/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name)
|
||||
log_say("[key_name(src)] : [message]",ckey=key_name(src))
|
||||
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
|
||||
/mob/living/captive_brain/say(var/message)
|
||||
if(istype(src.loc,/mob/living/simple_animal/borer))
|
||||
message = sanitize(message)
|
||||
if(!message)
|
||||
return
|
||||
log_say("[key_name(src)] : [message]", ckey=key_name(src))
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
/mob/living/simple_animal/borer/say(var/message)
|
||||
message = sanitize(message)
|
||||
message = capitalize(message)
|
||||
|
||||
if(!message)
|
||||
@@ -41,4 +40,4 @@
|
||||
|
||||
for(var/mob/M in mob_list)
|
||||
if(M.client && M.stat == DEAD && !isnewplayer(M) && (M.client.prefs.toggles & CHAT_GHOSTEARS))
|
||||
to_chat(M, "<b>[src.truename]</b> whispers to <b>[host]</b>, \"[message]\"")
|
||||
to_chat(M, "<b>[src.truename]</b> whispers to <b>[host]</b>, \"[message]\"")
|
||||
|
||||
@@ -210,11 +210,8 @@
|
||||
|
||||
/mob/living/simple_animal/shade/bluespace/say(var/message)
|
||||
if(!possessive)
|
||||
var/new_last_message_heard = sanitizeName(last_message_heard)
|
||||
var/new_message = sanitizeName(message)
|
||||
|
||||
var/list/words_in_memory = dd_text2List(new_last_message_heard, " ")
|
||||
var/list/words_in_message = dd_text2List(new_message, " ")
|
||||
var/list/words_in_memory = dd_text2List(last_message_heard, " ")
|
||||
var/list/words_in_message = dd_text2List(message, " ")
|
||||
for(var/word1 in words_in_message)
|
||||
var/valid = 0
|
||||
for(var/word2 in words_in_memory)
|
||||
|
||||
@@ -738,7 +738,6 @@
|
||||
if(speak_emote.len)
|
||||
verb = pick(speak_emote)
|
||||
|
||||
message = sanitize(message)
|
||||
if(emote_sounds.len)
|
||||
var/sound_chance = TRUE
|
||||
if(client) // we do not want people who assume direct control to spam
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
author: JohnWildkins
|
||||
|
||||
delete-after: True
|
||||
|
||||
changes:
|
||||
- bugfix: "Fixed overactive sanitization on certain mob/say types."
|
||||
Reference in New Issue
Block a user