diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index 19acdc0306..a71360d4bf 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -49,13 +49,20 @@ if (turns_since_scan > 5) walk_to(src,0) turns_since_scan = 0 - + if (flee_target) //fleeing takes precendence handle_flee_target() else handle_movement_target() -/mob/living/simple_animal/cat/proc/handle_movement_target() + if(prob(2)) //spooky + var/mob/dead/observer/spook = locate() in range(src,5) + if(spook) + var/turf/T = spook.loc + var/obj/O = pick(T.contents) + visible_emote("suddenly stops and stares at something unseen[istype(O) ? " near [O]":""].") + +/mob/living/simple_animal/cat/proc/handle_movement_target() //if our target is neither inside a turf or inside a human(???), stop if((movement_target) && !(isturf(movement_target.loc) || ishuman(movement_target.loc) )) movement_target = null @@ -68,7 +75,7 @@ if(isturf(snack.loc) && !snack.stat) movement_target = snack break - + if(movement_target) stop_automated_movement = 1 walk_to(src,movement_target,0,3) @@ -106,10 +113,10 @@ /mob/living/simple_animal/cat/bullet_act(var/obj/item/projectile/proj) . = ..() set_flee_target(proj.firer? proj.firer : src.loc) - + /mob/living/simple_animal/cat/hitby(atom/movable/AM) . = ..() - set_flee_target(AM.thrower? AM.thrower : src.loc) + set_flee_target(AM.thrower? AM.thrower : src.loc) /mob/living/simple_animal/cat/MouseDrop(atom/over_object) @@ -193,7 +200,7 @@ set_dir(get_dir(src, friend)) say("Meow!") return - + if (!(ishuman(usr) && befriend_job && usr.job == befriend_job)) usr << "[src] ignores you." return @@ -223,4 +230,4 @@ /mob/living/simple_animal/cat/kitten/New() gender = pick(MALE, FEMALE) - ..() + ..()