From 3d3ff303c7a10624eb432039f5a5520fcb1e50fe Mon Sep 17 00:00:00 2001 From: silveryferret Date: Wed, 19 Jul 2017 23:14:15 -0400 Subject: [PATCH] Adds missed Oxyphoron reaction, moves Deuterium/fifty into obj/fiftyspawner/deuterium --- code/modules/materials/fifty_spawner_mats.dm | 7 ++++++- code/modules/materials/material_sheets.dm | 3 --- code/modules/reagents/Chemistry-Recipes.dm | 7 +++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/code/modules/materials/fifty_spawner_mats.dm b/code/modules/materials/fifty_spawner_mats.dm index 53b65f7ab2..95f10e2012 100644 --- a/code/modules/materials/fifty_spawner_mats.dm +++ b/code/modules/materials/fifty_spawner_mats.dm @@ -94,4 +94,9 @@ /obj/fiftyspawner/phoronrglass name = "stack of reinforced borosilicate glass" - material = "material/glass/phoronrglass" \ No newline at end of file + material = "material/glass/phoronrglass" + +//R-UST port +/obj/fiftyspawner/deuterium + name = "stack of deuterium" + material = "material/deuterium" \ No newline at end of file diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm index 6a957b1eb0..2f9949098b 100644 --- a/code/modules/materials/material_sheets.dm +++ b/code/modules/materials/material_sheets.dm @@ -166,9 +166,6 @@ default_type = "deuterium" apply_colour = 1 -/obj/item/stack/material/deuterium/fifty - amount = 50 - /obj/item/stack/material/steel name = DEFAULT_WALL_MATERIAL icon_state = "sheet-metal" diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 0cdb0cd35b..231984090c 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1941,6 +1941,13 @@ required_reagents = list("sake" = 1, "melonliquor" = 1) result_amount = 2 +/datum/chemical_reaction/oxyphoron + name = "Oxyphoron" + id = "oxyphoron" + result = "oxyphoron" + required_reagents = list("water" = 1, "phoron" = 1) + result_amount = 2 + /datum/chemical_reaction/deuterium name = "Deuterium" id = "deuterium"