Merge pull request #4457 from Ccomp5950/FUCK_recursive_mob_check

Code effeciency project: /proc/get_mobs_in_view - hot

code/__HELPERS/game.dm

@@ -161,6 +161,8 @@
 // The old system would loop through lists for a total of 5000 per function call, in an empty server.
 // This new system will loop at around 1000 in an empty server.
 
+// SCREW THAT SHIT, we're not recursing.
+
 /proc/get_mobs_in_view(var/R, var/atom/source)
 	// Returns a list of mobs in range of R from source. Used in radio and say code.
 
@@ -172,18 +174,34 @@
 
 	var/list/range = hear(R, T)
 
-	for(var/atom/A in range)
-		if(ismob(A))
-			var/mob/M = A
-			if(M.client)
-				hear += M
-			//world.log << "Start = [M] - [get_turf(M)] - ([M.x], [M.y], [M.z])"
-		else if(istype(A, /obj/item/device/radio))
-			hear += A
+	for(var/mob/M in range)
+		if(M.client)
+			hear += M
+		
+	var/list/objects = list()
 
-		if(isobj(A) || ismob(A))
-			hear |= recursive_mob_check(A, hear, 3, 1, 0, 1)
+	for(var/obj/O in range)				//Get a list of objects in hearing range.  We'll check to see if any clients have their "eye" set to the object 
+		objects += O
 
+	for(var/client/C in clients)
+		if(!istype(C) || !C.eye)
+			continue   			//I have no idea when this client check would be needed, but if this runtimes people won't hear anything
+							//So kinda paranoid about runtime avoidance.
+		if(C.mob in hear)
+			continue
+		if(C.eye in (hear|objects))
+			if(!(C.mob in hear))
+				hear += C.mob
+			
+		else if(!(C.mob in hear))
+			if(C.mob.loc && C.mob.loc in (hear|objects))
+				hear += C.mob
+			else if(C.mob.loc.loc && C.mob.loc.loc in (hear|objects))  
+				hear += C.mob
+			else if(C.mob.loc.loc.loc && C.mob.loc.loc.loc in (hear|objects))   //Going a little deeper
+				hear += C.mob
+
+				
 	return hear
 
 

code/modules/mob/emote.dm

@@ -38,13 +38,15 @@
 
 		// Type 1 (Visual) emotes are sent to anyone in view of the item
 		if (m_type & 1)
-			for (var/mob/O in viewers(src, null))
+			var/list/can_see = get_mobs_in_view(1,src)  //Allows silicon & mmi mobs carried around to see the emotes of the person carrying them around.
+			can_see |= viewers(src,null)
+			for (var/mob/O in can_see)
 				O.show_message(message, m_type)
 
 		// Type 2 (Audible) emotes are sent to anyone in hear range
 		// of the *LOCATION* -- this is important for pAIs to be heard
 		else if (m_type & 2)
-			for (var/mob/O in hearers(get_turf(src), null))
+			for (var/mob/O in get_mobs_in_view(7,src))
 				O.show_message(message, m_type)
 
 /mob/proc/emote_dead(var/message)

code/modules/mob/living/say.dm

@@ -302,7 +302,7 @@ var/list/department_radio_keys = list(
 	var/list/listening
 
 	listening = get_mobs_in_view(message_range, src)
-	var/list/onscreen = get_mobs_in_view(7, src)
+	var/list/onscreen = viewers()
 	for(var/mob/M in player_list)
 		if (!M.client)
 			continue //skip monkeys and leavers