cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clown and carp are faster now so they can actually catch their targets.

Browse Source 
Camera lists don't include mobs on away missions.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4727 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
Kortgstation@gmail.com
2012-09-19 05:55:08 +00:00
parent 37b1c2f381
commit 3b9e914f32
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/camera/tracking.dm
View File

@@ -25,6 +25,8 @@
// Don't detect mobs on Centcom. Since the wizard den is on Centcomm, we only need this. // Don't detect mobs on Centcom. Since the wizard den is on Centcomm, we only need this.
if(M.loc.z == 2) if(M.loc.z == 2)
continue continue
if(M.loc.z > 6)
continue
if(M == usr) if(M == usr)
continue continue
if(M.invisibility)//cloaked if(M.invisibility)//cloaked

2
code/modules/mob/living/simple_animal/carp.dm
View File

@@ -15,7 +15,7 @@
response_help = "pets the" response_help = "pets the"
response_disarm = "gently pushes aside the" response_disarm = "gently pushes aside the"
response_harm = "hits the" response_harm = "hits the"
speed = -1
stop_automated_movement_when_pulled = 0 stop_automated_movement_when_pulled = 0
maxHealth = 25 maxHealth = 25
health = 25 health = 25

4
code/modules/mob/living/simple_animal/clown.dm
View File

@@ -21,7 +21,7 @@
stop_automated_movement_when_pulled = 0 stop_automated_movement_when_pulled = 0
maxHealth = 75 maxHealth = 75
health = 75 health = 75
speed = -1
harm_intent_damage = 8 harm_intent_damage = 8
melee_damage_lower = 10 melee_damage_lower = 10
melee_damage_upper = 10 melee_damage_upper = 10
@@ -105,7 +105,7 @@
L.attack_animal(src) L.attack_animal(src)
if(prob(10)) if(prob(10))
L.Weaken(5) L.Weaken(5)
L.visible_message("<span class='danger'>\the [src] knocks down \the [L]!</span>") L.visible_message("<span class='danger'>\the [src] slips \the [L]!</span>")
for(var/mob/M in viewers(src, null)) for(var/mob/M in viewers(src, null))
if(istype(M, /mob/living/simple_animal/clown)) if(istype(M, /mob/living/simple_animal/clown))
var/mob/living/simple_animal/clown/C = M var/mob/living/simple_animal/clown/C = M