shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "[MIRROR] Fixes say verbs not working"

Browse Source
This commit is contained in:
LetterJay
2017-05-07 19:41:33 -04:00
committed by GitHub
parent dc7dbc5ec9
commit 2efe90055f
9 changed files with 8 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/dead/observer/say.dm
+1 -1
View File
@@ -20,6 +20,6 @@
to_follow = V.source
var/link = FOLLOW_LINK(src, to_follow)
// Recompose the message, because it's scrambled by default
message = compose_message(speaker, message_language, raw_message, radio_freq, spans, message_mode)
message = compose_message(speaker, message_language, raw_message, radio_freq, spans)
to_chat(src, "[link] [message]")
code/modules/mob/living/silicon/ai/freelook/eye.dm
+1 -1
View File
@@ -106,4 +106,4 @@
/mob/camera/aiEye/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode)
if(relay_speech && speaker && ai && !radio_freq && speaker != ai && near_camera(speaker))
ai.relay_speech(message, speaker, message_language, raw_message, radio_freq, spans, message_mode)
ai.relay_speech(message, speaker, message_language, raw_message, radio_freq, spans)
code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
-1
View File
@@ -108,7 +108,6 @@
speak_emote = list("clanks", "clinks", "clunks", "clangs")
verb_ask = "requests"
verb_exclaim = "proclaims"
verb_whisper = "imparts"
verb_yell = "harangues"
bubble_icon = "clock"
initial_languages = list(/datum/language/common, /datum/language/ratvar)
code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+1 -1
View File
@@ -401,7 +401,7 @@ Difficulty: Very Hard
to_chat(user, observer_desc)
to_chat(user, "It is activated by [activation_method].")
/obj/machinery/anomalous_crystal/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, spans, message_mode)
/obj/machinery/anomalous_crystal/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, spans)
..()
if(isliving(speaker))
ActivationReaction(speaker, ACTIVATE_SPEECH)
code/modules/mob/living/simple_animal/slime/say.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/mob/living/simple_animal/slime/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, spans, message_mode)
/mob/living/simple_animal/slime/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, spans)
if(speaker != src && !radio_freq && !stat)
if (speaker in Friends)
speech_buffer = list()