diff --git a/baystation12.dme b/baystation12.dme
index 3d325141d4..9bf93b3906 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -144,10 +144,7 @@
 #define FILE_DIR "code/unused/spacecraft"
 #define FILE_DIR "code/WorkInProgress"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn"
-#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Jumper"
-#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Tajara"
-#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/tajara_sprites"
 #define FILE_DIR "code/WorkInProgress/mapload"
 #define FILE_DIR "code/WorkInProgress/Mini"
 #define FILE_DIR "code/WorkInProgress/organs"
@@ -179,7 +176,6 @@
 #define FILE_DIR "icons/vending_icons"
 #define FILE_DIR "interface"
 #define FILE_DIR "maps"
-#define FILE_DIR "maps/backup"
 #define FILE_DIR "sound"
 #define FILE_DIR "sound/ambience"
 #define FILE_DIR "sound/announcer"
diff --git a/code/defines/procs/gamehelpers.dm b/code/defines/procs/gamehelpers.dm
index 9658feb8b1..e9b2c0207f 100644
--- a/code/defines/procs/gamehelpers.dm
+++ b/code/defines/procs/gamehelpers.dm
@@ -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
\ No newline at end of file
+	return ok
\ No newline at end of file
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index e577f86280..4cae453b51 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -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 ..()
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index fd2cd466be..1d2ef552f5 100644
--- a/code/modules/mob/say.dm
+++ b/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)