cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 12:35:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Protects blob structures against bolts of animation [MDB IGNORE] (#9364)

Browse Source 
* 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>
This commit is contained in:
SkyratBot
2021-11-10 15:32:28 +00:00
committed by GitHub
parent 2550e48d1f
commit 4881c080bb
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/hostile/mimic.dm
+3 -2
View File
@@ -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
code/modules/projectiles/projectile/magic.dm
+1 -1
View File
@@ -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)