cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +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

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

@@ -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
*/