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

Merge pull request #35479 from Cruix/chem_collisions

Browse Source 
Fixed chemical recipe conflicts
This commit is contained in:
Jordan Brown
2018-02-10 12:04:18 -05:00
committed by CitadelStationBot
parent 9986038318
commit bd0b5c2eb5
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"