From ac8ae9a9b35da17e2190f0da8096b25eca6cdc98 Mon Sep 17 00:00:00 2001
From: Kassc Zeravla <Kassc.Alvarez@gmail.com>
Date: Thu, 30 Apr 2020 05:29:56 -0400
Subject: [PATCH] Quick fix

*Removed from the tea code "<<<<"
*Removed from the tea code "/*"
*Small fix on the BeanBurrito.
---
 code/modules/food/food/snacks_ch.dm       | 15 ++++++---------
 code/modules/food/recipes_microwave_ch.dm |  8 --------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/code/modules/food/food/snacks_ch.dm b/code/modules/food/food/snacks_ch.dm
index ab650ed49b..eb40a3200c 100644
--- a/code/modules/food/food/snacks_ch.dm
+++ b/code/modules/food/food/snacks_ch.dm
@@ -129,7 +129,7 @@
 	slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/bigbeanburrito/filled
 	slices_num = 5
 	nutriment_desc = list("tortilla" = 2, "meat" = 4, "bean" = 7, "cheese" = 4, "chili" = 1, "Mexico" = 7)
-	nutriment_amt = 75
+	nutriment_amt = 50
 
 
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/supremoburrito/Initialize()
@@ -137,21 +137,19 @@
 	reagents.add_reagent("protein", 50)
 	reagents.add_reagent("nutriment", 55)
 	reagents.add_reagent("capsaicin", 3)
-	bitesize = 15
+	bitesize = 3
 
-/obj/item/weapon/reagent_containers/food/snacks/slice/bigbeanburrito/filled
+/obj/item/weapon/reagent_containers/food/snacks/slice/bigbeanburrito
 	name = "Big Bean Burrito"
 	desc = "The BBB. An engorged burrito filled to the brim of what makes Mexico. Beans, cheese and meat that ooze by how stuffed it is"
 	icon = 'icons/obj/food_ch.dmi'
 	icon_state = "bigbeanburrito"
-	bitesize = 15
+	bitesize = 3
 	whole_path = /obj/item/weapon/reagent_containers/food/snacks/slice/bigbeanburrito
 
-/obj/item/weapon/reagent_containers/food/snacks/slice/bigbeanburrito/filled/filled
+/obj/item/weapon/reagent_containers/food/snacks/slice/bigbeanburrito/filled
 	filled = TRUE
 
-
-/*	Tea
 /obj/item/weapon/reagent_containers/food/snacks/steamtealeaf
 	name = "Steamed tea leaf"
 	desc = "A freshly picked tea leaf steamed to inhibit oxidation. Needs rolling."
@@ -193,5 +191,4 @@
 /obj/item/weapon/reagent_containers/food/snacks/greentealeaf/Initialize()
 	..()
 	reagents.add_reagent("tealeavesgreen", 6)
-	bitesize = 1
-*/
\ No newline at end of file
+	bitesize = 1
\ No newline at end of file
diff --git a/code/modules/food/recipes_microwave_ch.dm b/code/modules/food/recipes_microwave_ch.dm
index e493b0e6c1..ca40161f26 100644
--- a/code/modules/food/recipes_microwave_ch.dm
+++ b/code/modules/food/recipes_microwave_ch.dm
@@ -86,9 +86,6 @@
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/supremoburrito
 
-/*
-<<<<<<< Updated upstream
-
 /datum/recipe/steamtealeaf
 	reagents = list("water" = 5)
 	fruit = list("tea" = 1)
@@ -100,8 +97,3 @@
 		/obj/item/weapon/reagent_containers/food/snacks/steamrolltealeaf
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/greentealeaf
-=======
-
-
->>>>>>> Stashed changes
-*/
\ No newline at end of file