mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 05:00:55 +01:00
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
This commit is contained in:
@@ -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("<span class='warning'>[src] chases [M] around, to no avail!</span>")
|
||||
step(M, pick(GLOB.cardinals))
|
||||
emote_cooldown = world.time
|
||||
break
|
||||
if(!M.stat && Adjacent(M))
|
||||
emote("me", 1, "splats \the [M]!")
|
||||
M.splat()
|
||||
|
||||
Reference in New Issue
Block a user