cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9793 from PsiOmegaDelta/150612-HiveTracking

Browse Source 
Ghosts can now follow hivemind speech.
This commit is contained in:
Zuhayr
2015-06-13 01:07:49 +09:30
parent 784f4d8705 1256135a26
commit 30909aaccd
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@
var/flags = 0 // Various language flags. var/flags = 0 // Various language flags.
var/native // If set, non-native speakers will have trouble speaking. var/native // If set, non-native speakers will have trouble speaking.
var/list/syllables // Used when scrambling text for a non-speaker. var/list/syllables // Used when scrambling text for a non-speaker.
var/list/space_chance = 55 // Likelihood of getting a space in the random scramble string. var/list/space_chance = 55 // Likelihood of getting a space in the random scramble string
/datum/language/proc/get_random_name(var/gender, name_count=2, syllable_count=4) /datum/language/proc/get_random_name(var/gender, name_count=2, syllable_count=4)
if(!syllables || !syllables.len) if(!syllables || !syllables.len)
@@ -101,11 +101,22 @@
log_say("[key_name(speaker)] : ([name]) [message]") log_say("[key_name(speaker)] : ([name]) [message]")
if(!speaker_mask) speaker_mask = speaker.name if(!speaker_mask) speaker_mask = speaker.name
var/msg = "<i><span class='game say'>[name], <span class='name'>[speaker_mask]</span> [format_message(message, get_spoken_verb(message))]</span></i>"
for(var/mob/player in player_list) for(var/mob/player in player_list)
if(istype(player,/mob/dead) || ((src in player.languages) && check_special_condition(player))) player.hear_broadcast(src, speaker, speaker_mask, format_message(message, get_spoken_verb(message)))
player << msg
/mob/proc/hear_broadcast(var/datum/language/language, var/speaker, 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>"
src << msg
/mob/new_player/hear_broadcast()
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>"
else
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) /datum/language/proc/check_special_condition(var/mob/other)
return 1 return 1

2
code/modules/mob/language/synthetic.dm
View File

@@ -22,7 +22,7 @@
for (var/mob/M in dead_mob_list) for (var/mob/M in dead_mob_list)
if(!istype(M,/mob/new_player) && !istype(M,/mob/living/carbon/brain)) //No meta-evesdropping if(!istype(M,/mob/new_player) && !istype(M,/mob/living/carbon/brain)) //No meta-evesdropping
M.show_message("[message_start] [message_body]", 2) M.show_message("[message_start] ([ghost_follow_link(speaker, M)]) [message_body]", 2)
for (var/mob/living/S in living_mob_list) for (var/mob/living/S in living_mob_list)

6
html/changelogs/PsiOmegaDelta-HiveTracking.yml Normal file
View File

@@ -0,0 +1,6 @@
author: PsiOmegaDelta
delete-after: True
changes:
- rscadd: "Observers can now follow both the AI and its eye upon speech."
- rscadd: "Observers can now follow both observers and their body, if they ever had one, upon speech."
- rscadd: "Observers can now follow hivemind speakers if the speaker is not using an alias or antagHUD is enabled."