fuck conflict

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

@@ -8,8 +8,19 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/meat/Initialize()
 	. = ..()
-	reagents.add_reagent("protein", 9)
-	src.bitesize = 3
+	reagents.add_reagent("protein", 6)
+	reagents.add_reagent("triglyceride", 2)
+	src.bitesize = 1.5
+
+/obj/item/weapon/reagent_containers/food/snacks/meat/cook()
+
+	if (!isnull(cooked_icon))
+		icon_state = cooked_icon
+		flat_icon = null //Force regenating the flat icon for coatings, since we've changed the icon of the thing being coated
+	..()
+
+	if (name == initial(name))
+		name = "cooked [name]"
 
 /obj/item/weapon/reagent_containers/food/snacks/meat/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W,/obj/item/weapon/material/knife))
@@ -35,9 +46,15 @@
 /obj/item/weapon/reagent_containers/food/snacks/meat/corgi
 	name = "Corgi meat"
 	desc = "Tastes like... well, you know."
+	
+/obj/item/weapon/reagent_containers/food/snacks/meat/chicken
+	name = "chicken"
+	icon = 'icons/obj/food_syn.dmi'
+	icon_state = "chickenbreast"
+	cooked_icon = "chickenbreast_cooked"
+	filling_color = "#BBBBAA"
 
-//Meat from Crabs
-/obj/item/weapon/reagent_containers/food/snacks/meat/crab
-	name = "meat"
-	desc = "A chunk of meat."
-	icon_state = "crustacean-meat"
+/obj/item/weapon/reagent_containers/food/snacks/meat/chicken/Initialize()
+		. = ..()
+		reagents.remove_reagent("triglyceride", INFINITY)
+		//Chicken is low fat. Less total calories than other meats

code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm

@@ -48,3 +48,10 @@
 /mob/living/simple_mob/animal/passive/crab/sif/Initialize()
 	..()
 	adjust_scale(rand(5,12) / 10)
+
+// Meat!
+
+/obj/item/weapon/reagent_containers/food/snacks/meat/crab
+	name = "meat"
+	desc = "A chunk of meat."
+	icon_state = "crustacean-meat"