diff --git a/baystation12.dme b/baystation12.dme index a7176e3b98..112c747f10 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -819,6 +819,7 @@ #include "code\modules\clothing\spacesuits\rig\suits\combat.dm" #include "code\modules\clothing\spacesuits\rig\suits\ert.dm" #include "code\modules\clothing\spacesuits\rig\suits\light.dm" +#include "code\modules\clothing\spacesuits\rig\suits\merc.dm" #include "code\modules\clothing\spacesuits\rig\suits\station.dm" #include "code\modules\clothing\spacesuits\void\merc.dm" #include "code\modules\clothing\spacesuits\void\station.dm" diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index 8cd88a1c4f..ba5b0ad4f8 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -166,7 +166,7 @@ //Speach distorted, heard by those who do not understand AIs. var/message_stars = stars(message) var/rendered_b - + if(speaking) rendered_a = "[name] [speaking.format_message(message, verb)]" rendered_b = "[voice_name] [speaking.format_message(message_stars, verb)]" @@ -176,7 +176,7 @@ rendered_b = "[voice_name] [verb], \"[message_stars]\"" src << "Holopad transmitted, [real_name] [verb], \"[message]\""//The AI can "hear" its own message. - src << "Holopad transmitted, [real_name] [verb], \"[message]\""//The AI can "hear" its own message. for(var/mob/M in hearers(T.loc))//The location is the object, default distance. + for(var/mob/M in hearers(T.loc))//The location is the object, default distance. if(M.say_understands(src))//If they understand AI speak. Humans and the like will be able to. M.show_message(rendered_a, 2) else//If they do not.