Skip to content

Commit

Permalink
no more push-bumping while dodging
Browse files Browse the repository at this point in the history
  • Loading branch information
Runian committed Oct 13, 2024
1 parent 63ab00c commit a39d7ad
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ GLOBAL_LIST_INIT(acid_spray_hit, typecacheof(list(/obj/structure/barricade, /obj
var/datum/action/bump_attack_toggle/bump_attack_action = xeno_owner.actions_by_path[/datum/action/bump_attack_toggle]
if(bump_attack_action == null || bump_attack_action.attacking) // Bump attacks are off if attacking is true, apparently.
return FALSE
if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_BUMP_ATTACK))
if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_BUMP_ATTACK) || xeno_owner.next_move > world.time)
return FALSE

var/turf/current_turf = get_turf(owner)
Expand Down

0 comments on commit a39d7ad

Please sign in to comment.