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

Merge pull request #5404 from Citadel-Station-13/upstream-merge-35479

Browse Source 
[MIRROR] Fixed chemical recipe conflicts
This commit is contained in:
deathride58
2018-02-11 00:50:15 +00:00
committed by GitHub
parent d598695a3a 4a99f1dbfb
commit 571ad489d4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/recipes/drinks_recipes.dm
+1 -1
View File
@@ -441,7 +441,7 @@
name = "Chocolate Pudding"
id = "chocolatepudding"
results = list("chocolatepudding" = 20)
required_reagents = list("cocoa" = 5, "milk" = 5, "eggyolk" = 5)
required_reagents = list("chocolate_milk" = 10, "eggyolk" = 5)
/datum/chemical_reaction/vanillapudding
name = "Vanilla Pudding"
code/modules/reagents/chemistry/recipes/toxins.dm
+1 -1
View File
@@ -55,7 +55,7 @@
name = "Lexorin"
id = "lexorin"
results = list("lexorin" = 3)
required_reagents = list("plasma" = 1, "hydrogen" = 1, "nitrogen" = 1)
required_reagents = list("plasma" = 1, "hydrogen" = 1, "oxygen" = 1)
/datum/chemical_reaction/chloralhydrate
name = "Chloral Hydrate"