From 671b3b2d96e88bbe6929c276991b46b58bc8aa52 Mon Sep 17 00:00:00 2001 From: Kelenius Date: Mon, 18 Jan 2016 16:04:01 +0300 Subject: [PATCH] Removes copypaste --- code/modules/research/circuitprinter.dm | 17 ++--------------- code/modules/research/protolathe.dm | 16 ++-------------- code/modules/research/rdmachines.dm | 17 ++++++++++++++++- 3 files changed, 20 insertions(+), 30 deletions(-) diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index b4acf6428e..0e3858e662 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -8,8 +8,6 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid). name = "Circuit Imprinter" icon_state = "circuit_imprinter" flags = OPENCONTAINER - - var/list/materials = list("metal" = 0, "glass" = 0, "gold" = 0, "silver" = 0, "phoron" = 0, "uranium" = 0, "diamond" = 0) var/list/datum/design/queue = list() var/progress = 0 @@ -17,6 +15,8 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid). var/mat_efficiency = 1 var/speed = 1 + materials = list("metal" = 0, "glass" = 0, "gold" = 0, "silver" = 0, "phoron" = 0, "uranium" = 0, "diamond" = 0) + use_power = 1 idle_power_usage = 30 active_power_usage = 2500 @@ -201,16 +201,3 @@ using metal and glass, it uses glass and reagents (usually sulphuric acid). if(new_item.matter && new_item.matter.len > 0) for(var/i in new_item.matter) new_item.matter[i] = new_item.matter[i] * mat_efficiency - -/obj/machinery/r_n_d/circuit_imprinter/proc/eject(var/material, var/amount) - if(!(material in materials)) - return - var/obj/item/stack/material/sheetType = getMaterialType(material) - var/perUnit = initial(sheetType.perunit) - var/eject = round(materials[material] / perUnit) - eject = amount == -1 ? eject : min(eject, amount) - if(eject < 1) - return - var/obj/item/stack/material/S = new sheetType(loc) - S.amount = eject - materials[material] -= eject * perUnit diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index e7150cfdf2..8809ee2955 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -8,7 +8,6 @@ active_power_usage = 5000 var/max_material_storage = 100000 - var/list/materials = list(DEFAULT_WALL_MATERIAL = 0, "glass" = 0, "gold" = 0, "silver" = 0, "phoron" = 0, "uranium" = 0, "diamond" = 0) var/list/datum/design/queue = list() var/progress = 0 @@ -16,6 +15,8 @@ var/mat_efficiency = 1 var/speed = 1 + materials = list(DEFAULT_WALL_MATERIAL = 0, "glass" = 0, "gold" = 0, "silver" = 0, "phoron" = 0, "uranium" = 0, "diamond" = 0) + /obj/machinery/r_n_d/protolathe/New() ..() component_parts = list() @@ -202,16 +203,3 @@ if(new_item.matter && new_item.matter.len > 0) for(var/i in new_item.matter) new_item.matter[i] = new_item.matter[i] * mat_efficiency - -/obj/machinery/r_n_d/protolathe/proc/eject(var/material, var/amount) - if(!(material in materials)) - return - var/obj/item/stack/material/sheetType = getMaterialType(material) - var/perUnit = initial(sheetType.perunit) - var/eject = round(materials[material] / perUnit) - eject = amount == -1 ? eject : min(eject, amount) - if(eject < 1) - return - var/obj/item/stack/material/S = new sheetType(loc) - S.amount = eject - materials[material] -= eject * perUnit diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index 031c82a958..2bcf7ef66e 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -11,6 +11,8 @@ var/busy = 0 var/obj/machinery/computer/rdconsole/linked_console + var/list/materials = list() + /obj/machinery/r_n_d/attack_hand(mob/user as mob) return @@ -47,4 +49,17 @@ if(/obj/item/stack/material/uranium) return "uranium" if(/obj/item/stack/material/diamond) - return "diamond" \ No newline at end of file + return "diamond" + +/obj/machinery/r_n_d/proc/eject(var/material, var/amount) + if(!(material in materials)) + return + var/obj/item/stack/material/sheetType = getMaterialType(material) + var/perUnit = initial(sheetType.perunit) + var/eject = round(materials[material] / perUnit) + eject = amount == -1 ? eject : min(eject, amount) + if(eject < 1) + return + var/obj/item/stack/material/S = new sheetType(loc) + S.amount = eject + materials[material] -= eject * perUnit \ No newline at end of file