cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-05 23:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes bug with hivemind languages being broken for non-observers.

Browse Source 
Also includes some formatting improvements.
This commit is contained in:
PsiOmegaDelta
2015-08-26 13:55:16 +02:00
parent 5962656c1e
commit 798b060254
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/modules/mob/language/language.dm
View File

@@ -101,22 +101,24 @@
log_say("[key_name(speaker)] : ([name]) [message]")
if(!speaker_mask) speaker_mask = speaker.name
for(var/mob/player in player_list)
player.hear_broadcast(src, speaker, speaker_mask, format_message(message, get_spoken_verb(message)))
format_message(message, get_spoken_verb(message))
/mob/proc/hear_broadcast(var/datum/language/language, var/speaker, var/message)
for(var/mob/player in player_list)
player.hear_broadcast(src, speaker, speaker_mask, message)
/mob/proc/hear_broadcast(var/datum/language/language, var/mob/speaker, var/speaker_name, var/message)
if((language in languages) && language.check_special_condition(src))
var/msg = "<i><span class='game say'>[language.name], <span class='name'>[speaker]</span> [message]</span></i>"
var/msg = "<i><span class='game say'>[language.name], <span class='name'>[speaker_name]</span>, \"[message]\"</span></i>"
src << msg
/mob/new_player/hear_broadcast()
/mob/new_player/hear_broadcast(var/datum/language/language, var/mob/speaker, var/speaker_name, var/message)
return
/mob/dead/observer/hear_broadcast(var/datum/language/language, var/mob/speaker, var/speaker_name, var/message)
if(speaker.name == speaker_name || antagHUD)
src << "<i><span class='game say'>[language.name], <span class='name'>[speaker_name]</span> ([ghost_follow_link(speaker, src)]) [message]</span></i>"
src << "<i><span class='game say'>[language.name], <span class='name'>[speaker_name]</span> ([ghost_follow_link(speaker, src)]), \"[message]\"</span></i>"
else
src << "<i><span class='game say'>[language.name], <span class='name'>[speaker_name]</span> [message]</span></i>"
src << "<i><span class='game say'>[language.name], <span class='name'>[speaker_name]</span>, \"[message]\"</span></i>"
/datum/language/proc/check_special_condition(var/mob/other)
return 1