From f22286e0738f64d9a1f2fb73c3e02c14417aee1e Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Thu, 8 Sep 2016 08:57:15 -0400 Subject: [PATCH] Fixes drake fire breath multihitting --- .../mob/living/simple_animal/hostile/megafauna/dragon.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 0da855f44da..3c4cead1d89 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm @@ -166,6 +166,7 @@ Difficulty: Medium addtimer(src, "fire_wall", 0, FALSE, d) /mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_wall(dir) + var/list/hit_things = list(src) var/turf/E = get_edge_target_turf(src, dir) var/range = 10 var/turf/previousturf = get_turf(src) @@ -175,10 +176,10 @@ Difficulty: Medium range-- PoolOrNew(/obj/effect/hotspot,J) J.hotspot_expose(700,50,1) - for(var/mob/living/L in J) - if(L != src) - L.adjustFireLoss(20) - L << "You're hit by the drake's fire breath!" + for(var/mob/living/L in J.contents - hit_things) + L.adjustFireLoss(20) + L << "You're hit by the drake's fire breath!" + hit_things += L previousturf = J sleep(1)