From 9c08df761fe91e89603ff54d85602b9f49b0687c Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 7 May 2020 11:50:38 -0700 Subject: [PATCH] fixes --- code/modules/mob/living/living_active_block.dm | 3 ++- code/modules/mob/living/living_block.dm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/living_active_block.dm b/code/modules/mob/living/living_active_block.dm index 53e292a32f..1a157ad72d 100644 --- a/code/modules/mob/living/living_active_block.dm +++ b/code/modules/mob/living/living_active_block.dm @@ -235,9 +235,10 @@ * * @params * * our_dir - our direction. - * * their_dir - their direction. Must be a single direction, or NONE for an attack from the same tile. + * * their_dir - their direction. Must be a single direction, or NONE for an attack from the same tile. This is incoming direction. */ /obj/item/proc/can_block_direction(our_dir, their_dir) + their_dir = turn(their_dir, 180) if(our_dir != NORTH) var/turn_angle = dir2angle(our_dir) // dir2angle(), ss13 proc is clockwise so dir2angle(EAST) == 90 diff --git a/code/modules/mob/living/living_block.dm b/code/modules/mob/living/living_block.dm index a4454c3cdc..c0f2bc809d 100644 --- a/code/modules/mob/living/living_block.dm +++ b/code/modules/mob/living/living_block.dm @@ -33,7 +33,7 @@ if((. & BLOCK_SUCCESS) && !(. & BLOCK_CONTINUE_CHAIN)) return var/list/obj/item/tocheck = get_blocking_items() - sortTim(tocheck, /proc/cmp_numeric_asc, TRUE) + sortTim(tocheck, /proc/cmp_numeric_dsc, TRUE) // i don't like this var/block_chance_modifier = round(damage / -3) if(real_attack)