mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 03:27:05 +01:00
[FIX] Dead cats no longer chase mice (#26826)
* Dead cats no longer follow mice * Also stop chasing if the mouse is already dead * No reason for these to not just be walk * Update code/modules/mob/living/simple_animal/friendly/cat.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Adrer <erwin@lombok.demon.nl> * Update code/modules/mob/living/simple_animal/friendly/cat.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Adrer <erwin@lombok.demon.nl> --------- Signed-off-by: Adrer <erwin@lombok.demon.nl> Co-authored-by: adrermail@gmail.com <adrermail@gmail.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
co-authored by
Luc
DGamerL
adrermail@gmail.com <adrermail@gmail.com>
parent
cca2b52e8d
commit
a8668cce00
@@ -142,6 +142,7 @@
|
||||
M.death()
|
||||
M.splat()
|
||||
movement_target = null
|
||||
walk(src, 0)
|
||||
stop_automated_movement = FALSE
|
||||
break
|
||||
for(var/obj/item/toy/cattoy/T in view(1, src))
|
||||
@@ -156,7 +157,7 @@
|
||||
|
||||
turns_since_scan++
|
||||
if(turns_since_scan > 5)
|
||||
walk_to(src,0)
|
||||
walk(src, 0)
|
||||
turns_since_scan = 0
|
||||
if((movement_target) && !(isturf(movement_target.loc) || ishuman(movement_target.loc)))
|
||||
movement_target = null
|
||||
@@ -164,13 +165,14 @@
|
||||
if(!movement_target || !(movement_target.loc in oview(src, 3)))
|
||||
movement_target = null
|
||||
stop_automated_movement = FALSE
|
||||
walk(src, 0)
|
||||
for(var/mob/living/simple_animal/mouse/snack in oview(src,3))
|
||||
if(isturf(snack.loc) && !snack.stat)
|
||||
movement_target = snack
|
||||
break
|
||||
if(movement_target)
|
||||
stop_automated_movement = TRUE
|
||||
walk_to(src,movement_target,0,3)
|
||||
walk(src, movement_target, 0, 3)
|
||||
|
||||
/mob/living/simple_animal/pet/cat/Proc
|
||||
name = "Proc"
|
||||
|
||||
@@ -365,6 +365,7 @@
|
||||
if(!.)
|
||||
return FALSE
|
||||
flying = FALSE
|
||||
walk(src, 0)
|
||||
if(nest)
|
||||
nest.spawned_mobs -= src
|
||||
nest = null
|
||||
|
||||
Reference in New Issue
Block a user