From 7ca6c282f3e0c1621af61e8cb353c879ed8094f1 Mon Sep 17 00:00:00 2001 From: Jordie Date: Mon, 20 Nov 2017 15:28:46 +1100 Subject: [PATCH 1/2] Merge pull request #32883 from vuonojenmustaturska/tendrilqdel Fixes tendril-related things failing to qdel because of chasm shenanigans --- code/game/turfs/simulated/chasm.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/turfs/simulated/chasm.dm b/code/game/turfs/simulated/chasm.dm index 74150c6433..2411e7757e 100644 --- a/code/game/turfs/simulated/chasm.dm +++ b/code/game/turfs/simulated/chasm.dm @@ -11,7 +11,7 @@ canSmoothWith = list(/turf/open/floor/fakepit, /turf/open/chasm) density = TRUE //This will prevent hostile mobs from pathing into chasms, while the canpass override will still let it function like an open turf var/static/list/falling_atoms = list() //Atoms currently falling into the chasm - var/static/list/forbidden_types = typecacheof(list(/obj/effect/portal, /obj/singularity, /obj/structure/stone_tile, /obj/item/projectile, /obj/effect/abstract, /obj/effect/temp_visual)) + var/static/list/forbidden_types = typecacheof(list(/obj/effect/portal, /obj/singularity, /obj/structure/stone_tile, /obj/item/projectile, /obj/effect/abstract, /obj/effect/temp_visual, /obj/effect/light_emitter/tendril, /obj/effect/collapse)) var/drop_x = 1 var/drop_y = 1 var/drop_z = 1