Merge pull request tgstation#8892 from phil235/PiniataPeteFix

Fixes the meat type of many simple animals

code/modules/food&drinks/food/snacks/meat.dm

@@ -183,12 +183,16 @@
 /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain/human
 
 /obj/item/weapon/reagent_containers/food/snacks/meat/steak/killertomato
+	name = "killer tomato steak"
 
 /obj/item/weapon/reagent_containers/food/snacks/meat/steak/bear
+	name = "bear steak"
 
 /obj/item/weapon/reagent_containers/food/snacks/meat/steak/xeno
+	name = "xeno steak"
 
 /obj/item/weapon/reagent_containers/food/snacks/meat/steak/spider
+	name = "spider steak"
 
 
 
@@ -224,12 +228,20 @@
 		S.name = "[subjectjob] [initial(S.name)]"
 
 /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/killertomato
+	name = "raw killer tomato cutlet"
+	cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/killertomato
 
 /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/bear
+	name = "raw bear cutlet"
+	cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/bear
 
 /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/xeno
+	name = "raw xeno cutlet"
+	cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/xeno
 
 /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/spider
+	name = "raw spider cutlet"
+	cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/spider
 
 
 //Cooked cutlets
@@ -248,9 +260,14 @@
 /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/plain/human
 
 /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/killertomato
+	name = "killer tomato cutlet"
 
 /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/bear
+	name = "bear cutlet"
 
 /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/xeno
+	name = "xeno cutlet"
+
+/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/spider
+	name = "spider cutlet"
 
-/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/spider

code/modules/holiday/easter.dm

@@ -44,7 +44,7 @@
 	speak_emote = list("sniffles","twitches")
 	emote_hear = list("hops.")
 	emote_see = list("hops around","bounces up and down")
-	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/slab
 	egg_type = /obj/item/weapon/reagent_containers/food/snacks/egg/loaded
 	food_type = /obj/item/weapon/reagent_containers/food/snacks/grown/carrot
 	meat_amount = 1

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

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

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

@@ -10,7 +10,7 @@
 	emote_see = list("clacks")
 	speak_chance = 1
 	turns_per_move = 5
-	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/slab
 	meat_amount = 2
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"

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

@@ -12,7 +12,7 @@
 	speak_chance = 1
 	turns_per_move = 5
 	see_in_dark = 6
-	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/slab
 	meat_amount = 4
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
@@ -98,7 +98,7 @@
 	speak_chance = 1
 	turns_per_move = 5
 	see_in_dark = 6
-	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/slab
 	meat_amount = 6
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
@@ -161,7 +161,7 @@
 	density = 0
 	speak_chance = 2
 	turns_per_move = 2
-	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/slab
 	meat_amount = 1
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
@@ -204,7 +204,7 @@ var/global/chicken_count = 0
 	density = 0
 	speak_chance = 2
 	turns_per_move = 3
-	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/slab
 	var/egg_type = /obj/item/weapon/reagent_containers/food/snacks/egg
 	var/food_type = /obj/item/weapon/reagent_containers/food/snacks/grown/wheat
 	meat_amount = 2

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

@@ -13,7 +13,7 @@
 	speak_chance = 1
 	turns_per_move = 5
 	see_in_dark = 6
-	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/slab
 	response_help = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm = "kicks"

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

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

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

@@ -97,7 +97,7 @@
 
 // Chops off each leg with a 50/50 chance of harvesting one, until finally calling
 // default harvest action
-/mob/living/simple_animal/hostile/poison/giant_spider/harvest()
+/mob/living/simple_animal/hostile/poison/giant_spider/harvest(mob/living/user, sharpness = 1)
 	if(butcher_state > 0)
 		butcher_state--
 		icon_state = icon_dead + "[butcher_state]"