From 7b15c3f60b35f1fe5d5896e78c88e6bb3122874b Mon Sep 17 00:00:00 2001 From: DGamerL <108773801+DGamerL@users.noreply.github.com> Date: Sat, 30 Sep 2023 14:26:10 +0200 Subject: [PATCH] Fixes projectiles passing through the Desecrated Duel arena (#22588) * Fixy fixy * Make it not affect lavaland elites * Update code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> --------- Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> --- .../antagonists/vampire/vampire_powers/gargantua_powers.dm | 2 +- .../mob/living/simple_animal/hostile/mining/elites/elite.dm | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm b/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm index bc09d51b8c5..336ddf3ef7d 100644 --- a/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm +++ b/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm @@ -271,7 +271,7 @@ /obj/effect/proc_holder/spell/vampire/arena/proc/arena_trap(turf/target_turf) for(var/tumor_range_turfs in circle_edge_turfs(target_turf, ARENA_SIZE)) - tumor_range_turfs = new /obj/effect/temp_visual/elite_tumor_wall(tumor_range_turfs, src) + tumor_range_turfs = new /obj/effect/temp_visual/elite_tumor_wall/gargantua(tumor_range_turfs, src) all_temp_walls += tumor_range_turfs /obj/effect/proc_holder/spell/vampire/arena/proc/fighters_check(mob/living/user) diff --git a/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm index 5535c33af11..78f5321413f 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm @@ -473,6 +473,11 @@ While using this makes the system rely on OnFire, it still gives options for tim if(isliving(mover)) return FALSE +/obj/effect/temp_visual/elite_tumor_wall/gargantua/CanPass(atom/movable/mover, border_dir) + . = ..() + if(istype(mover, /obj/item/projectile)) + return FALSE + /obj/item/gps/internal/tumor icon_state = null gpstag = "Cancerous Signal"