Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TG Mirror] Simplemob AttackingTarget Fix [MDB IGNORE] #39

Closed
wants to merge 1 commit into from
Closed

[TG Mirror] Simplemob AttackingTarget Fix [MDB IGNORE] #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions code/_onclick/other_mobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,10 +311,14 @@

/mob/living/simple_animal/hostile/resolve_unarmed_attack(atom/attack_target, list/modifiers)
GiveTarget(attack_target)
<<<<<<< HEAD

Check failure on line 314 in code/_onclick/other_mobs.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

got '<<', expected one of: newline, '/', identifier
if(dextrous && (isitem(attack_target) || !combat_mode))
return ..()
else
INVOKE_ASYNC(src, PROC_REF(AttackingTarget), attack_target)
=======
INVOKE_ASYNC(src, PROC_REF(AttackingTarget), attack_target)
>>>>>>> f110ae0c20d ([MIRROR] Simplemob AttackingTarget Fix [MDB IGNORE] (#24314))

#undef LIVING_UNARMED_ATTACK_BLOCKED

Expand Down
Loading