From 0445fb4996ff5371df655d0f2a576e416989da4b Mon Sep 17 00:00:00 2001 From: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com> Date: Sun, 8 Mar 2020 13:48:57 -0400 Subject: [PATCH] Cats cannot catch pray smarter than them. (#49609) * Cats cannot catch pray smarter than them. * hey, at least I added a cooldown to the emote this time. * Classic cat n mouse * Sorry, I can't glean a complete thought through one emoji. * Damnit. * Longer var name --- code/modules/mob/living/simple_animal/friendly/cat.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index 4f1f0fadd57..0930d59cb44 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -32,6 +32,8 @@ response_harm_simple = "kick" var/turns_since_scan = 0 var/mob/living/simple_animal/mouse/movement_target + ///Limits how often cats can spam chasing mice. + var/emote_cooldown = 0 gold_core_spawnable = FRIENDLY_SPAWN collar_type = "cat" can_be_held = TRUE @@ -198,6 +200,12 @@ if((src.loc) && isturf(src.loc)) if(!stat && !resting && !buckled) for(var/mob/living/simple_animal/mouse/M in view(1,src)) + if(istype(M, /mob/living/simple_animal/mouse/brown/Tom) && (name == "Jerry")) //Turns out there's no jerry subtype. + if (emote_cooldown < (world.time - 600)) + visible_message("[src] chases [M] around, to no avail!") + step(M, pick(GLOB.cardinals)) + emote_cooldown = world.time + break if(!M.stat && Adjacent(M)) emote("me", 1, "splats \the [M]!") M.splat()