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

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

Browse Source
This commit is contained in:
xPokee
2025-09-24 10:13:01 -04:00
parent ae8d35f963 5fdb6d3618
commit b308ee9d78
313 changed files with 6548 additions and 4624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/brain_damage/imaginary_friend.dm
+3 -4
View File
@@ -216,7 +216,7 @@
owner.imaginary_group -= src
return ..()
/mob/eye/imaginary_friend/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, freq_name, freq_color, list/spans, list/message_mods = list(), message_range)
/mob/eye/imaginary_friend/Hear(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, freq_name, freq_color, list/spans, list/message_mods = list(), message_range)
if (safe_read_pref(client, /datum/preference/toggle/enable_runechat) && (safe_read_pref(client, /datum/preference/toggle/enable_runechat_non_mobs) || ismob(speaker)))
create_chat_message(speaker, message_language, raw_message, spans)
to_chat(src, compose_message(speaker, message_language, raw_message, radio_freq, freq_name, freq_color, spans, message_mods))
@@ -257,14 +257,13 @@
log_sayverb_talk(message, message_mods, tag = "imaginary friend", forced_by = forced)
var/messagepart = generate_messagepart(message, spans, message_mods)
var/rendered = "[span_name("[name]")] [messagepart]"
var/dead_rendered = "[span_name("[name] (Imaginary friend of [owner])")] [messagepart]"
var/language = message_language || owner.get_selected_language()
Hear(rendered, src, language, message, null, null, null, spans, message_mods) // We always hear what we say
Hear(src, language, message, null, null, null, spans, message_mods) // We always hear what we say
var/group = owner.imaginary_group - src // The people in our group don't, so we have to exclude ourselves not to hear twice
for(var/mob/person in group)
person.Hear(null, src, language, message, null, null, null, spans, message_mods, range)
person.Hear(src, language, message, null, null, null, spans, message_mods, range)
// Speech bubble, but only for those who have runechat off
var/list/speech_bubble_recipients = list()
code/datums/brain_damage/special.dm
+1 -1
View File
@@ -690,7 +690,7 @@
talk_tuah(pick(hurt_lines))
/datum/brain_trauma/special/axedoration/proc/talk_tuah(sent_message = "Hello World.")
owner.Hear(null, GLOB.bridge_axe, owner.get_selected_language(), sent_message)
owner.Hear(GLOB.bridge_axe, owner.get_selected_language(), sent_message)
/datum/brain_trauma/special/axedoration/proc/get_axe_location()
if(!GLOB.bridge_axe)