From 62df59ee68275640fe9740ee9fc149b2e9e9d07f Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Fri, 3 Jan 2014 12:55:40 -0600 Subject: [PATCH 1/3] Allow people inside/on objects to hear as well as cortical borers. --- code/__HELPERS/game.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 8da220bf671..4700698ab37 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -182,7 +182,7 @@ hear += A if(isobj(A) || ismob(A)) - hear = recursive_mob_check(A, hear, 3, 1, 0, 1) + hear += recursive_mob_check(A, hear, 3, 1, 0, 1) return hear From b654cfccdaf74874ff1be8b2e596a852db9d232b Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Fri, 3 Jan 2014 13:42:42 -0600 Subject: [PATCH 2/3] This doesn't look right either. --- code/__HELPERS/game.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 4700698ab37..6b12673d817 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -142,7 +142,7 @@ if(ismob(A)) var/mob/M = A if(client_check && !M.client) - L = recursive_mob_check(A, L, recursion_limit - 1, client_check, sight_check, include_radio) + L |= recursive_mob_check(A, L, recursion_limit - 1, client_check, sight_check, include_radio) continue if(sight_check && !isInSight(A, O)) continue @@ -155,7 +155,7 @@ L |= A if(isobj(A) || ismob(A)) - L = recursive_mob_check(A, L, recursion_limit - 1, client_check, sight_check, include_radio) + L |= recursive_mob_check(A, L, recursion_limit - 1, client_check, sight_check, include_radio) return L // The old system would loop through lists for a total of 5000 per function call, in an empty server. From 5a356fabcaacaf179de582f6b70f43fd8fc451d7 Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Fri, 3 Jan 2014 17:05:58 -0600 Subject: [PATCH 3/3] Recursive Derp. This should fix that. --- code/__HELPERS/game.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 6b12673d817..7cfa15e53a2 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -182,7 +182,7 @@ hear += A if(isobj(A) || ismob(A)) - hear += recursive_mob_check(A, hear, 3, 1, 0, 1) + hear |= recursive_mob_check(A, hear, 3, 1, 0, 1) return hear