cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes a rare interaction between mice by assigning a proper subtype. (#1156)

Browse Source 
* 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>
This commit is contained in:
SkyratBot
2020-10-04 23:37:51 +02:00
committed by GitHub
co-authored by ArcaneMusic
parent f6e48d1cac
commit b1d52422be
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/friendly/cat.dm
+8 -1
View File
@@ -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("<span class='warning'>[src] chases [M] around, to no avail!</span>")
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."