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
7 changes: 1 addition & 6 deletions code/modules/mob/hear_say.dm
Original file line number Diff line number Diff line change
Expand Up @@ -231,12 +231,7 @@
to_chat(src, span_warning("Ваша гарнитура вибрирует, но вы не слышите ни звука!"))
else
if(track)
// The track already contains a name, so we don't print speaker_name
// But we need part_a before the name, which already exists in the track
// We split the track into a label and a name
var/prefix = copytext(track, 1, findtext(track, speaker_name))
var/rest = copytext(track, findtext(track, speaker_name))
to_chat(src, "[prefix][part_a][rest][part_b][message]</span></span>")
Comment on lines -234 to -239
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

???

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

вся проблема в этом и евляется

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

track() выводит готовый кликабельный текст а тут она проходила через кашу и работала некорректно заодно ломая цвет чата

to_chat(src, "[part_a][track][message]</span></span>")
else
to_chat(src, "[part_a][speaker_name][part_b][message]</span></span>")

Expand Down
17 changes: 7 additions & 10 deletions code/modules/mob/living/silicon/ai/ai_say.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,18 @@

var/track = ""
var/mob/mob_to_track = null
if(changed_voice)
if(impersonating)
mob_to_track = impersonating
else
track = "[speaker_name] ([jobname])"
speaker_name = html_encode(speaker_name)
jobname = html_encode(jobname)
if(changed_voice && impersonating)
mob_to_track = impersonating
else if(isbot(follow_target))
track = "<a href='byond://?src=[UID()];trackbot=[follow_target.UID()]'>[speaker_name] ([jobname])</a>"
else
if(isbot(follow_target))
track = "<a href='byond://?src=[UID()];trackbot=[follow_target.UID()]'>[speaker_name] ([jobname])</a>"
else
mob_to_track = speaker
mob_to_track = speaker

if(mob_to_track)
track = "<a href='byond://?src=[UID()];track=[mob_to_track.UID()]'>[speaker_name] ([jobname])</a>"
track += "&nbsp;<a href='byond://?src=[UID()];open=[mob_to_track.UID()]'>\[Open\]</a>"

return track

// MARK: AI VOX Announcements
Expand Down
Loading