cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-22 20:57:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-newpolsync

Browse Source 
# Conflicts:
#	code/game/objects/items/weapons/tanks/tank_types.dm
#	code/modules/events/canister_leak.dm
#	code/modules/gamemaster/actions/canister_leak.dm
This commit is contained in:
Arokha Sieyes
2017-03-13 01:29:01 -04:00
parent 9feec8e4ed e526a4cdc7
commit 6e8667e948
20 changed files with 248 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/language/synthetic.dm
+10 -3
View File
@@ -17,15 +17,19 @@
if (!message)
return
message = speaker.say_emphasis(message)
var/message_start = "<i><span class='game say'>[name], <span class='name'>[speaker.name]</span>"
var/message_body = "<span class='message'>[speaker.say_quote(message)], \"[message]\"</span></span></i>"
for (var/mob/M in dead_mob_list)
if(!istype(M,/mob/new_player) && !istype(M,/mob/living/carbon/brain)) //No meta-evesdropping
M.show_message("[message_start] ([ghost_follow_link(speaker, M)]) [message_body]", 2)
var/message_to_send = "[message_start] ([ghost_follow_link(speaker, M)]) [message_body]"
if(M.check_mentioned(message) && M.is_preference_enabled(/datum/client_preference/check_mention))
message_to_send = "<font size='3'><b>[message_to_send]</b></font>"
M.show_message(message_to_send, 2)
for (var/mob/living/S in living_mob_list)
if(drone_only && !istype(S,/mob/living/silicon/robot/drone))
continue
else if(istype(S , /mob/living/silicon/ai))
@@ -33,7 +37,10 @@
else if (!S.binarycheck())
continue
S.show_message("[message_start] [message_body]", 2)
var/message_to_send = "[message_start] [message_body]"
if(S.check_mentioned(message) && S.is_preference_enabled(/datum/client_preference/check_mention))
message_to_send = "<font size='3'><b>[message_to_send]</b></font>"
S.show_message(message_to_send, 2)
var/list/listening = hearers(1, src)
listening -= src