cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved silicon/say_understands() to silicon/say.dm

Browse Source
This commit is contained in:
mwerezak
2014-05-16 17:28:01 -04:00
parent 08d3913995
commit 726ae086de
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/mob/living/silicon/ai/say.dm
View File

@@ -5,19 +5,6 @@
//If there is a defined "parent" AI, it is actually an AI, and it is alive, anything the AI tries to say is said by the parent instead. //If there is a defined "parent" AI, it is actually an AI, and it is alive, anything the AI tries to say is said by the parent instead.
..(message) ..(message)
/mob/living/silicon/say_understands(var/other,var/datum/language/speaking = null)
//These only pertain to common. Languages are handled by mob/say_understands()
if (!speaking)
if (istype(other, /mob/living/carbon/human))
return 1
if (istype(other, /mob/living/silicon))
return 1
if (istype(other, /mob/living/carbon/brain))
return 1
return ..()
// These Verbs are commented out since we've disabled the AI vocal (VOX) announcements. // These Verbs are commented out since we've disabled the AI vocal (VOX) announcements.
// If you re-enable them there is 3 lines in ai.dm Topic() that you need to uncomment as well. // If you re-enable them there is 3 lines in ai.dm Topic() that you need to uncomment as well.
// just search for VOX in there. // just search for VOX in there.

11
code/modules/mob/living/silicon/say.dm
View File

@@ -12,6 +12,17 @@
#define IS_ROBOT 2 #define IS_ROBOT 2
#define IS_PAI 3 #define IS_PAI 3
/mob/living/silicon/say_understands(var/other,var/datum/language/speaking = null)
//These only pertain to common. Languages are handled by mob/say_understands()
if (!speaking)
if (istype(other, /mob/living/carbon/human))
return 1
if (istype(other, /mob/living/silicon))
return 1
if (istype(other, /mob/living/carbon/brain))
return 1
return ..()
/mob/living/silicon/say(var/message) /mob/living/silicon/say(var/message)
if (!message) if (!message)
return return