Skip to content

Commit

Permalink
Fixes corgis backsliding off the screen when attacking trees.
Browse files Browse the repository at this point in the history
  • Loading branch information
MistakeNot4892 authored and comma committed Sep 26, 2024
1 parent 287e4be commit 4b53c37
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
3 changes: 3 additions & 0 deletions code/_onclick/click.dm
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,9 @@
if(check_dexterity(DEXTERITY_HOLD_ITEM, silent = TRUE))
return A.attack_hand(src)

// TODO: some way to check if we SHOULD be doing an attack windup here;
// corgis attacking a tree, for example, will do the windup animation despite
// having no interaction or message shown at the end of it.
// AI driven mobs have a melee telegraph that needs to be handled here.
if(a_intent == I_HURT && istype(A) && !do_attack_windup_checking(A))
return TRUE
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/living.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1836,6 +1836,7 @@ default behaviour is:
reset_offsets(anim_time = 2)
return FALSE

reset_offsets(anim_time = 2)
return TRUE

/mob/living/proc/prepare_for_despawn()
Expand Down

0 comments on commit 4b53c37

Please sign in to comment.