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

Merge pull request #5213 from Miauw62/whatthefuckareyouevensupposedtocallthesebranchesffs

Browse Source 
Fixes whisper formatting hopefully maybe.
This commit is contained in:
hornygranny
2014-11-08 15:12:59 -08:00
parent d15a44ca94 88dad2b5d5
commit 71efbeef26
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/hologram.dm
+2 -3
View File
@@ -84,13 +84,12 @@ var/const/HOLOPAD_MODE = RANGE_BASED
For the other part of the code, check silicon say.dm. Particularly robot talk.*/
/obj/machinery/hologram/holopad/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq)
if(speaker && masters.len && !radio_freq)//Master is mostly a safety in case lag hits or something. Radio_freq so AIs dont hear holopad stuff through radios.
for (var/mob/living/silicon/ai/master in masters)
for(var/mob/living/silicon/ai/master in masters)
if(masters[master] && speaker != master)
raw_message = master.lang_treat(speaker, message_langs, raw_message)
var/name_used = speaker.GetVoice()
var/rendered = "<i><span class='game say'>Holopad received, <span class='name'>[name_used]</span> <span class='message'>[speaker.say_quote(raw_message)]</span></span></i>"
var/rendered = "<i><span class='game say'>Holopad received, <span class='name'>[name_used]</span> <span class='message'>[raw_message]</span></span></i>"
master.show_message(rendered, 2)
return
/obj/machinery/hologram/holopad/proc/create_holo(mob/living/silicon/ai/A, turf/T = loc)
var/obj/effect/overlay/h = new(T)//Spawn a blank effect at the location.
code/modules/mob/living/carbon/human/whisper.dm
+5 -5
View File
@@ -14,7 +14,7 @@
if(!can_speak(message))
return
message = "<i>[message]</i>"
message = "[message]"
log_whisper("[src.name]/[src.key] : [message]")
if (src.client)
@@ -49,9 +49,9 @@
if(M.stat == DEAD && ((M.client.prefs.toggles & CHAT_GHOSTWHISPER) || (get_dist(M, src) <= 7)))
listening_dead |= M
var/list/listening = get_hear(1, src)
var/list/listening = get_hearers_in_view(1, src)
listening |= listening_dead
var/list/eavesdropping = hearers(2, src)
var/list/eavesdropping = get_hearers_in_view(2, src)
eavesdropping -= listening
var/list/watching = hearers(5, src)
watching -= listening
@@ -63,13 +63,13 @@
for(var/mob/M in watching)
M.show_message(rendered, 2)
rendered = "<span class='game say'><span class='name'>[GetVoice()]</span>[alt_name] [whispers], <span class='message'>\"[message]\"</span></span>"
rendered = "<span class='game say'><span class='name'>[GetVoice()]</span>[alt_name] [whispers], <span class='message'>\"<i>[message]</i>\"</span></span>"
for(var/mob/M in listening)
M.Hear(rendered, src, languages, message)
message = stars(message)
rendered = "<span class='game say'><span class='name'>[GetVoice()]</span>[alt_name] [whispers], <span class='message'>\"[message]\"</span></span>"
rendered = "<span class='game say'><span class='name'>[GetVoice()]</span>[alt_name] [whispers], <span class='message'>\"<i>[message]</i>\"</span></span>"
for(var/mob/M in eavesdropping)
M.Hear(rendered, src, languages, message)
code/modules/mob/mob_helpers.dm
+1 -1
View File
@@ -182,7 +182,7 @@ proc/isorgan(A)
return 0
/proc/stars(n, pr)
n = html_decode(n)
n = strip_html_properly(n)
if (pr == null)
pr = 25
if (pr <= 0)