Fixes bloodbath effects not working on people in crit (#36598)

Also some minor improvements to performance by caching the nearby mobs list once
This commit is contained in:
kevinz000
2018-04-03 17:08:52 -07:00
committed by CitadelStationBot
parent 5dddb2db45
commit 4fb2e612df
3 changed files with 12 additions and 9 deletions
+4 -1
View File
@@ -471,10 +471,13 @@ GLOBAL_LIST_INIT(hallucinations_major, list(
var/image/A = null
var/kind = force_kind ? force_kind : pick("monkey","corgi","carp","skeleton","demon","zombie")
feedback_details += "Type: [kind]"
var/list/nearby
if(skip_nearby)
nearby = get_hearers_in_view(7, target)
for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
if(H == target)
continue
if(skip_nearby && (H in view(target)))
if(skip_nearby && (H in nearby))
continue
switch(kind)
if("monkey")//Monkey