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

Fixes Chemistry-Recipes.dm.

Browse Source 
Not 100% sure how this happened, mergetool must've screwed up somehow.
This commit is contained in:
silveryferret
2017-07-19 23:22:36 -04:00
parent 3d3ff303c7
commit ad5cfd0087
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/reagents/Chemistry-Recipes.dm
View File

@@ -1842,6 +1842,7 @@
required_reagents = list("tea" = 5, "berryjuice" = 1) required_reagents = list("tea" = 5, "berryjuice" = 1)
result_amount = 6 result_amount = 6
/datum/chemical_reaction/drinks/sakebomb
name = "Sake Bomb" name = "Sake Bomb"
id = "sakebomb" id = "sakebomb"
result = "sakebomb" result = "sakebomb"
@@ -1862,6 +1863,7 @@
required_reagents = list("sake" = 2, "vodka" = 2, "tomatojuice" = 1) required_reagents = list("sake" = 2, "vodka" = 2, "tomatojuice" = 1)
result_amount = 5 result_amount = 5
/datum/chemical_reaction/drinks/tokyorose
name = "Tokyo Rose" name = "Tokyo Rose"
id = "tokyorose" id = "tokyorose"
result = "tokyorose" result = "tokyorose"
@@ -1904,6 +1906,9 @@
result_amount = 3 result_amount = 3
/datum/chemical_reaction/drinks/euphoria /datum/chemical_reaction/drinks/euphoria
name = "Euphoria"
id = "euphoria"
result = "euphoria"
required_reagents = list("specialwhiskey" = 1, "cognac" = 2) required_reagents = list("specialwhiskey" = 1, "cognac" = 2)
result_amount = 3 result_amount = 3
@@ -1911,6 +1916,7 @@
name = "Xanadu Cannon" name = "Xanadu Cannon"
id = "xanaducannon" id = "xanaducannon"
result = "xanaducannon" result = "xanaducannon"
required_reagents = list("ale" = 1, "dr_gibb" = 1)
result_amount = 2 result_amount = 2
/datum/chemical_reaction/drinks/debugger /datum/chemical_reaction/drinks/debugger
@@ -1941,6 +1947,7 @@
required_reagents = list("sake" = 1, "melonliquor" = 1) required_reagents = list("sake" = 1, "melonliquor" = 1)
result_amount = 2 result_amount = 2
//R-UST Port
/datum/chemical_reaction/oxyphoron /datum/chemical_reaction/oxyphoron
name = "Oxyphoron" name = "Oxyphoron"
id = "oxyphoron" id = "oxyphoron"