From b1d52422bea4caacaa6df684a340b8a7a6957e04 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 4 Oct 2020 23:37:51 +0200 Subject: [PATCH] [MIRROR] Fixes a rare interaction between mice by assigning a proper subtype. (#1156) * Fixes a rare interaction between mice by assigning a proper subtype. (#54157) * Fixes a rare interaction between mice by assigning a proper subtype. Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com> --- code/modules/mob/living/simple_animal/friendly/cat.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index a5b285ecfd8..6c84c10106b 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -34,6 +34,8 @@ var/mob/living/simple_animal/mouse/movement_target ///Limits how often cats can spam chasing mice. var/emote_cooldown = 0 + ///Can this cat catch special mice? + var/inept_hunter = FALSE gold_core_spawnable = FRIENDLY_SPAWN collar_type = "cat" can_be_held = TRUE @@ -221,7 +223,7 @@ 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(istype(M, /mob/living/simple_animal/mouse/brown/tom) && inept_hunter) if (emote_cooldown < (world.time - 600)) visible_message("[src] chases [M] around, to no avail!") step(M, pick(GLOB.cardinals)) @@ -261,6 +263,11 @@ stop_automated_movement = 1 walk_to(src,movement_target,0,3) +/mob/living/simple_animal/pet/cat/jerry //Holy shit we left jerry on donut ~ Arcane ~Fikou + name = "Jerry" + desc = "Tom is VERY amused." + inept_hunter = TRUE + /mob/living/simple_animal/pet/cat/cak //I told you I'd do it, Remie name = "Keeki" desc = "It's a cat made out of cake."