cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-07-15 09:42:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #732 from SoundScopes/master

Browse Source 
UPdates
This commit is contained in:
SoundScopes
2015-10-13 03:56:48 +01:00
parent ad0fafa6d1 5163933375
commit 9a2fcd3f7f
11 changed files with 12775 additions and 12740 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/language.dm
+1 -1
View File
@@ -100,7 +100,7 @@
return (copytext(message, length(message)) == "!") ? 2 : 1
/datum/language/proc/broadcast(var/mob/living/speaker,var/message,var/speaker_mask)
log_say("[key_name(speaker)] : ([name]) [message]")
log_say("[key_name(speaker)] :([name]) [message]")
if(!speaker_mask) speaker_mask = speaker.name
var/msg = "<i><span class='game say'>[name], <span class='name'>[speaker_mask]</span> [format_message(message, get_spoken_verb(message))]</span></i>"
code/modules/mob/living/say.dm
+4 -2
View File
@@ -74,16 +74,18 @@ var/list/department_radio_keys = list(
/mob/living/say(var/message, var/datum/language/speaking = null, var/verb="says", var/alt_name="", var/italics=0, var/message_range = world.view, var/sound/speech_sound, var/sound_vol)
var/turf/T = get_turf(src)
var/lang = "default"
//handle nonverbal and sign languages here
if (speaking)
lang = speaking.name
if (speaking.flags & NONVERBAL)
if (prob(30))
src.custom_emote(1, "[pick(speaking.signlang_verb)].")
if (speaking.flags & SIGNLANG)
say_signlang(message, pick(speaking.signlang_verb), speaking)
log_say("[name]/[key] : [message]")
log_say("[name]/[key] :([lang]) [message]")
return 1
//make sure the air can transmit speech
@@ -143,7 +145,7 @@ var/list/department_radio_keys = list(
if(O) //It's possible that it could be deleted in the meantime.
O.hear_talk(src, message, verb, speaking)
log_say("[name]/[key] : [message]")
log_say("[name]/[key] :([lang]) [message]")
return 1
/mob/living/proc/say_signlang(var/message, var/verb="gestures", var/datum/language/language)
code/modules/mob/living/silicon/say.dm
+11 -11
View File
@@ -107,10 +107,10 @@
if(IS_AI)
return AI.holopad_talk(message)
if(IS_ROBOT)
log_say("[key_name(src)] : [message]")
log_say("[key_name(src)] :([message_mode]/[speaking.name]) [message]")
R.radio.talk_into(src,message,message_mode,verb,speaking)
if(IS_PAI)
log_say("[key_name(src)] : [message]")
log_say("[key_name(src)] :([message_mode]/[speaking.name]) [message]")
P.radio.talk_into(src,message,message_mode,verb,speaking)
return 1
@@ -122,13 +122,13 @@
src << "\red System Error - Transceiver Disabled"
return
else
log_say("[key_name(src)] : [message]")
log_say("[key_name(src)] :(General/[speaking.name]) [message]")
AI.aiRadio.talk_into(src,message,null,verb,speaking)
if(IS_ROBOT)
log_say("[key_name(src)] : [message]")
log_say("[key_name(src)] :(General/[speaking.name]) [message]")
R.radio.talk_into(src,message,null,verb,speaking)
if(IS_PAI)
log_say("[key_name(src)] : [message]")
log_say("[key_name(src)] :(General/[speaking.name]) [message]")
P.radio.talk_into(src,message,null,verb,speaking)
return 1
@@ -140,13 +140,13 @@
src << "\red System Error - Transceiver Disabled"
return
else
log_say("[key_name(src)] : [message]")
log_say("[key_name(src)] :([message_mode]/[speaking.name]) [message]")
AI.aiRadio.talk_into(src,message,message_mode,verb,speaking)
if(IS_ROBOT)
log_say("[key_name(src)] : [message]")
log_say("[key_name(src)] :([message_mode]/[speaking.name]) [message]")
R.radio.talk_into(src,message,message_mode,verb,speaking)
if(IS_PAI)
log_say("[key_name(src)] : [message]")
log_say("[key_name(src)] :([message_mode]/[speaking.name]) [message]")
P.radio.talk_into(src,message,message_mode,verb,speaking)
return 1
@@ -154,9 +154,6 @@
//For holopads only. Usable by AI.
/mob/living/silicon/ai/proc/holopad_talk(var/message)
log_say("[key_name(src)] : [message]")
message = trim(message)
if (!message)
@@ -164,6 +161,9 @@
var/obj/machinery/hologram/holopad/T = src.holo
if(T && T.hologram && T.master == src)//If there is a hologram and its master is the user.
log_say("[key_name(src)] :(Holopad) [message]") //Log here to get holopad location
var/verb = say_quote(message)
//Human-like, sorta, heard by those who understand humans.
code/modules/mob/living/simple_animal/borer.dm
+4 -2
View File
@@ -19,11 +19,13 @@
message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
if (!message)
return
log_say("[key_name(src)] : [message]")
var/mob/living/simple_animal/borer/B = src.loc
log_say("[key_name(src)] :(in key_name(B.host.name)) [message]")
if (stat == 2)
return say_dead(message)
var/mob/living/simple_animal/borer/B = src.loc
src << "You whisper silently, \"[message]\""
B.host << "The captive mind of [src] whispers, \"[message]\""
code/modules/mob/living/simple_animal/borer/borer_captive.dm
+3 -2
View File
@@ -17,11 +17,12 @@
message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
if (!message)
return
log_say("[key_name(src)] : [message]")
if (stat == 2)
return say_dead(message)
var/mob/living/simple_animal/borer/B = src.loc
log_say("[key_name(src)] :(to [key_name(B.host.name)]) [message]")
src << "You whisper silently, \"[message]\""
B.host << "The captive mind of [src] whispers, \"[message]\""
@@ -32,4 +33,4 @@
M << "The captive mind of [src] whispers, \"[message]\""
/mob/living/captive_brain/emote(var/message)
return
return