From b7c3815023af21d60d9b79acf492a9c7c0415bc4 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Sat, 30 Jul 2016 16:07:09 -0400 Subject: [PATCH] Bubblegum's blood spray and Drake fire breath now stop on solid turfs --- .../mob/living/simple_animal/hostile/megafauna/bubblegum.dm | 4 ++-- .../mob/living/simple_animal/hostile/megafauna/dragon.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index db3fb4e07bb..72d78d1a468 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -174,8 +174,8 @@ Difficulty: Hard spawn(0) var/turf/E = get_edge_target_turf(src, src.dir) var/range = 10 - for(var/turf/open/J in getline(src,E)) - if(!range) + for(var/turf/J in getline(src,E)) + if(!range || J.density) break playsound(J,'sound/effects/splat.ogg', 100, 1, -1) new /obj/effect/decal/cleanable/blood(J) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm index a8b8f8ad6ef..e29d58dabf5 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm @@ -177,8 +177,8 @@ Difficulty: Medium /mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_wall(d) var/turf/E = get_edge_target_turf(src, d) var/range = 10 - for(var/turf/open/J in getline(src,E)) - if(!range) + for(var/turf/J in getline(src,E)) + if(!range || J.density) break range-- PoolOrNew(/obj/effect/hotspot,J)