From 3ca01536fde671b4107d6a9ee70aff7c8d6ea9e9 Mon Sep 17 00:00:00 2001 From: Nerezza Date: Tue, 17 Jul 2012 13:39:45 -0500 Subject: [PATCH 1/3] modified: code/modules/mob/living/carbon/brain/brain.dm modified: code/modules/mob/living/silicon/ai/say.dm modified: code/modules/mob/living/silicon/decoy/decoy.dm modified: code/modules/mob/living/silicon/pai/say.dm modified: code/modules/mob/living/silicon/robot/say.dm modified: code/unused/hivebot/mainframe.dm modified: code/unused/hivebot/say.dm --- code/modules/mob/living/carbon/brain/brain.dm | 2 ++ code/modules/mob/living/silicon/ai/say.dm | 2 ++ code/modules/mob/living/silicon/decoy/decoy.dm | 2 ++ code/modules/mob/living/silicon/pai/say.dm | 2 ++ code/modules/mob/living/silicon/robot/say.dm | 2 ++ code/unused/hivebot/mainframe.dm | 2 ++ code/unused/hivebot/say.dm | 2 ++ 7 files changed, 14 insertions(+) diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm index f9d6ce11f0b..5ae7d77f879 100644 --- a/code/modules/mob/living/carbon/brain/brain.dm +++ b/code/modules/mob/living/carbon/brain/brain.dm @@ -28,6 +28,8 @@ return 1 if (istype(other, /mob/living/carbon/human)) return 1 + if (istype(other, /mob/living/carbon/human/tajaran)) + return 1 if (istype(other, /mob/living/carbon/metroid)) return 1 return ..() diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm index 6be4b474d9e..73d4a3a3921 100644 --- a/code/modules/mob/living/silicon/ai/say.dm +++ b/code/modules/mob/living/silicon/ai/say.dm @@ -8,6 +8,8 @@ /mob/living/silicon/ai/say_understands(var/other) if (istype(other, /mob/living/carbon/human)) return 1 + if (istype(other, /mob/living/carbon/human/tajaran)) + return 1 if (istype(other, /mob/living/silicon/robot)) return 1 if (istype(other, /mob/living/silicon/decoy)) diff --git a/code/modules/mob/living/silicon/decoy/decoy.dm b/code/modules/mob/living/silicon/decoy/decoy.dm index 818b605d0be..931da51b9e3 100644 --- a/code/modules/mob/living/silicon/decoy/decoy.dm +++ b/code/modules/mob/living/silicon/decoy/decoy.dm @@ -7,6 +7,8 @@ /mob/living/silicon/decoy/say_understands(var/other) if (istype(other, /mob/living/carbon/human)) return 1 + if (istype(other, /mob/living/carbon/human/tajaran)) + return 1 if (istype(other, /mob/living/silicon/robot)) return 1 if (istype(other, /mob/living/silicon/ai)) diff --git a/code/modules/mob/living/silicon/pai/say.dm b/code/modules/mob/living/silicon/pai/say.dm index 46ee324792d..3e9249f1570 100644 --- a/code/modules/mob/living/silicon/pai/say.dm +++ b/code/modules/mob/living/silicon/pai/say.dm @@ -11,6 +11,8 @@ return 1 if (istype(other, /mob/living/carbon/brain)) return 1 + if (istype(other, /mob/living/carbon/human/tajaran)) + return 1 return ..() /mob/living/silicon/pai/say_quote(var/text) diff --git a/code/modules/mob/living/silicon/robot/say.dm b/code/modules/mob/living/silicon/robot/say.dm index f71a96a9d94..6d2f74f9487 100644 --- a/code/modules/mob/living/silicon/robot/say.dm +++ b/code/modules/mob/living/silicon/robot/say.dm @@ -5,6 +5,8 @@ return 1 if (istype(other, /mob/living/carbon/human)) return 1 + if (istype(other, /mob/living/carbon/human/tajaran)) + return 1 if (istype(other, /mob/living/carbon/brain)) return 1 if (istype(other, /mob/living/silicon/pai)) diff --git a/code/unused/hivebot/mainframe.dm b/code/unused/hivebot/mainframe.dm index 3c3b188f5b4..6f846596d22 100644 --- a/code/unused/hivebot/mainframe.dm +++ b/code/unused/hivebot/mainframe.dm @@ -71,6 +71,8 @@ return 1 if (istype(other, /mob/living/silicon/ai)) return 1 + if (istype(other, /mob/living/carbon/human/tajaran)) + return 1 return ..() /mob/living/silicon/hive_mainframe/say_quote(var/text) diff --git a/code/unused/hivebot/say.dm b/code/unused/hivebot/say.dm index 492e58a9773..429495be47a 100644 --- a/code/unused/hivebot/say.dm +++ b/code/unused/hivebot/say.dm @@ -3,6 +3,8 @@ return 1 if (istype(other, /mob/living/carbon/human)) return 1 + if (istype(other, /mob/living/carbon/human/tajaran)) + return 1 if (istype(other, /mob/living/silicon/robot)) return 1 return ..() From d9d690344602ee816fd0bf211a0d83525513c35f Mon Sep 17 00:00:00 2001 From: Nerezza Date: Tue, 17 Jul 2012 13:43:18 -0500 Subject: [PATCH 2/3] Update Tara-patch1 --- code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm b/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm index 75508f1726b..5b8f158a53e 100644 --- a/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm +++ b/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm @@ -5,8 +5,7 @@ icon = 'tajaran.dmi' icon_state = "m_none" var/list/tajspeak_letters = list("~","*","-") - // - universal_speak = 1 //hacky fix until someone can figure out how to make them only understand humans + //universal_speak = 1 (I think I fixed it, need testy testy) hacky fix until someone can figure out how to make them only understand humans taj_talk_understand = 1 voice_message = "mrowls" examine_text = "one of the cat-like Tajarans" From 2023ecae5215b8ea4998f2c1a4c59ada1d89d356 Mon Sep 17 00:00:00 2001 From: Nerezza Date: Tue, 17 Jul 2012 13:46:55 -0500 Subject: [PATCH 3/3] Update Tara-patch1 --- .../WorkInProgress/Cael_Aislinn/Tajara/say.dm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/code/WorkInProgress/Cael_Aislinn/Tajara/say.dm b/code/WorkInProgress/Cael_Aislinn/Tajara/say.dm index 9c327ba5116..e8d23875759 100644 --- a/code/WorkInProgress/Cael_Aislinn/Tajara/say.dm +++ b/code/WorkInProgress/Cael_Aislinn/Tajara/say.dm @@ -491,4 +491,21 @@ for (var/mob/M in eavesdroppers) M << "\blue [src] speaks into their radio..." M << speech_bubble - spawn(30) del(speech_bubble) \ No newline at end of file + spawn(30) del(speech_bubble) + +/living/carbon/human/tajaran/say_understands(var/other) + if (istype(other, /mob/living/silicon/ai)) + return 1 + if (istype(other, /mob/living/silicon/decoy)) + return 1 + if (istype(other, /mob/living/silicon/pai)) + return 1 + if (istype(other, /mob/living/silicon/robot)) + return 1 + if (istype(other, /mob/living/carbon/brain)) + return 1 + if (istype(other, /mob/living/carbon/metroid)) + return 1 + if (istype(other, /mob/living/carbon/human)) + return 1 + return ..() \ No newline at end of file