From 379ff0546a27b50a45eb1f2011bb967621a67d84 Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Mon, 12 Feb 2018 17:02:29 +0200 Subject: [PATCH 1/2] Merge pull request #35541 from 81Denton/chem-conflicts Fixes lye/plastic/charcoal conflicts --- code/modules/reagents/chemistry/recipes/others.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index 5999911cb1..4261dcc421 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -562,7 +562,7 @@ name = "lye" id = "lye" results = list("lye" = 2) - required_reagents = list("ash" = 1, "water" = 1) + required_reagents = list("ash" = 1, "water" = 1, "carbon" = 1) /datum/chemical_reaction/royal_bee_jelly name = "royal bee jelly" @@ -579,7 +579,7 @@ /datum/chemical_reaction/plastic_polymers name = "plastic polymers" id = "plastic_polymers" - required_reagents = list("oil" = 5, "sodiumchloride" = 2, "ash" = 3) + required_reagents = list("oil" = 5, "sacid" = 2, "ash" = 3) required_temp = 374 //lazily consistent with soap & other crafted objects generically created with heat. /datum/chemical_reaction/plastic_polymers/on_reaction(datum/reagents/holder, created_volume)