AI's can now understand pAI speech

Tidied up some.
This commit is contained in:
SkyMarshal
2012-02-06 11:02:49 -07:00
parent 3feb42e795
commit 664c6b7dec
4 changed files with 7 additions and 17 deletions

View File

@@ -290,13 +290,4 @@ proc/check_can_reach(atom/user, atom/target)
del(D)
// ------- DUMMY OBJECT'S SERVED IT'S PURPOSE, IT'S REWARDED WITH A SWIFT DELETE -------
return ok
//cael - not sure if there's an equivalent proc, but if there is i couldn't find it
//searches to see if M contains O somewhere
proc/is_carrying(var/M as mob, var/O as obj)
while(!istype(O,/area))
if(O:loc == M)
return 1
O = O:loc
return 0
return ok

View File

@@ -118,7 +118,8 @@
return
var/obj/mecha/Mech = M.loc
spawn() //this helps prevent clickspam fest.
if (Mech && !(is_carrying(M,object)) ) //cael - make sure you cant drill shit in your invent
var/list/mob_contents = M.get_contents()
if (Mech && !(locate(object) in mob_contents)) //cael - make sure you cant drill shit in your invent
Mech.click_action(object,M)
else
return ..()

View File

@@ -44,14 +44,16 @@
M.show_message(rendered, 2)
/mob/proc/say_understands(var/mob/other)
if(!other)
return 1
// if(!other)
// return 1
if (src.stat == 2)
return 1
else if (istype(other, src.type))
return 1
else if(other.universal_speak || src.universal_speak)
return 1
else if(isAI(src) && ispAI(other))
return 1
return 0
/mob/proc/say_quote(var/text)