cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Quick fix

Browse Source 
*Removed from the tea code "<<<<"
*Removed from the tea code "/*"
*Small fix on the BeanBurrito.
This commit is contained in:
Kassc Zeravla
2020-04-30 05:29:56 -04:00
parent 94a07d5f32
commit ac8ae9a9b3
2 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/food/food/snacks_ch.dm
View File

@@ -129,7 +129,7 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/bigbeanburrito/filled slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/bigbeanburrito/filled
slices_num = 5 slices_num = 5
nutriment_desc = list("tortilla" = 2, "meat" = 4, "bean" = 7, "cheese" = 4, "chili" = 1, "Mexico" = 7) 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() /obj/item/weapon/reagent_containers/food/snacks/sliceable/supremoburrito/Initialize()
@@ -137,21 +137,19 @@
reagents.add_reagent("protein", 50) reagents.add_reagent("protein", 50)
reagents.add_reagent("nutriment", 55) reagents.add_reagent("nutriment", 55)
reagents.add_reagent("capsaicin", 3) 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" 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" 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 = 'icons/obj/food_ch.dmi'
icon_state = "bigbeanburrito" icon_state = "bigbeanburrito"
bitesize = 15 bitesize = 3
whole_path = /obj/item/weapon/reagent_containers/food/snacks/slice/bigbeanburrito 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 filled = TRUE
/* Tea
/obj/item/weapon/reagent_containers/food/snacks/steamtealeaf /obj/item/weapon/reagent_containers/food/snacks/steamtealeaf
name = "Steamed tea leaf" name = "Steamed tea leaf"
desc = "A freshly picked tea leaf steamed to inhibit oxidation. Needs rolling." desc = "A freshly picked tea leaf steamed to inhibit oxidation. Needs rolling."
@@ -194,4 +192,3 @@
..() ..()
reagents.add_reagent("tealeavesgreen", 6) reagents.add_reagent("tealeavesgreen", 6)
bitesize = 1 bitesize = 1
*/

8
code/modules/food/recipes_microwave_ch.dm
View File

@@ -86,9 +86,6 @@
) )
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/supremoburrito result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/supremoburrito
/*
<<<<<<< Updated upstream
/datum/recipe/steamtealeaf /datum/recipe/steamtealeaf
reagents = list("water" = 5) reagents = list("water" = 5)
fruit = list("tea" = 1) fruit = list("tea" = 1)
@@ -100,8 +97,3 @@
/obj/item/weapon/reagent_containers/food/snacks/steamrolltealeaf /obj/item/weapon/reagent_containers/food/snacks/steamrolltealeaf
) )
result = /obj/item/weapon/reagent_containers/food/snacks/greentealeaf result = /obj/item/weapon/reagent_containers/food/snacks/greentealeaf
=======
>>>>>>> Stashed changes
*/