From 4881c080bb4f85b7f5293c8d2a65e0b566dd154f Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 10 Nov 2021 15:32:28 +0000 Subject: [PATCH] [MIRROR] Protects blob structures against bolts of animation [MDB IGNORE] (#9364) * Protects blob structures against bolt of animation (#62690) * Protects blob structures against bolts of animation Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/modules/mob/living/simple_animal/hostile/mimic.dm | 5 +++-- code/modules/projectiles/projectile/magic.dm | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index 596e21a6b26..b0512edbe15 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -98,7 +98,8 @@ O.forceMove(C) ..() -GLOBAL_LIST_INIT(protected_objects, list(/obj/structure/table, /obj/structure/cable, /obj/structure/window)) +/// Mimics can't be made out of these objects +GLOBAL_LIST_INIT(mimic_blacklist, list(/obj/structure/table, /obj/structure/cable, /obj/structure/window, /obj/structure/blob)) /mob/living/simple_animal/hostile/mimic/copy health = 100 @@ -142,7 +143,7 @@ GLOBAL_LIST_INIT(protected_objects, list(/obj/structure/table, /obj/structure/ca faction |= "[REF(owner)]" /mob/living/simple_animal/hostile/mimic/copy/proc/CheckObject(obj/O) - if((isitem(O) || isstructure(O)) && !is_type_in_list(O, GLOB.protected_objects)) + if((isitem(O) || isstructure(O)) && !is_type_in_list(O, GLOB.mimic_blacklist)) return TRUE return FALSE diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index cd1bbdba9f4..67b076b1762 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -165,7 +165,7 @@ ..() /atom/proc/animate_atom_living(mob/living/owner = null) - if((isitem(src) || isstructure(src)) && !is_type_in_list(src, GLOB.protected_objects)) + if((isitem(src) || isstructure(src)) && !is_type_in_list(src, GLOB.mimic_blacklist)) if(istype(src, /obj/structure/statue/petrified)) var/obj/structure/statue/petrified/P = src if(P.petrified_mob)