From 70744ef1714d06016e37f010b192fb8853a9759a Mon Sep 17 00:00:00 2001 From: Seris02 <49109742+Seris02@users.noreply.github.com> Date: Sun, 29 Dec 2019 00:19:19 +0800 Subject: [PATCH] ah --- .../living/simple_animal/hostile/megafauna/hierophant.dm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index d8e281e73b..bacd340958 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -601,9 +601,8 @@ Difficulty: Normal if(only_hit_once) hit_things = only_hit_once friendly_fire_check = friendly_fire - if (!donthurt) - donthurt = list() - nohurt = donthurt + if(donthurt) + hit_things += donthurt if(new_caster) hit_things += new_caster if(ismineralturf(loc)) //drill mineral turfs @@ -631,8 +630,6 @@ Difficulty: Normal if(!damage) return for(var/mob/living/L in T.contents - hit_things) //find and damage mobs... - if (L in nohurt) - continue hit_things += L if((friendly_fire_check && caster && caster.faction_check_mob(L)) || L.stat == DEAD) continue