From 7a6db8ba46addeb56f8a8119e4a0835e493564f6 Mon Sep 17 00:00:00 2001 From: ToasterBiome Date: Tue, 30 Aug 2022 21:15:44 -0500 Subject: [PATCH 1/2] Update drake.dm --- .../mob/living/simple_animal/hostile/megafauna/drake.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index 7f37d3259c0d..e955cdc159c7 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -277,6 +277,9 @@ Difficulty: Medium for(var/turf/T in turfs) if(istype(T, /turf/closed)) break + var/obj/effect/hotspot/hot_hot_there_is_already_fire_here_why_would_you_make_more = locate() in T + if(hot_hot_there_is_already_fire_here_why_would_you_make_more) + continue new /obj/effect/hotspot(T) T.hotspot_expose(700,50,1) for(var/mob/living/L in T.contents) From 1f3a1fba127426966a1350279a5d3ec58322fb25 Mon Sep 17 00:00:00 2001 From: ToasterBiome Date: Tue, 30 Aug 2022 21:18:46 -0500 Subject: [PATCH 2/2] Update drake.dm --- .../simple_animal/hostile/megafauna/drake.dm | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index e955cdc159c7..2795fe90e5d2 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -278,23 +278,22 @@ Difficulty: Medium if(istype(T, /turf/closed)) break var/obj/effect/hotspot/hot_hot_there_is_already_fire_here_why_would_you_make_more = locate() in T - if(hot_hot_there_is_already_fire_here_why_would_you_make_more) - continue - new /obj/effect/hotspot(T) - T.hotspot_expose(700,50,1) - for(var/mob/living/L in T.contents) - if(L in hit_list || L == source) - continue - hit_list += L - L.adjustFireLoss(30) - to_chat(L, span_userdanger("You're hit by [source]'s fire breath!")) - - // deals damage to mechs - for(var/obj/mecha/M in T.contents) - if(M in hit_list) - continue - hit_list += M - M.take_damage(45, BRUTE, MELEE, 1) + if(!hot_hot_there_is_already_fire_here_why_would_you_make_more) + new /obj/effect/hotspot(T) + T.hotspot_expose(700,50,1) + for(var/mob/living/L in T.contents) + if(L in hit_list || L == source) + continue + hit_list += L + L.adjustFireLoss(30) + to_chat(L, span_userdanger("You're hit by [source]'s fire breath!")) + + // deals damage to mechs + for(var/obj/mecha/M in T.contents) + if(M in hit_list) + continue + hit_list += M + M.take_damage(45, BRUTE, MELEE, 1) sleep(0.15 SECONDS) /mob/living/simple_animal/hostile/megafauna/dragon/proc/swoop_attack(lava_arena = FALSE, atom/movable/manual_target, var/swoop_cooldown = 30)