Merge pull request #4772 from Aranclanos/carpmeat

Fixes a bug where you couldn't get meat from carps and several other mobs.

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

@@ -16,6 +16,7 @@
 	species = /mob/living/simple_animal/cat
 	childtype = /mob/living/simple_animal/cat/kitten
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+	meat_amount = 3
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "kicks"

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

@@ -11,6 +11,7 @@
 	speak_chance = 1
 	turns_per_move = 5
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+	meat_amount = 2
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "stomps"

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

@@ -14,6 +14,7 @@
 	maxHealth = 5
 	health = 5
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+	meat_amount = 1
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "splats"

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

@@ -11,6 +11,7 @@
 	response_harm = "hits"
 	speed = 0
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat
+	meat_amount = 3
 	maxHealth = 100
 	health = 100
 	harm_intent_damage = 5

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

@@ -14,6 +14,7 @@
 	turns_per_move = 5
 	see_in_dark = 6
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/bearmeat
+	meat_amount = 3
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "hits"

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

@@ -10,6 +10,7 @@
 	speak_chance = 0
 	turns_per_move = 5
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat
+	meat_amount = 2
 	response_help = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm = "hits"

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

@@ -18,6 +18,7 @@
 	turns_per_move = 5
 	see_in_dark = 10
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/spidermeat
+	meat_amount = 2
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "hits"
@@ -43,6 +44,7 @@
 	icon_living = "nurse"
 	icon_dead = "nurse_dead"
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/spidereggs
+	meat_amount = 4
 	maxHealth = 40
 	health = 40
 	melee_damage_lower = 5

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

@@ -10,6 +10,7 @@
 	health = 30
 	see_in_dark = 3
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/tomatomeat
+	meat_amount = 1
 	response_help  = "prods"
 	response_disarm = "pushes aside"
 	response_harm   = "smacks"

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

@@ -9,7 +9,6 @@
 	icon_state = "crate"
 	icon_living = "crate"
 
-	meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat
 	response_help = "touches"
 	response_disarm = "pushes"
 	response_harm = "hits"

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

@@ -9,6 +9,7 @@
 	maxHealth = 10
 	health = 10
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice
+	meat_amount = 1
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "whacks"

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

@@ -8,7 +8,6 @@
 	icon_gib = "pine_1"
 	speak_chance = 0
 	turns_per_move = 5
-	meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat
 	response_help = "brushes"
 	response_disarm = "pushes"
 	response_harm = "hits"

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

@@ -43,6 +43,7 @@
 	speak_chance = 1 //1% (1 in 100) chance every tick; So about once per 150 seconds, assuming an average tick is 1.5s
 	turns_per_move = 5
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/cracker/
+	meat_amount = 1
 	melee_damage_upper = 10
 	melee_damage_lower = 5
 
@@ -150,7 +151,7 @@
 			if (ears)
 				ears.talk_into(src, message, message_mode)
 			return ITALICS | REDUCE_RANGE
-	
+
 	if(message_mode in radiochannels)
 		if(ears)
 			ears.talk_into(src, message, message_mode)