From af137debfbae7f627c839b0bad83632c3ebc5a37 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Mon, 26 Sep 2016 02:44:38 -0400 Subject: [PATCH] Fixes drakes not throwing people clear when they swoop into them (#20665) * Fixes drakes not throwing people clear when they swoop into them * how do i fuck up spans without yooooooou --- .../mob/living/simple_animal/hostile/megafauna/dragon.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 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 ff9e3ab67ca..cfeb0a19e9d 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm @@ -229,8 +229,11 @@ Difficulty: Medium else L.adjustBruteLoss(75) if(L && !qdeleted(L)) // Some mobs are deleted on death - var/throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(L, src))) - L.throw_at_fast(throwtarget) + var/throw_dir = get_dir(src, L) + if(L.loc == loc) + throw_dir = pick(alldirs) + var/throwtarget = get_edge_target_turf(src, throw_dir) + L.throw_at_fast(throwtarget, 3) visible_message("[L] is thrown clear of [src]!") for(var/mob/M in range(7, src)) @@ -244,7 +247,7 @@ Difficulty: Medium if(!istype(A)) return if(swoop_cooldown >= world.time) - src << "You need to wait 20 seconds between swoop attacks!M/span>" + src << "You need to wait 20 seconds between swoop attacks!" return swoop_attack(1, A)