Merge git://github.com/Baystation12/Baystation12

Conflicts:
	code/defines/procs/gamehelpers.dm
	code/game/mecha/mecha.dm
	maps/tgstation.2.0.8.dmm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>

code/defines/procs/gamehelpers.dm

@@ -290,4 +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
+	return ok

code/game/mecha/mecha.dm

@@ -118,7 +118,8 @@
 				return
 		var/obj/mecha/Mech = M.loc
 		spawn() //this helps prevent clickspam fest.
-			if (Mech && !(object in M.get_contents())  )	//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 ..()

code/modules/mob/say.dm

@@ -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)