From 46a824c5ccfbcc0752bef5fb9a426692b37d4eb2 Mon Sep 17 00:00:00 2001 From: MMMiracles Date: Thu, 19 Mar 2015 19:34:36 -0400 Subject: [PATCH] againwhy? --- code/modules/food&drinks/food/snacks_meat.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/food&drinks/food/snacks_meat.dm b/code/modules/food&drinks/food/snacks_meat.dm index 41b05760a0e..62cf5fcc05b 100644 --- a/code/modules/food&drinks/food/snacks_meat.dm +++ b/code/modules/food&drinks/food/snacks_meat.dm @@ -70,7 +70,6 @@ trash = /obj/item/trash/plate bonus_reagents = list("nutriment" = 1, "vitamin" = 4) list_reagents = list("nutriment" = 5) -<<<<<<< HEAD /obj/item/weapon/reagent_containers/food/snacks/bearsteak name = "Filet migrawr" @@ -79,8 +78,6 @@ trash = /obj/item/trash/plate bonus_reagents = list("nutriment" = 2, "vitamin" = 6) list_reagents = list("nutriment" = 2, "vitamin" = 5, "manlydorf" = 5) -======= ->>>>>>> b5979a49fe43e9e059e6c165b309df0b1c018087 /obj/item/weapon/reagent_containers/food/snacks/faggot name = "faggot" @@ -215,4 +212,4 @@ icon_state = "sashimi" bonus_reagents = list("nutriment" = 1, "capsaicin" = 4, "vitamin" = 4) list_reagents = list("nutriment" = 6, "capsaicin" = 5) - filling_color = "#FA8072" \ No newline at end of file + filling_color = "#FA8072"