cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 23:53:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2391 from Fox-McCloud/say-bubble-fix

Browse Source 
Say Bubble Refactor+Fix
This commit is contained in:
TheDZD
2015-10-19 18:52:07 -04:00
parent ccafe065af 597108dc40
commit a19c391beb
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/say.dm
+13 -7
View File
@@ -243,13 +243,15 @@ proc/get_radio_key_from_channel(var/channel)
if(M.loc && M.locs[1] in hearturfs)
listening |= M
var/list/speech_bubble_recipients = list()
var/speech_bubble_test = say_test(message)
var/image/speech_bubble = image('icons/mob/talk.dmi',src,"h[speech_bubble_test]")
spawn(30) qdel(speech_bubble)
for(var/mob/M in listening)
M << speech_bubble
M.hear_say(message, verb, speaking, alt_name, italics, src, speech_sound, sound_vol)
if(M.client)
speech_bubble_recipients.Add(M.client)
spawn(0)
flick_overlay(image('icons/mob/talk.dmi', src, "h[speech_bubble_test]",MOB_LAYER+1), speech_bubble_recipients, 30)
for(var/obj/O in listening_obj)
spawn(0)
@@ -399,19 +401,23 @@ proc/get_radio_key_from_channel(var/channel)
watching -= eavesdropping
//now mobs
var/list/speech_bubble_recipients = list()
var/speech_bubble_test = say_test(message)
var/image/speech_bubble = image('icons/mob/talk.dmi',src,"h[speech_bubble_test]")
spawn(30) qdel(speech_bubble)
for(var/mob/M in listening)
M << speech_bubble
M.hear_say(message, verb, speaking, alt_name, italics, src)
if(M.client)
speech_bubble_recipients.Add(M.client)
if(eavesdropping.len)
var/new_message = stars(message) //hopefully passing the message twice through stars() won't hurt... I guess if you already don't understand the language, when they speak it too quietly to hear normally you would be able to catch even less.
for(var/mob/M in eavesdropping)
M << speech_bubble
M.hear_say(new_message, verb, speaking, alt_name, italics, src)
if(M.client)
speech_bubble_recipients.Add(M.client)
spawn(0)
flick_overlay(image('icons/mob/talk.dmi', src, "h[speech_bubble_test]",MOB_LAYER+1), speech_bubble_recipients, 30)
if(watching.len)
var/rendered = "<span class='game say'><span class='name'>[src.name]</span> [not_heard].</span>"