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

Merge pull request #5434 from Citadel-Station-13/upstream-merge-35541

Browse Source 
[MIRROR] Fixes lye/plastic/charcoal conflicts
This commit is contained in:
LetterJay
2018-02-12 10:03:16 -06:00
committed by GitHub
parent c88c4f2d27 173c6fa686
commit 5a9b7a5173
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/recipes/others.dm
+2 -2
View File
@@ -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)