Merge pull request #505 from LudwigVonChesterfield/tele_nerf

one more thing

code/_onclick/telekinesis.dm

@@ -57,9 +57,9 @@ var/const/tk_maxrange = 15
 	if(!prob(psy_resist_chance))
 		switch(user.a_intent)
 			if(I_DISARM)
-				if(world.time <= M.next_click)
+				if(world.time <= next_click)
 					return
-				if(M.next_move > world.time)
+				if(next_move > world.time)
 					return
 
 				to_chat(user, "<span class='warning'>You disarm [src]!</span>")
@@ -74,9 +74,9 @@ var/const/tk_maxrange = 15
 				O.host = user
 				O.focus_object(src)
 			if(I_HURT)
-				if(world.time <= M.next_click)
+				if(world.time <= next_click)
 					return
-				if(M.next_move > world.time)
+				if(next_move > world.time)
 					return
 
 				to_chat(user, "<span class='warning'>You lock [src] in place!</span>")
@@ -211,7 +211,7 @@ var/const/tk_maxrange = 15
 
 		var/psy_resist_chance = 50 + (d * 2) // A chance that our poor mob might resist our efforts to make him beat something up.
 
-		if(get_species(user) != TYCHEON)
+		if(user.get_species() != TYCHEON)
 			psy_resist_chance += 10
 
 		if(target == M)

code/game/machinery/doors/door.dm

@@ -141,9 +141,15 @@
 	//	user = null
 	user.SetNextMove(CLICK_CD_INTERACT)
 	if(!src.requiresID())
+		if(!Adjacent(user)) // Telekinetic bull.
+			if(density)
+				open()
+			else
+				close()
+			return
 		user = null
-	if(src.allowed(user) && (!user || Adjacent(I)))
-		if(src.density)
+	if(src.allowed(user))
+		if(density)
 			open()
 		else
 			close()

code/modules/mob/living/carbon/species.dm

@@ -1269,6 +1269,8 @@
 
 /mob/proc/telepathy_hear(verb, message, source, datum/language/language = null) // Makes all those nosy telepathics hear what we hear. Also, please do see game\sound.dm, I have a little bootleg hidden there for you ;).
 	for(var/mob/M in remote_hearers)
+		if(source == M)
+			continue
 		var/dist = get_dist(src, M)
 		if(source)
 			dist = get_dist(src, source)
@@ -1366,14 +1368,17 @@
 	INVOKE_ASYNC(GLOBAL_PROC, /proc/flick_overlay, III, list(client, M.client), 3 SECONDS)
 
 	var/datum/language/speaking = parse_language(say, M) // We can talk in languages they know, but we don't.
+	if(!speaking)
+		speaking = parse_language(say, src) // Or in languages we know, but they don't.
+
 	if(speaking)
 		say = copytext(say, 2 + length(speaking.key))
 
 	if(!M.say_understands(src, speaking) && speaking)
 		say = speaking.scramble(say)
 
 	if(!speaking)
-		say = ""[say]""
+		say = "\"[say]\""
 
 	if(speaking)
 		say = speaking.format_message(say) //, verb) Verb is actually unused.
@@ -1496,15 +1501,18 @@
 
 	for(var/mob/M in chosen)
 		var/datum/language/speaking = parse_language(say, M) // We can talk in languages they know, but we don't.
+		if(!speaking)
+			speaking = parse_language(say, src) // Or in languages we know, but they don't.
+
 		if(speaking)
 			say = copytext(say, 2 + length(speaking.key))
 
+		if(!speaking)
+			say = "\"[say]\""
+
 		if(!M.say_understands(src, speaking) && speaking)
 			say = speaking.scramble(say)
 
-		if(!speaking)
-			say = ""[say]""
-
 		if(speaking)
 			say = speaking.format_message(say) //, verb) Verb is actually unused.
 		else

code/modules/mob/mob.dm

@@ -498,6 +498,10 @@
 /mob/proc/start_pulling(atom/movable/AM)
 	if(!AM || !src || src == AM || !isturf(AM.loc))	//if there's no person pulling OR the person is pulling themself OR the object being pulled is inside something: abort!
 		return
+	if(ishuman(AM))
+		var/mob/living/carbon/human/H = AM
+		if(H.species.flags[IS_IMMATERIAL])
+			return
 	if(!AM.anchored)
 		AM.add_fingerprint(src)
 

code/modules/mob/mob_grab.dm

@@ -27,6 +27,10 @@
 
 	if(affecting.anchored)
 		return INITIALIZE_HINT_QDEL
+	if(ishuman(affecting))
+		var/mob/living/carbon/human/H = affecting
+		if(H.species.flags[IS_IMMATERIAL])
+			return INITIALIZE_HINT_QDEL
 	last_action = world.time - 10
 
 	hud = new /obj/screen/grab(src)