From 3ca01536fde671b4107d6a9ee70aff7c8d6ea9e9 Mon Sep 17 00:00:00 2001 From: Nerezza Date: Tue, 17 Jul 2012 13:39:45 -0500 Subject: [PATCH] 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 ..()