Updated space carp, walking mushrooms and killer tomatos to use simple_animal instead of critter code.

Notify me if any issues with them, or any simple_animal arise.

Fixed a few issues with space bears.

Slightly improved teleporter code, and did a few misc runtime fixes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4258 316c924e-a436-60f5-8080-3fe189b3f50e

code/modules/mob/living/simple_animal/bear.dm

@@ -2,16 +2,16 @@
 #define BEAR_STANCE_ALERT 2
 #define BEAR_STANCE_ATTACK 3
 #define BEAR_STANCE_ATTACKING 4
-#define BEAR_STANCE_TIRED 4
+#define BEAR_STANCE_TIRED 5
 
 //Space bears!
 /mob/living/simple_animal/bear
 	name = "space bear"
 	desc = "RawrRawr!!"
-	icon = 'icons/mob/mob.dmi'
-	icon_state = "bearspace"
-	icon_living = "bearspace"
-	icon_dead = "bear_d"
+	icon_state = "bear"
+	icon_living = "bear"
+	icon_dead = "bear_dead"
+	icon_gib = "bear_gib"
 	speak = list("RAWR!","Rawr!","GRR!","Growl!")
 	speak_emote = list("growls", "roars")
 	emote_hear = list("rawrs","grumbles","grawls")
@@ -25,6 +25,7 @@
 	response_harm   = "pokes the"
 
 	stop_automated_movement_when_pulled = 0
+	maxHealth = 60
 	health = 60
 
 	//Space bears aren't affected by atmos.
@@ -53,8 +54,8 @@
 	..()
 
 	if(!stat)
-		if( loc && istype(loc,/turf/space) )
-			icon_state = "bearspace"
+		if(loc && istype(loc,/turf/space))
+			icon_state = "bear"
 		else
 			icon_state = "bearfloor"
 
@@ -111,12 +112,12 @@
 					stance = BEAR_STANCE_ALERT
 					stance_step = 5 //Make it very alert, so it quickly attacks again if a mob returns
 					return
-				if( !(target_mob in viewers(7,src)) )
+				if(!(target_mob in viewers(7,src)))
 					stance = BEAR_STANCE_ALERT
 					stance_step = 5 //Make it very alert, so it quickly attacks again if a mob returns
 					target_mob = null
 					return
-				if( get_dist(src, target_mob) <= 1 )	//Attacking
+				if(get_dist(src, target_mob) <= 1)	//Attacking
 					emote( pick( list("slashes at [target_mob]", "bites [target_mob]") ) )
 
 					var/damage = rand(20,30)
@@ -130,7 +131,7 @@
 						var/mob/living/L = target_mob
 						L.adjustBruteLoss(damage)
 
-				if( stance_step >= 20 )	//attacks for 20 ticks, then it gets tired and needs to rest
+				if(stance_step >= 20)	//attacks for 20 ticks, then it gets tired and needs to rest
 					emote( "is worn out and needs to rest" )
 					stance = BEAR_STANCE_TIRED
 					stance_step = 0
@@ -160,5 +161,5 @@
 		target_mob = M
 	..()
 
-/mob/living/simple_animal/bear/Process_Spacemove(var/check_drift = 0)
+/mob/living/simple_animal/carp/Process_Spacemove(var/check_drift = 0)
 	return	//No drifting in space for space bears!

code/modules/mob/living/simple_animal/carp.dm

@@ -0,0 +1,93 @@
+#define CARP_STANCE_IDLE 1
+#define CARP_STANCE_ATTACK 2
+#define CARP_STANCE_ATTACKING 3
+
+/mob/living/simple_animal/carp
+	name = "space carp"
+	desc = "A ferocious, fang-bearing creature that resembles a fish."
+	icon_state = "carp"
+	icon_living = "carp"
+	icon_dead = "carp_dead"
+	icon_gib = "carp_gib"
+	speak_chance = 0
+	turns_per_move = 5
+	meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat
+	response_help = "pets the"
+	response_disarm = "gently pushes aside the"
+	response_harm = "hits the"
+
+	stop_automated_movement_when_pulled = 0
+	maxHealth = 25
+	health = 25
+
+	harm_intent_damage = 8
+	melee_damage_lower = 5
+	melee_damage_upper = 15
+	attacktext = "bites"
+	attack_sound = 'bite.ogg'
+
+	//Space carp aren't affected by atmos.
+	min_oxy = 0
+	max_oxy = 0
+	min_tox = 0
+	max_tox = 0
+	min_co2 = 0
+	max_co2 = 0
+	min_n2 = 0
+	max_n2 = 0
+
+	var/stance = CARP_STANCE_IDLE	//Used to determine behavior
+	var/stance_step = 0				//Used to delay checks depending on what stance the bear is in
+	var/mob/living/target_mob		//Once the bear enters attack stance, it will try to chase this mob. This it to prevent it changing it's mind between multiple mobs.
+
+/mob/living/simple_animal/carp/Life()
+	..()
+
+	if(!stat)
+		switch(stance)
+			if(CARP_STANCE_IDLE)
+				stop_automated_movement = 0
+				stance_step++
+				if(stance_step > 5)
+					stance_step = 0
+					for( var/mob/living/L in viewers(7,src) )
+						if(iscarp(L)) continue
+						if(!L.stat)
+							emote("gnashes at [L]")
+							stance = CARP_STANCE_ATTACK
+							target_mob = L
+							break
+
+			if(CARP_STANCE_ATTACK)	//This one should only be active for one tick
+				stop_automated_movement = 1
+				if(!target_mob || target_mob.stat)
+					stance = CARP_STANCE_IDLE
+					stance_step = 5 //Make it very alert, so it quickly attacks again if a mob returns
+				if(target_mob in viewers(7,src))
+					walk_to(src, target_mob, 1, 3)
+					stance = CARP_STANCE_ATTACKING
+					stance_step = 0
+
+			if(CARP_STANCE_ATTACKING)
+				stop_automated_movement = 1
+				stance_step++
+				if(!target_mob || target_mob.stat)
+					stance = CARP_STANCE_IDLE
+					stance_step = 3 //Make it very alert, so it quickly attacks again if a mob returns
+					target_mob = null
+					return
+				if(!(target_mob in viewers(7,src)))
+					stance = CARP_STANCE_IDLE
+					stance_step = 1
+					target_mob = null
+					return
+				if(get_dist(src, target_mob) <= 1)	//Attacking
+					if(isliving(target_mob))
+						var/mob/living/L = target_mob
+						L.attack_animal(src)
+						if(prob(10))
+							L.Weaken(5)
+							L.visible_message("<span class='danger'>\the [src] knocks down \the [L]!</span>")
+
+/mob/living/simple_animal/carp/Process_Spacemove(var/check_drift = 0)
+	return	//No drifting in space for space carp!	//original comments do not steal

code/modules/mob/living/simple_animal/cat.dm

@@ -2,7 +2,6 @@
 /mob/living/simple_animal/cat
 	name = "cat"
 	desc = "Kitty!!"
-	icon = 'icons/mob/mob.dmi'
 	icon_state = "cat"
 	icon_living = "cat"
 	icon_dead = "cat_dead"
@@ -35,7 +34,7 @@
 			for(var/mob/living/simple_animal/mouse/M in view(1,src))
 				if(!M.stat)
 					M.splat()
-					emote("SPLATS \the [M]")
+					emote("splats \the [M]")
 					movement_target = null
 					stop_automated_movement = 0
 					break

code/modules/mob/living/simple_animal/corgi.dm

@@ -3,7 +3,6 @@
 	name = "\improper corgi"
 	real_name = "corgi"
 	desc = "It's a corgi."
-	icon = 'icons/mob/mob.dmi'
 	icon_state = "corgi"
 	icon_living = "corgi"
 	icon_dead = "corgi_dead"

code/modules/mob/living/simple_animal/crab.dm

@@ -1,9 +1,7 @@
 //Look Sir, free crabs!
 /mob/living/simple_animal/crab
 	name = "crab"
-	real_name = "crab"
 	desc = "Free crabs!"
-	icon = 'icons/mob/mob.dmi'
 	icon_state = "crab"
 	icon_living = "crab"
 	icon_dead = "crab_dead"

code/modules/mob/living/simple_animal/life.dm

@@ -1,12 +1,14 @@
 /mob/living/simple_animal
 	name = "animal"
+	icon = 'icons/mob/animal.dmi'
 	var/icon_living = ""
 	var/icon_dead = ""
+	var/icon_gib = null	//We only try to show a gibbing animation if this exists.
 	maxHealth = 20
 	var/list/speak = list()
 	var/list/speak_emote = list()//	Emotes while speaking IE: Ian [emote], [text] -- Ian barks, "WOOF!". Spoken text is generated from the speak variable.
 	var/speak_chance = 0
-	var/list/emote_hear = list()	//EHearable emotes
+	var/list/emote_hear = list()	//Hearable emotes
 	var/list/emote_see = list()		//Unlike speak_emote, the list of things in this variable only show by themselves with no spoken text. IE: Ian barks, Ian yaps
 	health = 20
 	var/turns_per_move = 1
@@ -232,6 +234,8 @@
 			..()
 
 /mob/living/simple_animal/gib()
+	if(icon_gib)
+		flick(icon_gib, src)
 	if(meat_amount && meat_type)
 		for(var/i = 0; i < meat_amount; i++)
 			new meat_type(src.loc)
@@ -272,13 +276,13 @@
 
 	switch(M.a_intent)
 
-		if ("help")
+		if("help")
 			if (health > 0)
 				for(var/mob/O in viewers(src, null))
 					if ((O.client && !( O.blinded )))
 						O.show_message("\blue [M] [response_help] [src]")
 
-		if ("grab")
+		if("grab")
 			if (M == src)
 				return
 			if (nopush)
@@ -297,13 +301,13 @@
 				if ((O.client && !( O.blinded )))
 					O.show_message(text("\red [] has grabbed [] passively!", M, src), 1)
 
-		if ("hurt")
+		if("hurt")
 			health -= harm_intent_damage
 			for(var/mob/O in viewers(src, null))
 				if ((O.client && !( O.blinded )))
 					O.show_message("\red [M] [response_harm] [src]")
 
-		if ("disarm")
+		if("disarm")
 			for(var/mob/O in viewers(src, null))
 				if ((O.client && !( O.blinded )))
 					O.show_message("\blue [M] [response_disarm] [src]")
@@ -325,6 +329,13 @@
 							M.show_message("\blue [user] applies the [MED] on [src]")
 		else
 			user << "\blue this [src] is dead, medical items won't bring it back to life."
+	if(meat_type && (stat == DEAD))	//if the animal has a meat, and if it is dead.
+		if(istype(O, /obj/item/weapon/kitchenknife) || istype(O, /obj/item/weapon/butch))
+			new meat_type (get_turf(src))
+			if(prob(95))
+				del(src)
+				return
+			gib()
 	else
 		if(O.force)
 			health -= O.force

code/modules/mob/living/simple_animal/mouse.dm

@@ -1,8 +1,6 @@
-//Mouse
 /mob/living/simple_animal/mouse
 	name = "mouse"
 	desc = "It's a nasty, ugly, evil, disease-ridden rodent."
-	icon = 'icons/mob/mob.dmi'
 	icon_state = "mouse_gray"
 	icon_living = "mouse_gray"
 	icon_dead = "mouse_gray_dead"

code/modules/mob/living/simple_animal/mushroom.dm

@@ -0,0 +1,14 @@
+/mob/living/simple_animal/mushroom
+	name = "walking mushroom"
+	desc = "It's a massive mushroom... with legs?"
+	icon_state = "mushroom"
+	icon_living = "mushroom"
+	icon_dead = "mushroom_dead"
+	speak_chance = 0
+	turns_per_move = 1
+	health = 5
+	meat_type = /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice
+	response_help  = "pets the"
+	response_disarm = "gently pushes aside the"
+	response_harm   = "whacks the"
+	harm_intent_damage = 5

code/modules/mob/living/simple_animal/tomato.dm

@@ -0,0 +1,16 @@
+/mob/living/simple_animal/tomato
+	name = "tomato"
+	desc = "It's a horrifyingly enormous beef tomato, and it's packing extra beef!"
+	icon_state = "tomato"
+	icon_living = "tomato"
+	icon_dead = "tomato_dead"
+	speak_chance = 0
+	turns_per_move = 5
+	health = 15
+	meat_type = /obj/item/weapon/reagent_containers/food/snacks/tomatomeat
+	response_help  = "prods the"
+	response_disarm = "pushes aside the"
+	response_harm   = "smacks the"
+	harm_intent_damage = 5
+
+/mob/living/simple_animal/tomato

code/modules/mob/mob_helpers.dm

@@ -70,6 +70,11 @@
 		return 1
 	return 0
 
+/proc/iscarp(A)
+	if(istype(A, /mob/living/simple_animal/carp))
+		return 1
+	return 0
+
 /proc/isAI(A)
 	if(istype(A, /mob/living/silicon/ai))
 		return 1