diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index 9b3bc55fca..be68db8d01 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -26,6 +26,7 @@ /datum/block_parry_data/shield block_stamina_efficiency = 1.5 block_stamina_cost_per_second = 3 + block_start_delay = 3 /obj/item/shield/examine(mob/user) . = ..() diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm index 108dd789c9..a6da43c63f 100644 --- a/code/modules/mob/living/living_movement.dm +++ b/code/modules/mob/living/living_movement.dm @@ -5,9 +5,14 @@ clear_typing_indicator() update_pixel_shifting(TRUE) +/mob/living/setDir(newdir, ismousemovement) + . = ..() + if(ismousemovement) + update_pixel_shifting() + /mob/living/proc/update_pixel_shifting(moved = FALSE) if(active_blocking) - animate(src, pixel_x = get_standard_pixel_x_offset(), pixel_y = get_standard_pixel_y_offset(), time = 1.5, flags = ANIMATION_END_NOW) + animate(src, pixel_x = get_standard_pixel_x_offset(), pixel_y = get_standard_pixel_y_offset(), time = 2.5, flags = ANIMATION_END_NOW) else if(moved) if(is_shifted) is_shifted = FALSE