shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update drinks_recipes.dm

Browse Source
This commit is contained in:
LetterJay
2018-05-13 10:15:47 -05:00
committed by GitHub
parent 4a7f656823
commit 34bf8d11aa
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/recipes/drinks_recipes.dm
-5
View File
@@ -623,9 +623,6 @@
id = "crevice_spike" id = "crevice_spike"
results = list("crevice_spike" = 6) results = list("crevice_spike" = 6)
required_reagents = list("limejuice" = 2, "capsaicin" = 4) //2 powdered delta (sour), 4 flanergide (spicy) required_reagents = list("limejuice" = 2, "capsaicin" = 4) //2 powdered delta (sour), 4 flanergide (spicy)
<<<<<<< HEAD
mix_message = "The mixture stings your eyes as it settles."
=======
mix_message = "The mixture stings your eyes as it settles." mix_message = "The mixture stings your eyes as it settles."
/datum/chemical_reaction/sake /datum/chemical_reaction/sake
@@ -665,5 +662,3 @@
id = "mojito" id = "mojito"
results = list("mojito" = 5) results = list("mojito" = 5)
required_reagents = list("rum" = 1, "sugar" = 1, "limejuice" = 1, "sodawater" = 1, "menthol" = 1) required_reagents = list("rum" = 1, "sugar" = 1, "limejuice" = 1, "sodawater" = 1, "menthol" = 1)
>>>>>>> b0b7f2d... Adds grenadine. (#37598)