R&D UI rework

code/modules/research/circuitprinter.dm

@@ -1,142 +1,136 @@
 /*///////////////Circuit Imprinter (By Darem)////////////////////////
 	Used to print new circuit boards (for computers and similar systems) and AI modules. Each circuit board pattern are stored in
-a /datum/design on the linked R&D console. You can then print them out in a fasion similar to a regular lathe. However, instead of
+a /datum/desgin on the linked R&D console. You can then print them out in a fasion similar to a regular lathe. However, instead of
 using metal and glass, it uses glass and reagents (usually sulfuric acis).
 
 */
 /obj/machinery/r_n_d/circuit_imprinter
 	name = "Circuit Imprinter"
+	desc = "Manufactures circuit boards for the construction of machines."
 	icon_state = "circuit_imprinter"
 	flags = OPENCONTAINER
 
 	var/g_amount = 0
 	var/gold_amount = 0
 	var/diamond_amount = 0
-	var/uranium_amount = 0
 	var/max_material_amount = 75000.0
 	var/efficiency_coeff
+	reagents = new()
 
-	New()
-		..()
-		component_parts = list()
-		component_parts += new /obj/item/weapon/circuitboard/circuit_imprinter(src)
-		component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
-		component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
-		component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src)
-		component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src)
-		RefreshParts()
-
+/obj/machinery/r_n_d/circuit_imprinter/New()
+	..()
+	component_parts = list()
+	component_parts += new /obj/item/weapon/circuitboard/circuit_imprinter(src)
+	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
+	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
+	component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src)
+	component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src)
 	RefreshParts()
-		var/T = 0
-		for(var/obj/item/weapon/reagent_containers/glass/G in component_parts)
-			T += G.reagents.maximum_volume
-		var/datum/reagents/R = new/datum/reagents(T)		//Holder for the reagents used as materials.
-		reagents = R
-		R.my_atom = src
-		T = 0
-		for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts)
-			T += M.rating
-		max_material_amount = T * 75000.0
-		T = 0
-		for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
-			T += M.rating
-		efficiency_coeff = 2 ** (T - 1) //Only 1 manipulator here, you're making runtimes Razharas
+	reagents.my_atom = src
 
-	blob_act()
-		if (prob(50))
-			del(src)
+/obj/machinery/r_n_d/circuit_imprinter/RefreshParts()
+	var/T = 0
+	for(var/obj/item/weapon/reagent_containers/glass/G in component_parts)
+		G.reagents.trans_to(src, G.reagents.total_volume)
+	for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts)
+		T += M.rating
+	max_material_amount = T * 75000.0
+	T = 0
+	for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
+		T += M.rating
+	efficiency_coeff = 2 ** (T - 1) //Only 1 manipulator here, you're making runtimes Razharas
 
-	meteorhit()
-		del(src)
+/obj/machinery/r_n_d/circuit_imprinter/blob_act()
+	if (prob(50))
+		qdel(src)
+
+
+/obj/machinery/r_n_d/circuit_imprinter/proc/check_mat(datum/design/being_built, var/M)
+	switch(M)
+		if("$glass")
+			return (g_amount - (being_built.materials[M]/efficiency_coeff) >= 0) ? 1 : 0
+		if("$gold")
+			return (gold_amount - (being_built.materials[M]/efficiency_coeff) >= 0) ? 1 : 0
+		if("$diamond")
+			return (diamond_amount - (being_built.materials[M]/efficiency_coeff) >= 0) ? 1 : 0
+		else
+			return (reagents.has_reagent(M, (being_built.materials[M]/efficiency_coeff)) != 0) ? 1 : 0
+
+
+/obj/machinery/r_n_d/circuit_imprinter/proc/TotalMaterials()
+	return g_amount + gold_amount + diamond_amount
+
+/obj/machinery/r_n_d/circuit_imprinter/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	if (shocked)
+		shock(user,50)
+	if (default_deconstruction_screwdriver(user, "circuit_imprinter_t", "circuit_imprinter", O))
+		if(linked_console)
+			linked_console.linked_imprinter = null
+			linked_console = null
 		return
 
-	proc/TotalMaterials()
-		return g_amount + gold_amount + diamond_amount + uranium_amount
+	if(exchange_parts(user, O))
+		return
 
-	attackby(var/obj/item/O as obj, var/mob/user as mob)
-		if(exchange_parts(user, O))
+	if (panel_open)
+		if(istype(O, /obj/item/weapon/crowbar))
+			for(var/obj/I in component_parts)
+				if(istype(I, /obj/item/weapon/reagent_containers/glass/beaker))
+					reagents.trans_to(I, reagents.total_volume)
+				if(I.reliability != 100 && crit_fail)
+					I.crit_fail = 1
+				I.loc = src.loc
+			for(var/obj/item/weapon/reagent_containers/glass/G in component_parts)
+				reagents.trans_to(G, G.reagents.maximum_volume)
+			if(g_amount >= MINERAL_MATERIAL_AMOUNT)
+				var/obj/item/stack/sheet/glass/G = new /obj/item/stack/sheet/glass(src.loc)
+				G.amount = round(g_amount / MINERAL_MATERIAL_AMOUNT)
+			if(gold_amount >= MINERAL_MATERIAL_AMOUNT)
+				var/obj/item/stack/sheet/mineral/gold/G = new /obj/item/stack/sheet/mineral/gold(src.loc)
+				G.amount = round(gold_amount / MINERAL_MATERIAL_AMOUNT)
+			if(diamond_amount >= MINERAL_MATERIAL_AMOUNT)
+				var/obj/item/stack/sheet/mineral/diamond/G = new /obj/item/stack/sheet/mineral/diamond(src.loc)
+				G.amount = round(diamond_amount / MINERAL_MATERIAL_AMOUNT)
+			default_deconstruction_crowbar(O)
 			return
-			
-		if (shocked)
-			shock(user,50)
-			
-		if (istype(O, /obj/item/weapon/screwdriver))
-			if (default_deconstruction_screwdriver(user, "circuit_imprinter_t", "circuit_imprinter", O))
-				if(linked_console)
-					linked_console.linked_imprinter = null
-					linked_console = null
-			return
-			
-		if (panel_open)
-			if(istype(O, /obj/item/weapon/crowbar))
-				for(var/obj/I in component_parts)
-					if(istype(I, /obj/item/weapon/reagent_containers/glass/beaker))
-						reagents.trans_to(I, reagents.total_volume)
-					if(I.reliability != 100 && crit_fail)
-						I.crit_fail = 1
-					I.loc = src.loc
-				if(g_amount >= 3750)
-					var/obj/item/stack/sheet/glass/G = new /obj/item/stack/sheet/glass(src.loc)
-					G.amount = round(g_amount / 3750)
-				if(gold_amount >= 2000)
-					var/obj/item/stack/sheet/mineral/gold/G = new /obj/item/stack/sheet/mineral/gold(src.loc)
-					G.amount = round(gold_amount / 2000)
-				if(diamond_amount >= 2000)
-					var/obj/item/stack/sheet/mineral/diamond/G = new /obj/item/stack/sheet/mineral/diamond(src.loc)
-					G.amount = round(diamond_amount / 2000)
-				if(uranium_amount >= 2000)
-					var/obj/item/stack/sheet/mineral/uranium/G = new /obj/item/stack/sheet/mineral/uranium(src.loc)
-					G.amount = round(uranium_amount / 2000)
-				default_deconstruction_crowbar(O)
-				return 1
-			else
-				user << "\red You can't load the [src.name] while it's opened."
-				return 1
-		if (disabled)
-			user << "\The [name] appears to not be working!"
-			return
-		if (!linked_console)
-			user << "\The [name] must be linked to an R&D console first!"
-			return 1
-		if (O.is_open_container())
-			return 0
-		if (!istype(O, /obj/item/stack/sheet/glass) && !istype(O, /obj/item/stack/sheet/mineral/gold) && !istype(O, /obj/item/stack/sheet/mineral/diamond) && !istype(O, /obj/item/stack/sheet/mineral/uranium))
-			user << "\red You cannot insert this item into the [name]!"
-			return 1
-		if (stat)
-			return 1
-		if (busy)
-			user << "\red The [name] is busy. Please wait for completion of previous operation."
-			return 1
-		var/obj/item/stack/sheet/stack = O
-		if ((TotalMaterials() + stack.perunit) > max_material_amount)
-			user << "\red The [name] is full. Please remove glass from the protolathe in order to insert more."
-			return 1
-
-		var/amount = round(input("How many sheets do you want to add?") as num)
-		if(amount < 0)
-			amount = 0
-		if(amount == 0)
-			return
-		if(amount > stack.amount)
-			amount = min(stack.amount, round((max_material_amount-TotalMaterials())/stack.perunit))
-
-		busy = 1
-		use_power(max(1000, (3750*amount/10)))
-		var/stacktype = stack.type
-		stack.use(amount)
-		if(do_after(usr,16))
-			user << "\blue You add [amount] sheets to the [src.name]."
-			switch(stacktype)
-				if(/obj/item/stack/sheet/glass)
-					g_amount += amount * 3750
-				if(/obj/item/stack/sheet/mineral/gold)
-					gold_amount += amount * 2000
-				if(/obj/item/stack/sheet/mineral/diamond)
-					diamond_amount += amount * 2000
-				if(/obj/item/stack/sheet/mineral/uranium)
-					uranium_amount += amount * 2000
 		else
-			new stacktype(src.loc, amount)
-		busy = 0
-		src.updateUsrDialog()
+			user << "<span class='warning'>You can't load the [src.name] while it's opened.</span>"
+			return
+	if (disabled)
+		return
+	if (!linked_console)
+		user << "<span class='warning'>The [name] must be linked to an R&D console first!</span>"
+		return 1
+	if (O.is_open_container())
+		return
+	if (!istype(O, /obj/item/stack/sheet/glass) && !istype(O, /obj/item/stack/sheet/mineral/gold) && !istype(O, /obj/item/stack/sheet/mineral/diamond))
+		user << "<span class='warning'>You cannot insert this item into the [name]!</span>"
+		return
+	if (stat)
+		return
+	if (busy)
+		user << "<span class='warning'>The [name] is busy. Please wait for completion of previous operation.</span>"
+		return
+	var/obj/item/stack/sheet/stack = O
+	if ((TotalMaterials() + stack.perunit) > max_material_amount)
+		user << "<span class='warning'>The [name] is full. Please remove glass from the protolathe in order to insert more.</span>"
+		return
+
+	var/amount = round(input("How many sheets do you want to add?") as num)
+	if(amount <= 0 || stack.amount <= 0)
+		return
+	if(amount > stack.amount)
+		amount = min(stack.amount, round((max_material_amount-TotalMaterials())/stack.perunit))
+
+	busy = 1
+	use_power(max(1000, (MINERAL_MATERIAL_AMOUNT*amount/10)))
+	user << "<span class='notice'>You add [amount] sheets to the [src.name].</span>"
+	if(istype(stack, /obj/item/stack/sheet/glass))
+		g_amount += amount * MINERAL_MATERIAL_AMOUNT
+	else if(istype(stack, /obj/item/stack/sheet/mineral/gold))
+		gold_amount += amount * MINERAL_MATERIAL_AMOUNT
+	else if(istype(stack, /obj/item/stack/sheet/mineral/diamond))
+		diamond_amount += amount * MINERAL_MATERIAL_AMOUNT
+	stack.use(amount)
+	busy = 0
+	src.updateUsrDialog()

code/modules/research/designs.dm

@@ -33,12 +33,6 @@ other types of metals and chemistry for reagents).
 
 
 */
-#define	IMPRINTER	1	//For circuits. Uses glass/chemicals.
-#define PROTOLATHE	2	//New stuff. Uses glass/metal/chemicals
-#define	AUTOLATHE	4	//Uses glass/metal only.
-#define CRAFTLATHE	8	//Uses fuck if I know. For use eventually.
-#define MECHFAB		16 //Remember, objects utilising this flag should have construction_time and construction_cost vars.
-//Note: More then one of these can be added to a design but imprinter and lathe designs are incompatable.
 
 datum/design						//Datum for object designs, used in construction
 	var/name = "Name"					//Name of the created object.
@@ -50,6 +44,7 @@ datum/design						//Datum for object designs, used in construction
 	var/reliability = 100				//Reliability of the device.
 	var/build_type = null				//Flag as to what kind machine the design is built in. See defines.
 	var/list/materials = list()			//List of materials. Format: "id" = amount.
+	var/construction_time				//Amount of time required for building the object
 	var/build_path = ""					//The file path of the object that gets created
 	var/locked = 0						//If true it will spawn inside a lockbox with currently sec access
 	var/category = null //Primarily used for Mech Fabricators, but can be used for anything
@@ -58,11 +53,11 @@ datum/design						//Datum for object designs, used in construction
 //A proc to calculate the reliability of a design based on tech levels and innate modifiers.
 //Input: A list of /datum/tech; Output: The new reliabilty.
 datum/design/proc/CalcReliability(var/list/temp_techs)
-	var/new_reliability = reliability_mod + reliability_base
+	var/new_reliability
 	for(var/datum/tech/T in temp_techs)
 		if(T.id in req_tech)
 			new_reliability += T.level
-	new_reliability = between(reliability_base, new_reliability, 100)
+	new_reliability = Clamp(new_reliability, reliability, 100)
 	reliability = new_reliability
 	return
 
@@ -292,25 +287,6 @@ datum/design/security_hud_night
 	materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$gold" = 350)
 	build_path = /obj/item/clothing/glasses/hud/security/night
 
-////////////////////////////////////////
-//Disks for transporting design datums//
-////////////////////////////////////////
-
-/obj/item/weapon/disk/design_disk
-	name = "Component Design Disk"
-	desc = "A disk for storing device design data for construction in lathes."
-	icon = 'icons/obj/cloning.dmi'
-	icon_state = "datadisk2"
-	item_state = "card-id"
-	w_class = 1.0
-	m_amt = 30
-	g_amt = 10
-	var/datum/design/blueprint
-
-/obj/item/weapon/disk/design_disk/New()
-	src.pixel_x = rand(-5.0, 5)
-	src.pixel_y = rand(-5.0, 5)
-
 /////////////////////////////////////////
 //////////////Borg Upgrades//////////////
 /////////////////////////////////////////

code/modules/research/designs/mechfabricator_designs.dm

@@ -2,182 +2,663 @@
 /////////// Mecha Equpment /////////////
 ////////////////////////////////////////
 
-datum/design/mech_scattershot
-	name = "Exosuit Weapon Design (LBX AC 10 \"Scattershot\")"
-	desc = "Allows for the construction of LBX AC 10."
-	id = "mech_scattershot"
+//Cyborg
+/datum/design/borg_suit
+	name = "Cyborg Endoskeleton"
+	id = "borg_suit"
 	build_type = MECHFAB
-	req_tech = list("combat" = 4)
-	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot
-	category = "Exosuit Equipment"
+	build_path = /obj/item/robot_parts/robot_suit
+	materials = list("$metal"=15000)
+	construction_time = 500
+	category = list("Cyborg")
 
-datum/design/mech_carbine
-	name = "Exosuit Weapon Design (FNX-66 Carbine)"
-	desc = "Allows for the construction of FNX-66 Carbine."
-	id = "mech_carbine"
+/datum/design/borg_chest
+	name = "Cyborg Torso"
+	id = "borg_chest"
 	build_type = MECHFAB
-	req_tech = list("combat" = 5, "materials" = 4)
-	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine
-	category = "Exosuit Equipment"
+	build_path = /obj/item/robot_parts/chest
+	materials = list("$metal"=40000)
+	construction_time = 350
+	category = list("Cyborg")
 
-datum/design/mech_ion
-	name = "Exosuit Weapon Design (MKIV Ion Heavy Cannon)"
-	desc = "Allows for the construction of MKIV Ion Heavy Cannon."
-	id = "mech_ion"
+/datum/design/borg_head
+	name = "Cyborg Head"
+	id = "borg_head"
 	build_type = MECHFAB
-	req_tech = list("combat" = 6, "magnets" = 5, "materials" = 5)
-	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion
-	category = "Exosuit Equipment"
+	build_path = /obj/item/robot_parts/head
+	materials = list("$metal"=5000)
+	construction_time = 350
+	category = list("Cyborg")
 
-datum/design/mech_laser
-	name = "Exosuit Weapon Design (CH-PS \"Immolator\" Laser)"
-	desc = "Allows for the construction of CH-PS Laser."
-	id = "mech_laser"
+/datum/design/borg_l_arm
+	name = "Cyborg Left Arm"
+	id = "borg_l_arm"
 	build_type = MECHFAB
-	req_tech = list("combat" = 3, "magnets" = 3)
-	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
-	category = "Exosuit Equipment"
+	build_path = /obj/item/robot_parts/l_arm
+	materials = list("$metal"=10000)
+	construction_time = 200
+	category = list("Cyborg")
 
-datum/design/mech_laser_heavy
-	name = "Exosuit Weapon Design (CH-LC \"Solaris\" Laser Cannon)"
-	desc = "Allows for the construction of CH-LC Laser Cannon."
-	id = "mech_laser_heavy"
+/datum/design/borg_r_arm
+	name = "Cyborg Right Arm"
+	id = "borg_r_arm"
 	build_type = MECHFAB
-	req_tech = list("combat" = 4, "magnets" = 4)
-	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy
-	category = "Exosuit Equipment"
+	build_path = /obj/item/robot_parts/r_arm
+	materials = list("$metal"=10000)
+	construction_time = 200
+	category = list("Cyborg")
 
-datum/design/mech_grenade_launcher
-	name = "Exosuit Weapon Design (SGL-6 Grenade Launcher)"
-	desc = "Allows for the construction of SGL-6 Grenade Launcher."
-	id = "mech_grenade_launcher"
+/datum/design/borg_l_leg
+	name = "Cyborg Left Leg"
+	id = "borg_l_leg"
 	build_type = MECHFAB
-	req_tech = list("combat" = 3)
-	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang
-	category = "Exosuit Equipment"
+	build_path = /obj/item/robot_parts/l_leg
+	materials = list("$metal"=10000)
+	construction_time = 200
+	category = list("Cyborg")
 
-datum/design/mech_missile_rack
-	name = "Exosuit Weapon Design (SRM-8 Missile Rack)"
-	desc = "Allows for the construction of SRM-8 Missile Rack."
-	id = "mech_missile_rack"
+/datum/design/borg_r_leg
+	name = "Cyborg Right Leg"
+	id = "borg_r_leg"
 	build_type = MECHFAB
-	req_tech = list("combat" = 6, "materials" = 6)
-	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack
-	category = "Exosuit Equipment"
+	build_path = /obj/item/robot_parts/r_leg
+	materials = list("$metal"=10000)
+	construction_time = 200
+	category = list("Cyborg")
 
-datum/design/clusterbang_launcher
-	name = "Exosuit Module Design (SOB-3 Clusterbang Launcher)"
-	desc = "A weapon that violates the Geneva Convention at 3 rounds per minute"
-	id = "clusterbang_launcher"
+//Ripley
+/datum/design/ripley_chassis
+	name = "Exosuit Chassis (APLU \"Ripley\")"
+	id = "ripley_chassis"
 	build_type = MECHFAB
-	req_tech = list("combat"= 5, "materials" = 5, "syndicate" = 3)
-	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang
-	category = "Exosuit Equipment"
+	build_path = /obj/item/mecha_parts/chassis/ripley
+	materials = list("$metal"=20000)
+	construction_time = 100
+	category = list("Ripley")
 
-datum/design/mech_wormhole_gen
-	name = "Exosuit Module Design (Localized Wormhole Generator)"
-	desc = "An exosuit module that allows generating of small quasi-stable wormholes."
-	id = "mech_wormhole_gen"
+//firefighter subtype
+/datum/design/firefighter_chassis
+	name = "Exosuit Chassis (APLU \"Firefighter\")"
+	id = "firefighter_chassis"
 	build_type = MECHFAB
-	req_tech = list("bluespace" = 3, "magnets" = 2)
-	build_path = /obj/item/mecha_parts/mecha_equipment/wormhole_generator
-	category = "Exosuit Equipment"
+	build_path = /obj/item/mecha_parts/chassis/firefighter
+	materials = list("$metal"=20000)
+	construction_time = 100
+	category = list("Firefighter")
 
-datum/design/mech_teleporter
-	name = "Exosuit Module Design (Teleporter Module)"
-	desc = "An exosuit module that allows exosuits to teleport to any position in view."
-	id = "mech_teleporter"
+/datum/design/ripley_torso
+	name = "Exosuit Torso (APLU \"Ripley\")"
+	id = "ripley_torso"
 	build_type = MECHFAB
-	req_tech = list("bluespace" = 10, "magnets" = 5)
-	build_path = /obj/item/mecha_parts/mecha_equipment/teleporter
-	category = "Exosuit Equipment"
+	build_path = /obj/item/mecha_parts/part/ripley_torso
+	materials = list("$metal"=20000, "$glass"=7500)
+	construction_time = 200
+	category = list("Ripley","Firefighter")
 
-datum/design/mech_rcd
-	name = "Exosuit Module Design (RCD Module)"
-	desc = "An exosuit-mounted Rapid Construction Device."
-	id = "mech_rcd"
+/datum/design/ripley_left_arm
+	name = "Exosuit Left Arm (APLU \"Ripley\")"
+	id = "ripley_left_arm"
 	build_type = MECHFAB
-	req_tech = list("materials" = 4, "bluespace" = 3, "magnets" = 4, "powerstorage"=4, "engineering" = 4)
-	build_path = /obj/item/mecha_parts/mecha_equipment/tool/rcd
-	category = "Exosuit Equipment"
+	build_path = /obj/item/mecha_parts/part/ripley_left_arm
+	materials = list("$metal"=15000)
+	construction_time = 150
+	category = list("Ripley","Firefighter")
 
-datum/design/mech_gravcatapult
-	name = "Exosuit Module Design (Gravitational Catapult Module)"
-	desc = "An exosuit mounted Gravitational Catapult."
-	id = "mech_gravcatapult"
+/datum/design/ripley_right_arm
+	name = "Exosuit Right Arm (APLU \"Ripley\")"
+	id = "ripley_right_arm"
 	build_type = MECHFAB
-	req_tech = list("bluespace" = 2, "magnets" = 3, "engineering" = 3)
-	build_path = /obj/item/mecha_parts/mecha_equipment/gravcatapult
-	category = "Exosuit Equipment"
+	build_path = /obj/item/mecha_parts/part/ripley_right_arm
+	materials = list("$metal"=15000)
+	construction_time = 150
+	category = list("Ripley","Firefighter")
 
-datum/design/mech_repair_droid
-	name = "Exosuit Module Design (Repair Droid Module)"
-	desc = "Automated Repair Droid. BEEP BOOP"
-	id = "mech_repair_droid"
+/datum/design/ripley_left_leg
+	name = "Exosuit Left Leg (APLU \"Ripley\")"
+	id = "ripley_left_leg"
 	build_type = MECHFAB
-	req_tech = list("magnets" = 3, "programming" = 3, "engineering" = 3)
-	build_path = /obj/item/mecha_parts/mecha_equipment/repair_droid
-	category = "Exosuit Equipment"
+	build_path = /obj/item/mecha_parts/part/ripley_left_leg
+	materials = list("$metal"=15000)
+	construction_time = 150
+	category = list("Ripley","Firefighter")
 
-datum/design/mech_plasma_generator
-	name = "Exosuit Module Design (Plasma Converter Module)"
-	desc = "Exosuit-mounted plasma converter."
-	id = "mech_plasma_generator"
+/datum/design/ripley_right_leg
+	name = "Exosuit Right Leg (APLU \"Ripley\")"
+	id = "ripley_right_leg"
 	build_type = MECHFAB
-	req_tech = list("plasmatech" = 2, "powerstorage"= 2, "engineering" = 2)
-	build_path = /obj/item/mecha_parts/mecha_equipment/generator
-	category = "Exosuit Equipment"
+	build_path = /obj/item/mecha_parts/part/ripley_right_leg
+	materials = list("$metal"=15000)
+	construction_time = 150
+	category = list("Ripley","Firefighter")
 
-datum/design/mech_energy_relay
-	name = "Exosuit Module Design (Tesla Energy Relay)"
-	desc = "Tesla Energy Relay"
-	id = "mech_energy_relay"
+//Odysseus
+/datum/design/odysseus_chassis
+	name = "Exosuit Chassis (\"Odysseus\")"
+	id = "odysseus_chassis"
 	build_type = MECHFAB
-	req_tech = list("magnets" = 4, "powerstorage" = 3)
-	build_path = /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay
-	category = "Exosuit Equipment"
+	build_path = /obj/item/mecha_parts/chassis/odysseus
+	materials = list("$metal"=20000)
+	construction_time = 100
+	category = list("Odysseus")
 
-datum/design/mech_ccw_armor
-	name = "Exosuit Module Design(Reactive Armor Booster Module)"
-	desc = "Exosuit-mounted armor booster."
-	id = "mech_ccw_armor"
+/datum/design/odysseus_torso
+	name = "Exosuit Torso (\"Odysseus\")"
+	id = "odysseus_torso"
 	build_type = MECHFAB
-	req_tech = list("materials" = 5, "combat" = 4)
-	build_path = /obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster
-	category = "Exosuit Equipment"
+	build_path = /obj/item/mecha_parts/part/odysseus_torso
+	materials = list("$metal"=12000)
+	construction_time = 180
+	category = list("Odysseus")
 
-datum/design/mech_proj_armor
-	name = "Exosuit Module Design(Reflective Armor Booster Module)"
-	desc = "Exosuit-mounted armor booster."
-	id = "mech_proj_armor"
+/datum/design/odysseus_head
+	name = "Exosuit Head (\"Odysseus\")"
+	id = "odysseus_head"
 	build_type = MECHFAB
-	req_tech = list("materials" = 5, "combat" = 5, "engineering"=3)
-	build_path = /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster
-	category = "Exosuit Equipment"
+	build_path = /obj/item/mecha_parts/part/odysseus_head
+	materials = list("$metal"=6000,"$glass"=10000)
+	construction_time = 100
+	category = list("Odysseus")
 
-datum/design/mech_syringe_gun
-	name = "Exosuit Module Design(Syringe Gun)"
-	desc = "Exosuit-mounted syringe gun and chemical synthesizer."
+/datum/design/odysseus_left_arm
+	name = "Exosuit Left Arm (\"Odysseus\")"
+	id = "odysseus_left_arm"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/odysseus_left_arm
+	materials = list("$metal"=6000)
+	construction_time = 120
+	category = list("Odysseus")
+
+/datum/design/odysseus_right_arm
+	name = "Exosuit Right Arm (\"Odysseus\")"
+	id = "odysseus_right_arm"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/odysseus_right_arm
+	materials = list("$metal"=6000)
+	construction_time = 120
+	category = list("Odysseus")
+
+/datum/design/odysseus_left_leg
+	name = "Exosuit Left Leg (\"Odysseus\")"
+	id = "odysseus_left_leg"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/odysseus_left_leg
+	materials = list("$metal"=7000)
+	construction_time = 130
+	category = list("Odysseus")
+
+/datum/design/odysseus_right_leg
+	name = "Exosuit Right Leg (\"Odysseus\")"
+	id = "odysseus_right_leg"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/odysseus_right_leg
+	materials = list("$metal"=7000)
+	construction_time = 130
+	category = list("Odysseus")
+
+/*/datum/design/odysseus_armor
+	name = "Exosuit Armor (\"Odysseus\")"
+	id = "odysseus_armor"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/odysseus_armor
+	materials = list("$metal"=15000)
+	construction_time = 200
+	category = list("Odysseus")
+	*/
+
+//Gygax
+/datum/design/gygax_chassis
+	name = "Exosuit Chassis (\"Gygax\")"
+	id = "gygax_chassis"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/chassis/gygax
+	materials = list("$metal"=20000)
+	construction_time = 100
+	category = list("Gygax")
+
+/datum/design/gygax_torso
+	name = "Exosuit Torso (\"Gygax\")"
+	id = "gygax_torso"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/gygax_torso
+	materials = list("$metal"=20000,"$glass"=10000,"$diamond"=2000)
+	construction_time = 300
+	category = list("Gygax")
+
+/datum/design/gygax_head
+	name = "Exosuit Head (\"Gygax\")"
+	id = "gygax_head"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/gygax_head
+	materials = list("$metal"=10000,"$glass"=5000, "$diamond"=2000)
+	construction_time = 200
+	category = list("Gygax")
+
+/datum/design/gygax_left_arm
+	name = "Exosuit Left Arm (\"Gygax\")"
+	id = "gygax_left_arm"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/gygax_left_arm
+	materials = list("$metal"=15000, "$diamond"=1000)
+	construction_time = 200
+	category = list("Gygax")
+
+/datum/design/gygax_right_arm
+	name = "Exosuit Right Arm (\"Gygax\")"
+	id = "gygax_right_arm"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/gygax_right_arm
+	materials = list("$metal"=15000, "$diamond"=1000)
+	construction_time = 200
+	category = list("Gygax")
+
+/datum/design/gygax_left_leg
+	name = "Exosuit Left Leg (\"Gygax\")"
+	id = "gygax_left_leg"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/gygax_left_leg
+	materials = list("$metal"=15000, "$diamond"=2000)
+	construction_time = 200
+	category = list("Gygax")
+
+/datum/design/gygax_right_leg
+	name = "Exosuit Right Leg (\"Gygax\")"
+	id = "gygax_right_leg"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/gygax_right_leg
+	materials = list("$metal"=15000, "$diamond"=2000)
+	construction_time = 200
+	category = list("Gygax")
+
+/datum/design/gygax_armor
+	name = "Exosuit Armor (\"Gygax\")"
+	id = "gygax_armor"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/gygax_armour
+	materials = list("$metal"=25000,"$diamond"=10000)
+	construction_time = 600
+	category = list("Gygax")
+
+//Durand
+/datum/design/durand_chassis
+	name = "Exosuit Chassis (\"Durand\")"
+	id = "durand_chassis"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/chassis/durand
+	materials = list("$metal"=25000)
+	construction_time = 100
+	category = list("Durand")
+
+/datum/design/durand_torso
+	name = "Exosuit Torso (\"Durand\")"
+	id = "durand_torso"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/durand_torso
+	materials = list("$metal"=25000,"$glass"=10000,"$silver"=10000)
+	construction_time = 300
+	category = list("Durand")
+
+/datum/design/durand_head
+	name = "Exosuit Head (\"Durand\")"
+	id = "durand_head"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/durand_head
+	materials = list("$metal"=10000,"$glass"=15000,"$silver"=2000)
+	construction_time = 200
+	category = list("Durand")
+
+/datum/design/durand_left_arm
+	name = "Exosuit Left Arm (\"Durand\")"
+	id = "durand_left_arm"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/durand_left_arm
+	materials = list("$metal"=10000,"$silver"=4000)
+	construction_time = 200
+	category = list("Durand")
+
+/datum/design/durand_right_arm
+	name = "Exosuit Right Arm (\"Durand\")"
+	id = "durand_right_arm"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/durand_right_arm
+	materials = list("$metal"=10000,"$silver"=4000)
+	construction_time = 200
+	category = list("Durand")
+
+/datum/design/durand_left_leg
+	name = "Exosuit Left Leg (\"Durand\")"
+	id = "durand_left_leg"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/durand_left_leg
+	materials = list("$metal"=15000,"$silver"=4000)
+	construction_time = 200
+	category = list("Durand")
+
+/datum/design/durand_right_leg
+	name = "Exosuit Right Leg (\"Durand\")"
+	id = "durand_right_leg"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/durand_right_leg
+	materials = list("$metal"=15000,"$silver"=4000)
+	construction_time = 200
+	category = list("Durand")
+
+/datum/design/durand_armor
+	name = "Exosuit Armor (\"Durand\")"
+	id = "durand_armor"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/durand_armor
+	materials = list("$metal"=50000,"$uranium"=30000)
+	construction_time = 600
+	category = list("Durand")
+
+//H.O.N.K
+/datum/design/honk_chassis
+	name = "Exosuit Chassis (\"H.O.N.K\")"
+	id = "honk_chassis"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/chassis/honker
+	materials = list("$metal"=20000)
+	construction_time = 100
+	category = list("H.O.N.K")
+
+/datum/design/honk_torso
+	name = "Exosuit Torso (\"H.O.N.K\")"
+	id = "honk_torso"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/honker_torso
+	materials = list("$metal"=20000,"$glass"=10000,"$bananium"=10000)
+	construction_time = 300
+	category = list("H.O.N.K")
+
+/datum/design/honk_head
+	name = "Exosuit Head (\"H.O.N.K\")"
+	id = "honk_head"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/honker_head
+	materials = list("$metal"=10000,"$glass"=5000,"$bananium"=5000)
+	construction_time = 200
+	category = list("H.O.N.K")
+
+/datum/design/honk_left_arm
+	name = "Exosuit Left Arm (\"H.O.N.K\")"
+	id = "honk_left_arm"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/honker_left_arm
+	materials = list("$metal"=15000,"$bananium"=5000)
+	construction_time = 200
+	category = list("H.O.N.K")
+
+/datum/design/honk_right_arm
+	name = "Exosuit Right Arm (\"H.O.N.K\")"
+	id = "honk_right_arm"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/honker_right_arm
+	materials = list("$metal"=15000,"$bananium"=5000)
+	construction_time = 200
+	category = list("H.O.N.K")
+
+/datum/design/honk_left_leg
+	name = "Exosuit Left Leg (\"H.O.N.K\")"
+	id = "honk_left_leg"
+	build_type = MECHFAB
+	build_path =/obj/item/mecha_parts/part/honker_left_leg
+	materials = list("$metal"=20000,"$bananium"=5000)
+	construction_time = 200
+	category = list("H.O.N.K")
+
+/datum/design/honk_right_leg
+	name = "Exosuit Right Leg (\"H.O.N.K\")"
+	id = "honk_right_leg"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/honker_right_leg
+	materials = list("$metal"=20000,"$bananium"=5000)
+	construction_time = 200
+	category = list("H.O.N.K")
+
+
+//Phazon
+/datum/design/phazon_chassis
+	name = "Exosuit Chassis (\"Phazon\")"
+	id = "phazon_chassis"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/chassis/phazon
+	materials = list("$metal"=20000)
+	construction_time = 100
+	category = list("Phazon")
+
+/datum/design/phazon_torso
+	name = "Exosuit Torso (\"Phazon\")"
+	id = "phazon_torso"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/phazon_torso
+	materials = list("$metal"=35000,"$glass"=10000,"$plasma"=20000)
+	construction_time = 300
+	category = list("Phazon")
+
+/datum/design/phazon_head
+	name = "Exosuit Head (\"Phazon\")"
+	id = "phazon_head"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/phazon_head
+	materials = list("$metal"=15000,"$glass"=5000,"$plasma"=10000)
+	construction_time = 200
+	category = list("Phazon")
+
+/datum/design/phazon_left_arm
+	name = "Exosuit Left Arm (\"Phazon\")"
+	id = "phazon_left_arm"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/phazon_left_arm
+	materials = list("$metal"=20000,"$plasma"=10000)
+	construction_time = 200
+	category = list("Phazon")
+
+/datum/design/phazon_right_arm
+	name = "Exosuit Right Arm (\"Phazon\")"
+	id = "phazon_right_arm"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/phazon_right_arm
+	materials = list("$metal"=20000,"$plasma"=10000)
+	construction_time = 200
+	category = list("Phazon")
+
+/datum/design/phazon_left_leg
+	name = "Exosuit Left Leg (\"Phazon\")"
+	id = "phazon_left_leg"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/phazon_left_leg
+	materials = list("$metal"=20000,"$plasma"=10000)
+	construction_time = 200
+	category = list("Phazon")
+
+/datum/design/phazon_right_leg
+	name = "Exosuit Right Leg (\"Phazon\")"
+	id = "phazon_right_leg"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/phazon_right_leg
+	materials = list("$metal"=20000,"$plasma"=10000)
+	construction_time = 200
+	category = list("Phazon")
+
+/datum/design/phazon_armor
+	name = "Exosuit Armor (\"Phazon\")"
+	id = "phazon_armor"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/part/phazon_armor
+	materials = list("$metal"=45000,"$plasma"=30000)
+	construction_time = 300
+	category = list("Phazon")
+
+//Exosuit Equipment
+/datum/design/mech_hydraulic_clamp
+	name = "Exosuit Engineering Equipement (Hydraulic Clamp)"
+	id = "mech_hydraulic_clamp"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp
+	materials = list("$metal"=10000)
+	construction_time = 100
+	category = list("Exosuit Equipment")
+
+/datum/design/mech_drill
+	name = "Exosuit Engineering Equipement (Drill)"
+	id = "mech_drill"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/mecha_equipment/tool/drill
+	materials = list("$metal"=10000)
+	construction_time = 100
+	category = list("Exosuit Equipment")
+
+/datum/design/mech_extinguisher
+	name = "Exosuit Engineering Equipement (Extinguisher)"
+	id = "mech_extinguisher"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/mecha_equipment/tool/extinguisher
+	materials = list("$metal"=10000)
+	construction_time = 100
+	category = list("Exosuit Equipment")
+
+/datum/design/mech_cable_layer
+	name = "Exosuit Engineering Equipement (Cable Layer)"
+	id = "mech_cable_layer"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/mecha_equipment/tool/cable_layer
+	materials = list("$metal"=10000)
+	construction_time = 100
+	category = list("Exosuit Equipment")
+
+/datum/design/mech_sleeper
+	name = "Exosuit Medical Equipement (Mounted Sleeper)"
+	id = "mech_sleeper"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/mecha_equipment/tool/sleeper
+	materials = list("$metal"=5000,"$glass"=10000)
+	construction_time = 100
+	category = list("Exosuit Equipment")
+
+/datum/design/mech_syringe_gun
+	name = "Exosuit Medical Equipement (Syringe Gun)"
 	id = "mech_syringe_gun"
 	build_type = MECHFAB
-	req_tech = list("materials" = 3, "biotech"=4, "magnets"=4, "programming"=3)
 	build_path = /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun
-	category = "Exosuit Equipment"
+	materials = list("$metal"=3000,"$glass"=2000)
+	construction_time = 200
+	category = list("Exosuit Equipment")
 
-datum/design/mech_diamond_drill
-	name = "Exosuit Module Design (Diamond Mining Drill)"
-	desc = "An upgraded version of the standard drill"
-	id = "mech_diamond_drill"
+/datum/design/mech_generator
+	name = "Exosuit Equipement (Plasma Generator)"
+	id = "mech_generator"
 	build_type = MECHFAB
-	req_tech = list("materials" = 4, "engineering" = 3)
-	build_path = /obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill
-	category = "Exosuit Equipment"
+	build_path = /obj/item/mecha_parts/mecha_equipment/generator
+	materials = list("$metal"=10000,"$glass"=1000,"$silver"=500)
+	construction_time = 100
+	category = list("Exosuit Equipment")
 
-datum/design/mech_generator_nuclear
-	name = "Exosuit Module Design (ExoNuclear Reactor)"
-	desc = "Compact nuclear reactor module"
-	id = "mech_generator_nuclear"
+/datum/design/mech_taser
+	name = "Exosuit Weapon (PBT \"Pacifier\" Mounted Taser)"
+	id = "mech_taser"
 	build_type = MECHFAB
-	req_tech = list("powerstorage"= 3, "engineering" = 3, "materials" = 3)
-	build_path = /obj/item/mecha_parts/mecha_equipment/generator/nuclear
-	category = "Exosuit Equipment"
+	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser
+	materials = list("$metal"=10000)
+	construction_time = 100
+	category = list("Exosuit Equipment")
+
+/datum/design/mech_lmg
+	name = "Exosuit Weapon (\"Ultra AC 2\" LMG)"
+	id = "mech_lmg"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg
+	materials = list("$metal"=10000)
+	construction_time = 100
+	category = list("Exosuit Equipment")
+
+/datum/design/mech_mousetrap_mortar
+	name = "H.O.N.K Mousetrap Mortar"
+	id = "mech_mousetrap_mortar"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar
+	materials = list("$metal"=20000,"$bananium"=5000)
+	construction_time = 300
+	category = list("Exosuit Equipment")
+
+/datum/design/mech_banana_mortar
+	name = "H.O.N.K Banana Mortar"
+	id = "mech_banana_mortar"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar
+	materials = list("$metal"=20000,"$bananium"=5000)
+	construction_time = 300
+	category = list("Exosuit Equipment")
+
+/datum/design/mech_honker
+	name = "HoNkER BlAsT 5000"
+	id = "mech_honker"
+	build_type = MECHFAB
+	build_path = /obj/item/mecha_parts/mecha_equipment/weapon/honker
+	materials = list("$metal"=20000,"$bananium"=10000)
+	construction_time = 500
+	category = list("Exosuit Equipment")
+
+//Cyborg Upgrade Modules
+/datum/design/borg_upgrade_reset
+	name = "Cyborg Upgrade Module (Reset Module)"
+	id = "borg_upgrade_reset"
+	build_type = MECHFAB
+	build_path = /obj/item/borg/upgrade/reset
+	materials = list("$metal"=10000)
+	construction_time = 120
+	category = list("Cyborg Upgrade Modules")
+
+/datum/design/borg_upgrade_rename
+	name = "Cyborg Upgrade Module (Rename Module)"
+	id = "borg_upgrade_rename"
+	build_type = MECHFAB
+	build_path = /obj/item/borg/upgrade/rename
+	materials = list("$metal"=35000)
+	construction_time = 120
+	category = list("Cyborg Upgrade Modules")
+
+/datum/design/borg_upgrade_restart
+	name = "Cyborg Upgrade Module (Restart Module)"
+	id = "borg_upgrade_restart"
+	build_type = MECHFAB
+	build_path = /obj/item/borg/upgrade/restart
+	materials = list("$metal"=60000 , "$glass"=5000)
+	construction_time = 120
+	category = list("Cyborg Upgrade Modules")
+
+/datum/design/borg_upgrade_vtec
+	name = "Cyborg Upgrade Module (VTEC Module)"
+	id = "borg_upgrade_vtec"
+	build_type = MECHFAB
+	build_path = /obj/item/borg/upgrade/vtec
+	materials = list("$metal"=80000 , "$glass"=6000 , "$gold"= 5000)
+	construction_time = 120
+	category = list("Cyborg Upgrade Modules")
+
+/datum/design/borg_upgrade_tasercooler
+	name = "Cyborg Upgrade Module (Rapid Taser Cooling Module)"
+	id = "borg_upgrade_tasercooler"
+	build_type = MECHFAB
+	build_path = /obj/item/borg/upgrade/tasercooler
+	materials = list("$metal"=80000 , "$glass"=6000 , "$gold"= 2000, "$diamond" = 500)
+	construction_time = 120
+	category = list("Cyborg Upgrade Modules")
+
+/datum/design/borg_upgrade_jetpack
+	name = "Cyborg Upgrade Module (Mining Jetpack)"
+	id = "borg_upgrade_jetpack"
+	build_type = MECHFAB
+	build_path = /obj/item/borg/upgrade/jetpack
+	materials = list("$metal"=10000,"$plasma"=15000,"$uranium" = 20000)
+	construction_time = 120
+	category = list("Cyborg Upgrade Modules")
+
+//Misc
+/datum/design/mecha_tracking
+	name = "Exosuit Tracking Beacon"
+	id = "mecha_tracking"
+	build_type = MECHFAB
+	build_path =/obj/item/mecha_parts/mecha_tracking
+	materials = list("$metal"=500)
+	construction_time = 50
+	category = list("Misc")

code/modules/research/destructive_analyzer.dm

@@ -9,6 +9,7 @@ Note: Must be placed within 3 tiles of the R&D Console
 */
 /obj/machinery/r_n_d/destructive_analyzer
 	name = "Destructive Analyzer"
+	desc = "Learn science by destroying things!"
 	icon_state = "d_analyzer"
 	var/obj/item/weapon/loaded_item = null
 	var/decon_mod = 0
@@ -16,10 +17,10 @@ Note: Must be placed within 3 tiles of the R&D Console
 /obj/machinery/r_n_d/destructive_analyzer/New()
 	..()
 	component_parts = list()
-	component_parts += new /obj/item/weapon/circuitboard/destructive_analyzer(src)
-	component_parts += new /obj/item/weapon/stock_parts/scanning_module(src)
-	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
-	component_parts += new /obj/item/weapon/stock_parts/micro_laser(src)
+	component_parts += new /obj/item/weapon/circuitboard/destructive_analyzer(null)
+	component_parts += new /obj/item/weapon/stock_parts/scanning_module(null)
+	component_parts += new /obj/item/weapon/stock_parts/manipulator(null)
+	component_parts += new /obj/item/weapon/stock_parts/micro_laser(null)
 	RefreshParts()
 
 /obj/machinery/r_n_d/destructive_analyzer/RefreshParts()
@@ -28,9 +29,6 @@ Note: Must be placed within 3 tiles of the R&D Console
 		T += S.rating
 	decon_mod = T
 
-/obj/machinery/r_n_d/destructive_analyzer/meteorhit()
-	del(src)
-	return
 
 /obj/machinery/r_n_d/destructive_analyzer/proc/ConvertReqString2List(var/list/source_list)
 	var/list/temp_list = params2list(source_list)
@@ -39,68 +37,45 @@ Note: Must be placed within 3 tiles of the R&D Console
 	return temp_list
 
 
-/obj/machinery/r_n_d/destructive_analyzer/attackby(var/obj/O as obj, var/mob/user as mob)
+/obj/machinery/r_n_d/destructive_analyzer/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	if (shocked)
 		shock(user,50)
-		
-	if (istype(O, /obj/item/weapon/screwdriver))
-		if (default_deconstruction_screwdriver(user, "d_analyzer_t", "d_analyzer", O))
-			if(linked_console)
-				linked_console.linked_destroy = null
-				linked_console = null
-		return 1
-	
+	if (default_deconstruction_screwdriver(user, "d_analyzer_t", "d_analyzer", O))
+		if(linked_console)
+			linked_console.linked_destroy = null
+			linked_console = null
+		return
+
 	if(exchange_parts(user, O))
-		return 1
-		
-	if (panel_open)
-		if(istype(O, /obj/item/weapon/crowbar))
-			default_deconstruction_crowbar(O)
-			return 1
-		else
-			user << "\red You can't load the [src.name] while it's opened."
-			return 1
+		return
+
+	default_deconstruction_crowbar(O)
+
 	if (disabled)
 		return
 	if (!linked_console)
-		user << "\red The protolathe must be linked to an R&D console first!"
+		user << "<span class='warning'>The [src.name] must be linked to an R&D console first!</span>"
 		return
 	if (busy)
-		user << "\red The protolathe is busy right now."
+		user << "<span class='warning'>The [src.name] is busy right now.</span>"
 		return
 	if (istype(O, /obj/item) && !loaded_item)
-		if(isrobot(user)) //Don't put your module items in there!
-			return
 		if(!O.origin_tech)
-			user << "\red This doesn't seem to have a tech origin!"
+			user << "<span class='warning'>This doesn't seem to have a tech origin!</span>"
 			return
 		var/list/temp_tech = ConvertReqString2List(O.origin_tech)
 		if (temp_tech.len == 0)
-			user << "\red You cannot deconstruct this item!"
+			user << "<span class='warning'>You cannot deconstruct this item!</span>"
 			return
-		if(O.reliability < 90 && O.crit_fail == 0)
-			usr << "\red Item is neither reliable enough or broken enough to learn from."
+		if(!user.drop_item())
+			user << "<span class='warning'>\The [O] is stuck to your hand, you cannot put it in the [src.name]!</span>"
 			return
 		busy = 1
 		loaded_item = O
-		user.drop_item()
 		O.loc = src
-		user << "\blue You add the [O.name] to the machine!"
+		user << "<span class='notice'>You add the [O.name] to the [src.name]!</span>"
 		flick("d_analyzer_la", src)
 		spawn(10)
 			icon_state = "d_analyzer_l"
 			busy = 0
-
-	if(exchange_parts(user, O))
-		return
 	return
-
-//For testing purposes only.
-/*/obj/item/weapon/deconstruction_test
-	name = "Test Item"
-	desc = "WTF?"
-	icon = 'icons/obj/weapons.dmi'
-	icon_state = "d20"
-	g_amt = 5000
-	m_amt = 5000
-	origin_tech = "materials=5;plasmatech=5;syndicate=5;programming=9"*/

code/modules/research/protolathe.dm

@@ -9,12 +9,12 @@ Note: Must be placed west/left of and R&D console to function.
 */
 /obj/machinery/r_n_d/protolathe
 	name = "Protolathe"
+	desc = "Converts raw materials into useful objects."
 	icon_state = "protolathe"
 	flags = OPENCONTAINER
 
 	var/max_material_storage = 100000 //All this could probably be done better with a list but meh.
 	var/m_amount = 0.0
-	var/plasteel_amount = 0.0
 	var/g_amount = 0.0
 	var/gold_amount = 0.0
 	var/silver_amount = 0.0
@@ -24,6 +24,8 @@ Note: Must be placed west/left of and R&D console to function.
 	var/clown_amount = 0.0
 	var/efficiency_coeff
 
+	reagents = new()
+
 
 /obj/machinery/r_n_d/protolathe/New()
 	..()
@@ -37,17 +39,15 @@ Note: Must be placed west/left of and R&D console to function.
 	component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src)
 	RefreshParts()
 
+	reagents.my_atom = src
+
 /obj/machinery/r_n_d/protolathe/proc/TotalMaterials() //returns the total of all the stored materials. Makes code neater.
 	return m_amount + g_amount + gold_amount + silver_amount + plasma_amount + uranium_amount + diamond_amount + clown_amount
 
 /obj/machinery/r_n_d/protolathe/RefreshParts()
 	var/T = 0
 	for(var/obj/item/weapon/reagent_containers/glass/G in component_parts)
-		T += G.reagents.maximum_volume
-	var/datum/reagents/R = new/datum/reagents(T)		//Holder for the reagents used as materials.
-	reagents = R
-	R.my_atom = src
-	T = 0
+		G.reagents.trans_to(src, G.reagents.total_volume)
 	for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts)
 		T += M.rating
 	max_material_storage = T * 75000
@@ -56,20 +56,42 @@ Note: Must be placed west/left of and R&D console to function.
 		T += (M.rating/3)
 	efficiency_coeff = max(T, 1)
 
-/obj/machinery/r_n_d/protolathe/attackby(var/obj/item/O as obj, var/mob/user as mob)
-	if(exchange_parts(user, O))
-		return 1
+/obj/machinery/r_n_d/protolathe/proc/check_mat(datum/design/being_built, var/M)	// now returns how many times the item can be built with the material
+	var/A = 0
+	switch(M)
+		if("$metal")
+			A = m_amount
+		if("$glass")
+			A = g_amount
+		if("$gold")
+			A = gold_amount
+		if("$silver")
+			A = silver_amount
+		if("$plasma")
+			A = plasma_amount
+		if("$uranium")
+			A = uranium_amount
+		if("$diamond")
+			A = diamond_amount
+		if("$bananium")
+			A = clown_amount
+		else
+			A = reagents.get_reagent_amount(M)
+	A = A / max(1, (being_built.materials[M]/efficiency_coeff))
+	return A
 
+/obj/machinery/r_n_d/protolathe/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	if (shocked)
-		shock(user,50)	
-		
-	if (istype(O, /obj/item/weapon/screwdriver))
-		if (default_deconstruction_screwdriver(user, "protolathe_t", "protolathe", O))
-			if(linked_console)
-				linked_console.linked_imprinter = null
-				linked_console = null
-		return 1
-			
+		shock(user,50)
+	if (default_deconstruction_screwdriver(user, "protolathe_t", "protolathe", O))
+		if(linked_console)
+			linked_console.linked_lathe = null
+			linked_console = null
+		return
+
+	if(exchange_parts(user, O))
+		return
+
 	if (panel_open)
 		if(istype(O, /obj/item/weapon/crowbar))
 			for(var/obj/I in component_parts)
@@ -78,106 +100,94 @@ Note: Must be placed west/left of and R&D console to function.
 				if(I.reliability != 100 && crit_fail)
 					I.crit_fail = 1
 				I.loc = src.loc
-			if(m_amount >= 3750)
+			for(var/obj/item/weapon/reagent_containers/glass/G in component_parts)
+				reagents.trans_to(G, G.reagents.maximum_volume)
+			if(m_amount >= MINERAL_MATERIAL_AMOUNT)
 				var/obj/item/stack/sheet/metal/G = new /obj/item/stack/sheet/metal(src.loc)
 				G.amount = round(m_amount / G.perunit)
-			if(g_amount >= 3750)
+			if(g_amount >= MINERAL_MATERIAL_AMOUNT)
 				var/obj/item/stack/sheet/glass/G = new /obj/item/stack/sheet/glass(src.loc)
 				G.amount = round(g_amount / G.perunit)
-			if(plasteel_amount >= 2000)
-				var/obj/item/stack/sheet/plasteel/G = new /obj/item/stack/sheet/plasteel(src.loc)
-				G.amount = round(plasteel_amount / G.perunit)
-			if(plasma_amount >= 2000)
+			if(plasma_amount >= MINERAL_MATERIAL_AMOUNT)
 				var/obj/item/stack/sheet/mineral/plasma/G = new /obj/item/stack/sheet/mineral/plasma(src.loc)
 				G.amount = round(plasma_amount / G.perunit)
-			if(silver_amount >= 2000)
+			if(silver_amount >= MINERAL_MATERIAL_AMOUNT)
 				var/obj/item/stack/sheet/mineral/silver/G = new /obj/item/stack/sheet/mineral/silver(src.loc)
 				G.amount = round(silver_amount / G.perunit)
-			if(gold_amount >= 2000)
+			if(gold_amount >= MINERAL_MATERIAL_AMOUNT)
 				var/obj/item/stack/sheet/mineral/gold/G = new /obj/item/stack/sheet/mineral/gold(src.loc)
 				G.amount = round(gold_amount / G.perunit)
-			if(uranium_amount >= 2000)
+			if(uranium_amount >= MINERAL_MATERIAL_AMOUNT)
 				var/obj/item/stack/sheet/mineral/uranium/G = new /obj/item/stack/sheet/mineral/uranium(src.loc)
 				G.amount = round(uranium_amount / G.perunit)
-			if(diamond_amount >= 2000)
+			if(diamond_amount >= MINERAL_MATERIAL_AMOUNT)
 				var/obj/item/stack/sheet/mineral/diamond/G = new /obj/item/stack/sheet/mineral/diamond(src.loc)
 				G.amount = round(diamond_amount / G.perunit)
-			if(clown_amount >= 2000)
+			if(clown_amount >= MINERAL_MATERIAL_AMOUNT)
 				var/obj/item/stack/sheet/mineral/clown/G = new /obj/item/stack/sheet/mineral/clown(src.loc)
 				G.amount = round(clown_amount / G.perunit)
 			default_deconstruction_crowbar(O)
 			return 1
 		else
-			user << "\red You can't load the [src.name] while it's opened."
+			user << "<span class='warning'>You can't load the [src.name] while it's opened.</span>"
 			return 1
 	if (disabled)
 		return
 	if (!linked_console)
-		user << "\The protolathe must be linked to an R&D console first!"
+		user << "<span class='warning'> The [src.name] must be linked to an R&D console first!</span>"
+		return 1
+	if (busy)
+		user << "<span class='warning'>The [src.name] is busy. Please wait for completion of previous operation.</span>"
 		return 1
 	if (O.is_open_container())
 		return
-	if (busy)
-		user << "\red The protolathe is busy. Please wait for completion of previous operation."
-		return 1
-	if (!istype(O, /obj/item/stack/sheet))
-		user << "\red You cannot insert this item into the protolathe!"
+	if (!istype(O, /obj/item/stack/sheet) || istype(O, /obj/item/stack/sheet/wood))
+		user << "<span class='warning'>You cannot insert this item into the [src.name]!</span>"
 		return 1
 	if (stat)
 		return 1
 	if(istype(O,/obj/item/stack/sheet))
 		var/obj/item/stack/sheet/S = O
 		if (TotalMaterials() + S.perunit > max_material_storage)
-			user << "\red The protolathe's material bin is full. Please remove material before adding more."
+			user << "<span class='warning'>The [src.name]'s material bin is full. Please remove material before adding more.</span>"
 			return 1
 
 	var/obj/item/stack/sheet/stack = O
 	var/amount = round(input("How many sheets do you want to add?") as num)//No decimals
-	if(!O)
-		return
-	if(amount < 0)//No negative numbers
-		amount = 0
-	if(amount == 0)
+	if(!stack || stack.amount <= 0 || amount <= 0)
 		return
 	if(amount > stack.amount)
 		amount = stack.amount
 	if(max_material_storage - TotalMaterials() < (amount*stack.perunit))//Can't overfill
 		amount = min(stack.amount, round((max_material_storage-TotalMaterials())/stack.perunit))
 
+	icon_state = "protolathe"
+	busy = 1
+	use_power(max(1000, (MINERAL_MATERIAL_AMOUNT*amount/10)))
+	user << "<span class='notice'>You add [amount] sheets to the [src.name].</span>"
+	icon_state = "protolathe"
+	if(istype(stack, /obj/item/stack/sheet/metal))
+		m_amount += amount * MINERAL_MATERIAL_AMOUNT
+	else if(istype(stack, /obj/item/stack/sheet/glass))
+		g_amount += amount * MINERAL_MATERIAL_AMOUNT
+	else if(istype(stack, /obj/item/stack/sheet/mineral/gold))
+		gold_amount += amount * MINERAL_MATERIAL_AMOUNT
+	else if(istype(stack, /obj/item/stack/sheet/mineral/silver))
+		silver_amount += amount * MINERAL_MATERIAL_AMOUNT
+	else if(istype(stack, /obj/item/stack/sheet/mineral/plasma))
+		plasma_amount += amount * MINERAL_MATERIAL_AMOUNT
+	else if(istype(stack, /obj/item/stack/sheet/mineral/uranium))
+		uranium_amount += amount * MINERAL_MATERIAL_AMOUNT
+	else if(istype(stack, /obj/item/stack/sheet/mineral/diamond))
+		diamond_amount += amount * MINERAL_MATERIAL_AMOUNT
+	else if(istype(stack, /obj/item/stack/sheet/mineral/clown))
+		clown_amount += amount * MINERAL_MATERIAL_AMOUNT
+	stack.use(amount)
+	busy = 0
+	src.updateUsrDialog()
+
 	src.overlays += "protolathe_[stack.name]"
 	sleep(10)
 	src.overlays -= "protolathe_[stack.name]"
 
-	icon_state = "protolathe"
-	busy = 1
-	use_power(max(1000, (3750*amount/10)))
-	var/stacktype = stack.type
-	stack.use(amount)
-	if (do_after(user, 16))
-		user << "\blue You add [amount] sheets to the [src.name]."
-		icon_state = "protolathe"
-		switch(stacktype)
-			if(/obj/item/stack/sheet/metal)
-				m_amount += amount * 3750
-			if(/obj/item/stack/sheet/glass)
-				g_amount += amount * 3750
-			if(/obj/item/stack/sheet/plasteel)
-				plasteel_amount += amount * 2000
-			if(/obj/item/stack/sheet/mineral/gold)
-				gold_amount += amount * 2000
-			if(/obj/item/stack/sheet/mineral/silver)
-				silver_amount += amount * 2000
-			if(/obj/item/stack/sheet/mineral/plasma)
-				plasma_amount += amount * 2000
-			if(/obj/item/stack/sheet/mineral/uranium)
-				uranium_amount += amount * 2000
-			if(/obj/item/stack/sheet/mineral/diamond)
-				diamond_amount += amount * 2000
-			if(/obj/item/stack/sheet/mineral/clown)
-				clown_amount += amount * 2000
-	else
-		new stacktype(src.loc, amount)
-	busy = 0
-	src.updateUsrDialog()
 	return
-	

code/modules/research/rdmachines.dm

@@ -17,7 +17,6 @@
 	var/hack_wire
 	var/disable_wire
 	var/shock_wire
-	var/opened = 0
 	var/obj/machinery/computer/rdconsole/linked_console
 
 /obj/machinery/r_n_d/New()
@@ -53,7 +52,7 @@
 /obj/machinery/r_n_d/attack_hand(mob/user as mob)
 	if (shocked)
 		shock(user,50)
-	if(opened)
+	if(panel_open)
 		var/dat as text
 		dat += "[src.name] Wires:<BR>"
 		for(var/wire in src.wires)

code/modules/research/research.dm

@@ -82,34 +82,11 @@ research holder datum.
 /datum/research/proc/DesignHasReqs(var/datum/design/D)
 	if(D.req_tech.len == 0)
 		return 1
-	var/matches = 0
-	var/list/k_tech = list()
-	for(var/datum/tech/known in known_tech)
-		k_tech[known.id] = known.level
-	for(var/req in D.req_tech)
-		if(!isnull(k_tech[req]) && k_tech[req] >= D.req_tech[req])
-			matches++
-	if(matches == D.req_tech.len)
-		return 1
-	else
-		return 0
-/*
-//Checks to see if design has all the required pre-reqs.
-//Input: datum/design; Output: 0/1 (false/true)
-/datum/research/proc/DesignHasReqs(var/datum/design/D)
-	if(D.req_tech.len == 0)
-		return 1
-	var/matches = 0
-	for(var/req in D.req_tech)
-		for(var/datum/tech/known in known_tech)
-			if((req == known.id) && (known.level >= D.req_tech[req]))
-				matches++
-				break
-	if(matches == D.req_tech.len)
-		return 1
-	else
-		return 0
-*/
+	for(var/datum/tech/T in known_tech)
+		if((D.req_tech[T.id]) && (T.level < D.req_tech[T.id]))
+			return 0
+	return 1
+
 //Adds a tech to known_tech list. Checks to make sure there aren't duplicates and updates existing tech's levels if needed.
 //Input: datum/tech; Output: Null
 /datum/research/proc/AddTech2Known(var/datum/tech/T)
@@ -153,15 +130,16 @@ research holder datum.
 			if(KT.level <= level) KT.level = max((KT.level + 1), (level - 1))
 	return
 
-/datum/research/proc/UpdateDesign(var/path)
-	for(var/datum/design/KD in known_designs)
-		if(KD.build_path == path)
-			KD.reliability_mod += rand(1,2)
-			break
-	return
-
-
-
+/datum/research/proc/UpdateDesigns(var/obj/item/I, var/list/temp_tech)
+	for(var/T in temp_tech)
+		if(temp_tech[T] - 1 >= known_tech[T])
+			for(var/datum/design/D in known_designs)
+				if(D.req_tech[T])
+					D.reliability = min(100, D.reliability + 1)
+					if(D.build_path == I.type)
+						D.reliability = min(100, D.reliability + rand(1,3))
+						if(I.crit_fail)
+							D.reliability = min(100, D.reliability + rand(3, 5))
 
 /***************************************************************
 **						Technology Datums					  **
@@ -183,37 +161,37 @@ datum/tech/materials
 	name = "Materials Research"
 	desc = "Development of new and improved materials."
 	id = "materials"
-	max_level=7
+	max_level = 7
 
 datum/tech/engineering
 	name = "Engineering Research"
 	desc = "Development of new and improved engineering parts and."
 	id = "engineering"
-	max_level=5
+	max_level = 5
 
 datum/tech/plasmatech
 	name = "Plasma Research"
 	desc = "Research into the mysterious substance colloqually known as 'plasma'."
 	id = "plasmatech"
-	max_level=4
+	max_level = 4
 
 datum/tech/powerstorage
 	name = "Power Manipulation Technology"
 	desc = "The various technologies behind the storage and generation of electicity."
 	id = "powerstorage"
-	max_level=6
+	max_level = 6
 
 datum/tech/bluespace
 	name = "'Blue-space' Research"
 	desc = "Research into the sub-reality known as 'blue-space'"
 	id = "bluespace"
-	max_level=6
+	max_level = 6
 
 datum/tech/biotech
 	name = "Biological Technology"
 	desc = "Research into the deeper mysteries of life and organic substances."
 	id = "biotech"
-	max_level=5
+	max_level = 5
 
 datum/tech/combat
 	name = "Combat Systems Research"
@@ -225,19 +203,19 @@ datum/tech/magnets
 	name = "Electromagnetic Spectrum Research"
 	desc = "Research into the electromagnetic spectrum. No clue how they actually work, though."
 	id = "magnets"
-	max_level=5
+	max_level = 5
 
 datum/tech/programming
 	name = "Data Theory Research"
 	desc = "The development of new computer and artificial intelligence and data storage systems."
 	id = "programming"
-	max_level=5
+	max_level = 5
 
 datum/tech/syndicate
 	name = "Illegal Technologies Research"
 	desc = "The study of technologies that violate standard Nanotrasen regulations."
 	id = "syndicate"
-	max_level=0 // Don't count towards maxed research, since it's illegal.
+	max_level = 0 // Don't count towards maxed research, since it's illegal.
 
 /*
 datum/tech/arcane
@@ -266,7 +244,6 @@ datum/tech/robotics
 	req_tech = list("materials" = 3, "programming" = 3)
 */
 
-
 /obj/item/weapon/disk/tech_disk
 	name = "Technology Disk"
 	desc = "A disk for storing technology data for further research."
@@ -279,5 +256,20 @@ datum/tech/robotics
 	var/datum/tech/stored
 
 /obj/item/weapon/disk/tech_disk/New()
+	src.pixel_x = rand(-5.0, 5)
+	src.pixel_y = rand(-5.0, 5)
+	
+/obj/item/weapon/disk/design_disk
+	name = "Component Design Disk"
+	desc = "A disk for storing device design data for construction in lathes."
+	icon = 'icons/obj/cloning.dmi'
+	icon_state = "datadisk2"
+	item_state = "card-id"
+	w_class = 1.0
+	m_amt = 30
+	g_amt = 10
+	var/datum/design/blueprint
+
+/obj/item/weapon/disk/design_disk/New()
 	src.pixel_x = rand(-5.0, 5)
 	src.pixel_y = rand(-5.0, 5)