From 3b9e914f32ff563d1e593d8359c2865f7f97f09b Mon Sep 17 00:00:00 2001 From: "Kortgstation@gmail.com" Date: Wed, 19 Sep 2012 05:55:08 +0000 Subject: [PATCH] Clown and carp are faster now so they can actually catch their targets. Camera lists don't include mobs on away missions. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4727 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/camera/tracking.dm | 2 ++ code/modules/mob/living/simple_animal/carp.dm | 2 +- code/modules/mob/living/simple_animal/clown.dm | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index fb3a6f575c..8df77e1670 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -25,6 +25,8 @@ // Don't detect mobs on Centcom. Since the wizard den is on Centcomm, we only need this. if(M.loc.z == 2) continue + if(M.loc.z > 6) + continue if(M == usr) continue if(M.invisibility)//cloaked diff --git a/code/modules/mob/living/simple_animal/carp.dm b/code/modules/mob/living/simple_animal/carp.dm index 3c74cfe3b7..9615891b54 100644 --- a/code/modules/mob/living/simple_animal/carp.dm +++ b/code/modules/mob/living/simple_animal/carp.dm @@ -15,7 +15,7 @@ response_help = "pets the" response_disarm = "gently pushes aside the" response_harm = "hits the" - + speed = -1 stop_automated_movement_when_pulled = 0 maxHealth = 25 health = 25 diff --git a/code/modules/mob/living/simple_animal/clown.dm b/code/modules/mob/living/simple_animal/clown.dm index fa950d7a3d..bdd86885d8 100644 --- a/code/modules/mob/living/simple_animal/clown.dm +++ b/code/modules/mob/living/simple_animal/clown.dm @@ -21,7 +21,7 @@ stop_automated_movement_when_pulled = 0 maxHealth = 75 health = 75 - + speed = -1 harm_intent_damage = 8 melee_damage_lower = 10 melee_damage_upper = 10 @@ -105,7 +105,7 @@ L.attack_animal(src) if(prob(10)) L.Weaken(5) - L.visible_message("\the [src] knocks down \the [L]!") + L.visible_message("\the [src] slips \the [L]!") for(var/mob/M in viewers(src, null)) if(istype(M, /mob/living/simple_animal/clown)) var/mob/living/simple_animal/clown/C = M