From 37a83ed51156d71840decfe270e866d9ed13074e Mon Sep 17 00:00:00 2001 From: Emmett Gaines Date: Mon, 13 Jan 2020 17:59:30 -0500 Subject: [PATCH] Fixes hierophant barrier and blob structures allowing things through (#48746) --- code/modules/antagonists/blob/structures/_blob.dm | 4 ++-- .../living/simple_animal/hostile/megafauna/hierophant.dm | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/antagonists/blob/structures/_blob.dm b/code/modules/antagonists/blob/structures/_blob.dm index 1fb738d9ee1..cc238587560 100644 --- a/code/modules/antagonists/blob/structures/_blob.dm +++ b/code/modules/antagonists/blob/structures/_blob.dm @@ -69,8 +69,8 @@ /obj/structure/blob/CanAllowThrough(atom/movable/mover, turf/target) . = ..() - if(istype(mover) && (mover.pass_flags & PASSBLOB)) - return TRUE + if(!(mover.pass_flags & PASSBLOB)) + return FALSE /obj/structure/blob/CanAtmosPass(turf/T) return !atmosblock 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 acfd0ed3db4..119bea757df 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -533,13 +533,13 @@ Difficulty: Hard if(QDELETED(caster)) return FALSE if(mover == caster.pulledby) - return TRUE + return if(istype(mover, /obj/projectile)) var/obj/projectile/P = mover if(P.firer == caster) - return TRUE - if(mover == caster) - return TRUE + return + if(mover != caster) + return FALSE /obj/effect/temp_visual/hierophant/chaser //a hierophant's chaser. follows target around, moving and producing a blast every speed deciseconds. duration = 98