From f9badcefe1a68c19c92967641916d0647bde9915 Mon Sep 17 00:00:00 2001 From: "baloh.matevz@gmail.com" Date: Sun, 4 Dec 2011 03:05:44 +0000 Subject: [PATCH] It is no longer possible to make reinforced metal from metal sheets or vice versa. The reason for this is on Pete's side. The intention is to make RCD's not able to take down r-walls, however at the same time make r-walls harder to make. The way you make reinforced metal now is by using the mining processing unit. The recipe is a combination of metal and plasma ore. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2601 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/stacks/metal.dm | 2 -- code/modules/mining/machine_processing.dm | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/game/objects/stacks/metal.dm b/code/game/objects/stacks/metal.dm index a0f8738fd7..ad936cf566 100644 --- a/code/game/objects/stacks/metal.dm +++ b/code/game/objects/stacks/metal.dm @@ -68,7 +68,6 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ null, \ new/datum/stack_recipe("floor tile", /obj/item/stack/tile/steel, 1, 4, 10), \ new/datum/stack_recipe("metal rod", /obj/item/stack/rods, 1, 2, 60), \ - new/datum/stack_recipe("reinforced sheet", /obj/item/stack/sheet/r_metal, 2, 1, 50), \ null, \ new/datum/stack_recipe("computer frame", /obj/structure/computerframe, 5, one_per_turf = 1), \ new/datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 50, one_per_turf = 1, on_floor = 1), \ @@ -92,7 +91,6 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ // /datum/stack_recipe/New(title, result_type, req_amount, res_amount, max_res_amount, time, one_per_turf, on_floor = 0) var/global/list/datum/stack_recipe/r_metal_recipes = list ( \ new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts/reinforced, 2), \ - new/datum/stack_recipe("metal sheet", /obj/item/stack/sheet/metal, 1, 2, 50), \ new/datum/stack_recipe("AI core", /obj/structure/AIcore, 4, one_per_turf = 1), \ ) diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index c7455df467..6eeb8768c6 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -283,10 +283,10 @@ else on = 0 continue - if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0 && selected_adamantine == 0) + if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0 && selected_adamantine == 0) if (ore_iron > 0) ore_iron--; - new /obj/item/stack/sheet/metal(output.loc) + new /obj/item/stack/sheet/r_metal(output.loc) else on = 0 continue