Skip to content

Commit

Permalink
fix(commanded): fixed bugs in simple_animal/hostile/commanded
Browse files Browse the repository at this point in the history
PR #10800
fixes #10796
- Теперь медведи мага должны корректно атаковать цели.
  • Loading branch information
Filatelele authored Oct 30, 2023
1 parent 6c9f239 commit 5dea49d
Showing 1 changed file with 8 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,13 @@
continue
if(isliving(A))
M = A
if(istype(A,/obj/mecha))
else if(istype(A,/obj/mecha))
var/obj/mecha/mecha = A
if(!mecha.occupant)
continue
M = mecha.occupant
else // If it is not living and not /obj/mecha/, then we have something strange going on.
continue
if(M && M.stat)
continue
if(mode == "specific")
Expand Down Expand Up @@ -190,3 +192,8 @@
stance = HOSTILE_STANCE_ATTACK
if(weakref(M) in friends)
friends -= weakref(M)

/mob/living/simple_animal/hostile/commanded/AttackingTarget()
if(!client && target_mob == master) // we don't want mob attacking its master
return
. = ..()

0 comments on commit 5dea49d

Please sign in to comment.