From 9775b8cdcc07fbf71e4bde1e9487ba32c12800a0 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Mon, 2 May 2016 21:44:11 -0500 Subject: [PATCH 1/3] Dragon Fixes --- .../mob/living/simple_animal/hostile/megafauna/dragon.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 b974e92b49b..3dc1d3747c8 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm @@ -87,7 +87,7 @@ else fire_rain() - else if(prob(10+anger_modifier) && !client) + else if(prob(10+anger_modifier) && !client && !swooping) if(health > maxHealth/2) swoop_attack() else @@ -150,6 +150,8 @@ sleep(10) playsound(src, 'sound/effects/meteorimpact.ogg', 200, 1) for(var/mob/living/L in range(1,tturf)) + if(L == src) + continue if(L.stat) visible_message("[src] slams down on [L], crushing them!") L.gib() From 11fa336dd989a108709013997797c9c6d0c6c843 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Tue, 3 May 2016 00:10:39 -0500 Subject: [PATCH 2/3] Ghost sword fix --- .../mob/living/simple_animal/hostile/megafauna/dragon.dm | 2 ++ 1 file changed, 2 insertions(+) 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 3dc1d3747c8..5fd9a2b8541 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm @@ -192,7 +192,9 @@ /obj/item/weapon/melee/ghost_sword/attack_self(mob/user) if(summon_cooldown > world.time) + user << "You just recently called out for aid. You don't want to annoy the spirits." return + user << "You call out for aid, attempting to summon spirits to your side." notify_ghosts("[user] is raising their [src], calling for your help!", source = user) summon_cooldown = world.time + 600 From 6e10a6a8391d2c4f145b18685e0fe64e879d760a Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Tue, 3 May 2016 11:46:09 -0500 Subject: [PATCH 3/3] Stronger Attack --- .../mob/living/simple_animal/hostile/megafauna/dragon.dm | 4 ++++ 1 file changed, 4 insertions(+) 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 5fd9a2b8541..bc353b8d86e 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm @@ -121,6 +121,10 @@ 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!" /mob/living/simple_animal/hostile/megafauna/dragon/proc/swoop_attack(fire_rain = 0) if(stat)