cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 21:40:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

This reverts commit all the say code changes over the last couple of days.

Browse Source 
Except for the removal of the redundant get_mobs_in_view used for bolding ghosts text.
This commit is contained in:
Ccomp5950
2014-02-22 03:46:10 -06:00
parent 92e0c60126
commit 8ef2e10237
4 changed files with 26 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/mapping.dm
-67
View File
@@ -161,9 +161,6 @@ var/list/debug_verbs = list (
,/client/proc/hide_debug_verbs
,/client/proc/testZAScolors
,/client/proc/testZAScolors_remove
,/client/proc/test_viewers
,/client/proc/test_view
,/client/proc/test_hear
)
@@ -188,70 +185,6 @@ var/list/debug_verbs = list (
feedback_add_details("admin_verb","hDV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/test_viewers()
set category = "Debug"
set name = "Test Viewers"
var/turf/T = get_turf(usr)
var/lum = T.loc.luminosity
T.loc.luminosity = 1
var/list/inviewers = viewers(7, usr)
T.loc.luminosity = lum
var/list/M = list()
var/list/O = list()
for(var/obj/OBJ in inviewers)
O += OBJ
for(var/mob/MOB in inviewers)
M += MOB
usr << "VIEWERS MOB: [list2text(M,", ")]"
usr << "VIEWERS OBJ: [list2text(O,", ")]"
/client/proc/test_view()
set category = "Debug"
set name = "Test View"
var/list/inview = view(7, usr)
var/list/M = list()
var/list/O = list()
for(var/obj/OBJ in inview)
O += OBJ
for(var/mob/MOB in inview)
M += MOB
usr << "VIEW MOB: [list2text(M,", ")]"
usr << "VIEW OBJ: [list2text(O,", ")]"
/client/proc/test_hear()
set category = "Debug"
set name = "Test Hear"
var/turf/T = get_turf(usr)
var/list/hearers = hear(7, T)
var/list/M = list()
var/list/O = list()
for(var/obj/OBJ in hearers)
O += OBJ
for(var/mob/MOB in hearers)
M += MOB
usr << "HEAR MOB: [list2text(M,", ")]"
usr << "HEAR OBJ: [list2text(O,", ")]"
/client/var/list/testZAScolors_turfs = list()
/client/var/list/testZAScolors_zones = list()
/client/var/usedZAScolors = 0
code/modules/mob/emote.dm
+2 -4
View File
@@ -38,15 +38,13 @@
// Type 1 (Visual) emotes are sent to anyone in view of the item
if (m_type & 1)
var/list/can_see = get_mobs_in_view(1,src) //Allows silicon & mmi mobs carried around to see the emotes of the person carrying them around.
can_see |= viewers(src,null)
for (var/mob/O in can_see)
for (var/mob/O in viewers(src, null))
O.show_message(message, m_type)
// Type 2 (Audible) emotes are sent to anyone in hear range
// of the *LOCATION* -- this is important for pAIs to be heard
else if (m_type & 2)
for (var/mob/O in get_mobs_in_view(7,src))
for (var/mob/O in hearers(get_turf(src), null))
O.show_message(message, m_type)
/mob/proc/emote_dead(var/message)
code/modules/mob/living/say.dm
+13 -14
View File
@@ -384,20 +384,19 @@ var/list/department_radio_keys = list(
rendered = "<span class='game say'><span class='name'>[GetVoice()]</span>[alt_name] <span class='message'>[message_a]</span></span>"
var/rendered_ghost = "<span class='game say'><span class='name'>[GetVoice()]</span>[alt_name] <span class='message'>[message_ghost]</span></span>"
for (var/mob/M in heard_a)
if(M.client) //Runtime fix.
if(hascall(M,"show_message"))
var/deaf_message = ""
var/deaf_type = 1
if(M != src)
deaf_message = "<span class='name'>[name]</span>[alt_name] talks but you cannot hear them."
else
deaf_message = "<span class='notice'>You cannot hear yourself!</span>"
deaf_type = 2 // Since you should be able to hear yourself without looking
if (M.stat == DEAD && (M.client.prefs.toggles & CHAT_GHOSTEARS) && M in onscreen)
M.show_message(rendered_ghost, 2, deaf_message, deaf_type)
else
M.show_message(rendered, 2, deaf_message, deaf_type)
M << speech_bubble
if(hascall(M,"show_message"))
var/deaf_message = ""
var/deaf_type = 1
if(M != src)
deaf_message = "<span class='name'>[name]</span>[alt_name] talks but you cannot hear them."
else
deaf_message = "<span class='notice'>You cannot hear yourself!</span>"
deaf_type = 2 // Since you should be able to hear yourself without looking
if (M.stat == DEAD && (M.client.prefs.toggles & CHAT_GHOSTEARS) && M in onscreen)
M:show_message(rendered_ghost, 2, deaf_message, deaf_type)
else
M:show_message(rendered, 2, deaf_message, deaf_type)
M << speech_bubble
if (length(heard_b))