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

Merge pull request #6750 from phil235/VisibleMessageFixing

Browse Source 
Fixes visible_messages.
This commit is contained in:
Cheridan
2015-01-07 20:06:21 -06:00
parent a2ea238b0c f6003e12b5
commit e4f42a2aef
1 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob.dm
+47 -21
View File
@@ -82,24 +82,37 @@ var/next_mob_id = 0
// blind_message (optional) is what blind people will hear e.g. "You hear something!"
/mob/visible_message(var/message, var/self_message, var/blind_message)
var/list/atom_viewers = list()
for(var/atom/movable/A in view(src))
atom_viewers |= recursive_hear_check(A)
atom_viewers |= src
for(var/mob/M in atom_viewers)
var/list/mob_viewers = list()
var/list/possible_viewers = list()
mob_viewers |= src
mob_viewers |= viewers(src)
var/heard = get_hear(7, src)
for(var/atom/movable/A in heard)
possible_viewers |= recursive_hear_check(A)
for(var/mob/B in possible_viewers)
if(B in mob_viewers)
continue
if(isturf(B.loc))
continue
var/turf/T = get_turf(B)
if(src in view(T))
mob_viewers |= B
for(var/mob/M in mob_viewers)
if(M.see_invisible < invisibility)
continue //can't view the invisible
var/msg = message
if(self_message && M==src)
msg = self_message
M.show_message( msg, 1)
M.show_message(msg, 1)
if(blind_message)
var/list/atom_hearers = list()
for(var/atom/movable/O in get_hearers_in_view(7, src))
if(O in atom_viewers)
var/list/mob_hearers = list()
for(var/mob/C in get_hearers_in_view(7, src))
if(C in mob_viewers)
continue
atom_hearers |= O
for(var/mob/MOB in atom_hearers)
mob_hearers |= C
for(var/mob/MOB in mob_hearers)
MOB.show_message(blind_message, 2)
// Show a message to all mobs who sees this atom
@@ -108,18 +121,31 @@ var/next_mob_id = 0
// blind_message (optional) is what blind people will hear e.g. "You hear something!"
/atom/proc/visible_message(var/message, var/blind_message)
var/list/atom_viewers = list()
for(var/atom/movable/A in view(src))
atom_viewers |= recursive_hear_check(A)
for(var/mob/M in atom_viewers)
M.show_message( message, 1)
var/list/mob_viewers = list()
var/list/possible_viewers = list()
mob_viewers |= viewers(src)
var/heard = get_hear(7, src)
for(var/atom/movable/A in heard)
possible_viewers |= recursive_hear_check(A)
for(var/mob/B in possible_viewers)
if(B in mob_viewers)
continue
if(isturf(B.loc))
continue
var/turf/T = get_turf(B)
if(src in view(T))
mob_viewers |= B
for(var/mob/M in mob_viewers)
M.show_message(message, 1)
if(blind_message)
var/list/atom_hearers = list()
for(var/atom/movable/O in get_hearers_in_view(7, src))
if(O in atom_viewers)
var/list/mob_hearers = list()
for(var/mob/C in get_hearers_in_view(7, src))
if(C in mob_viewers)
continue
atom_hearers |= O
for(var/mob/MOB in atom_hearers)
mob_hearers |= C
for(var/mob/MOB in mob_hearers)
MOB.show_message(blind_message, 2)
// Show a message to all mobs in earshot of this one