Merge pull request #6362 from Mechoid/EventTweaks

Event Tweaks / Fixes
This commit is contained in:
Atermonera
2019-08-06 10:53:19 -08:00
committed by VirgoBot
parent b8023b27a0
commit 7939362cea
16 changed files with 74 additions and 58 deletions

View File

@@ -11,11 +11,13 @@
num++
return num
/datum/metric/proc/count_all_space_mobs(var/cutoff = 75)
/datum/metric/proc/count_all_space_mobs(var/cutoff = 75, var/respect_z = TRUE)
var/num = 0
for(var/mob/living/L in player_list)
var/turf/T = get_turf(L)
if(istype(T, /turf/space))
if(istype(T, /turf/space) && istype(T.loc, /area/space))
if(respect_z && !(L.z in using_map.station_levels))
continue
if(assess_player_activity(L) >= cutoff)
num++
return num