cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved the dead mob check.

Browse Source
This commit is contained in:
ESwordTheCat
2014-04-23 16:44:49 +08:00
parent 66491311be
commit cbd52be32f
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/__HELPERS/game.dm
View File

@@ -146,24 +146,24 @@
if(!recursion_limit) if(!recursion_limit)
return L return L
if (istype(A, /mob/dead))
return L + A
for(var/atom/movable/A in O.contents) for(var/atom/movable/A in O.contents)
if(ismob(A)) if(ismob(A))
var/mob/M = A var/mob/M = A
if(client_check && !M.client) 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 continue
if(sight_check && !isInSight(A, O)) if(sight_check && !isInSight(A, O))
continue continue
L |= M L |= M
//world.log << "[recursion_limit] = [M] - [get_turf(M)] - ([M.x], [M.y], [M.z])" //world.log << "[recursion_limit] = [M] - [get_turf(M)] - ([M.x], [M.y], [M.z])"
else if(include_radio && istype(A, /obj/item/device/radio)) else if(include_radio && istype(A, /obj/item/device/radio))
if(sight_check && !isInSight(A, O)) if(sight_check && !isInSight(A, O))
continue continue
L |= A L |= 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)
@@ -188,6 +188,11 @@
for(var/atom/movable/A in range) for(var/atom/movable/A in range)
if(ismob(A)) if(ismob(A))
var/mob/M = A var/mob/M = A
if (istype(A, /mob/dead))
listeners += M
continue
listeners |= M listeners |= M
listeners = recursive_mob_check(A, listeners, 3, 1, 0, 1) listeners = recursive_mob_check(A, listeners, 3, 1, 0, 1)
else if(istype(A, /obj/item/device/radio)) else if(istype(A, /obj/item/device/radio))