Merge pull request #4158 from Fox-McCloud/killer-tomato

Killer Tomatoes Live Up to their Name

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

@@ -1,18 +0,0 @@
-/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
-	maxHealth = 15
-	health = 15
-	butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/tomatomeat = 3)
-	response_help  = "prods the"
-	response_disarm = "pushes aside the"
-	response_harm   = "smacks the"
-	harm_intent_damage = 5
-	pass_flags = PASSTABLE
-	can_hide = 1
-	gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY

code/modules/mob/living/simple_animal/hostile/killertomato.dm

@@ -0,0 +1,26 @@
+/mob/living/simple_animal/hostile/killertomato
+	name = "Killer 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
+	maxHealth = 30
+	health = 30
+	see_in_dark = 3
+	butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/tomatomeat = 2)
+	response_help  = "prods"
+	response_disarm = "pushes aside"
+	response_harm   = "smacks"
+	melee_damage_lower = 8
+	melee_damage_upper = 12
+	attacktext = "slams"
+	attack_sound = 'sound/weapons/punch1.ogg'
+	ventcrawler = 2
+	faction = list("plants")
+
+	atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	minbodytemp = 150
+	maxbodytemp = 500
+	gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE