From 62f633a1ad028e0e977127cbc9467c12e3426b13 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <CitadelStationBot>
Date: Wed, 19 Jul 2017 11:19:35 -0500
Subject: [PATCH] Drakes dying during the brief part of the swoop where they
 can be damaged will properly reset transform and alpha

---
 .../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 b68e2eef66..43c9197edc 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
@@ -191,7 +191,9 @@ Difficulty: Medium
 		sleep(1)
 		if(QDELETED(src) || stat == DEAD) //we got hit and died, rip us
 			qdel(F)
-			swooping &= ~SWOOP_DAMAGEABLE
+			if(stat == DEAD)
+				swooping &= ~SWOOP_DAMAGEABLE
+				animate(src, alpha = 255, transform = oldtransform, time = 0, flags = ANIMATION_END_NOW) //reset immediately
 			return
 	animate(src, alpha = 100, transform = matrix()*0.7, time = 7)
 	swooping |= SWOOP_INVULNERABLE