From 0bf752b6d7204fdaf29ce031902fd7686a084329 Mon Sep 17 00:00:00 2001 From: cybercapitalism <98280110+cybercapitalism@users.noreply.github.com> Date: Sun, 10 Mar 2024 13:04:49 -0500 Subject: [PATCH] Makes weeping angel blindness not affect other angels (#24385) * convert weeping angel blindness spell from aoe * Revert "convert weeping angel blindness spell from aoe" This reverts commit 971a5f4d5452d2c002984de1a892fbfff0c61ca9. * keeping aoe is a better idea * contra review * user is always excluded from targeting list, so checking again isn't needed --- .../living/simple_animal/hostile/angel_statue.dm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/angel_statue.dm b/code/modules/mob/living/simple_animal/hostile/angel_statue.dm index 9ad6a092150..f112f410254 100644 --- a/code/modules/mob/living/simple_animal/hostile/angel_statue.dm +++ b/code/modules/mob/living/simple_animal/hostile/angel_statue.dm @@ -189,18 +189,16 @@ aoe_range = 10 /obj/effect/proc_holder/spell/aoe/blindness/create_new_targeting() - var/datum/spell_targeting/aoe/turf/targeting = new() + var/datum/spell_targeting/aoe/targeting = new() targeting.range = aoe_range + targeting.allowed_type = /mob/living return targeting /obj/effect/proc_holder/spell/aoe/blindness/cast(list/targets, mob/user = usr) - for(var/mob/living/L in GLOB.alive_mob_list) - if(L == user) + for(var/mob/living/L in targets) + if(istype(L, /mob/living/simple_animal/hostile/statue)) continue - var/turf/T = get_turf(L.loc) - if(T && (T in targets)) - L.EyeBlind(8 SECONDS) - return + L.EyeBlind(8 SECONDS) /mob/living/simple_animal/hostile/statue/sentience_act() faction -= "neutral" @@ -208,4 +206,4 @@ /mob/living/simple_animal/hostile/statue/restrained() . = ..() if(can_be_seen(loc)) - return 1 + return TRUE