From 0e32d72fc2f304bfc0b43c4f94d6fee638ec179d Mon Sep 17 00:00:00 2001
From: Rob Nelson <nexisentertainment@gmail.com>
Date: Mon, 16 Dec 2013 06:35:45 -0800
Subject: [PATCH] Fixes #3, hopefully.

---
 code/game/dna/dna_modifier.dm      | 13 ------------
 code/game/mecha/mech_fabricator.dm | 33 ++----------------------------
 2 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
index ba43b2b59a0..3b87e71fafe 100644
--- a/code/game/dna/dna_modifier.dm
+++ b/code/game/dna/dna_modifier.dm
@@ -81,12 +81,6 @@
 	usr.loc = src
 	src.occupant = usr
 	src.icon_state = "scanner_1"
-	/*
-	for(var/obj/O in src)    // THIS IS P. STUPID -- LOVE, DOOHL
-		//O = null
-		del(O)
-		//Foreach goto(124)
-	*/
 	src.add_fingerprint(usr)
 	return
 
@@ -146,13 +140,6 @@
 /obj/machinery/dna_scannernew/proc/go_out()
 	if ((!( src.occupant ) || src.locked))
 		return
-/*
-//	it's like this was -just- here to break constructed dna scanners -Pete
-//	if that's not the case, slap my shit and uncomment this.
-//	for(var/obj/O in src)
-//		O.loc = src.loc
-*/
-		//Foreach goto(30)
 	if (src.occupant.client)
 		src.occupant.client.eye = src.occupant.client.mob
 		src.occupant.client.perspective = MOB_PERSPECTIVE
diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm
index ee98ab1b766..75de0e4e006 100644
--- a/code/game/mecha/mech_fabricator.dm
+++ b/code/game/mecha/mech_fabricator.dm
@@ -282,30 +282,6 @@
 		if(part_sets[i]==set_name)
 			part_sets.Cut(i,++i)
 	return
-/*
-	proc/sanity_check()
-		for(var/p in resources)
-			var/index = resources.Find(p)
-			index = resources.Find(p, ++index)
-			if(index) //duplicate resource
-				world << "Duplicate resource definition for [src](\ref[src])"
-				return 0
-		for(var/set_name in part_sets)
-			var/index = part_sets.Find(set_name)
-			index = part_sets.Find(set_name, ++index)
-			if(index) //duplicate part set
-				world << "Duplicate part set definition for [src](\ref[src])"
-				return 0
-		return 1
-*/
-/*
-	New()
-		..()
-		src.add_part_to_set("Test",list("result"="/obj/item/mecha_parts/part/gygax_armour","time"=600,"metal"=75000,"diamond"=10000))
-		src.add_part_to_set("Test",list("result"="/obj/item/mecha_parts/part/ripley_left_arm","time"=200,"metal"=25000))
-		src.remove_part_set("Gygax")
-		return
-*/
 
 /obj/machinery/mecha_part_fabricator/proc/output_parts_list(set_name)
 	var/output = ""
@@ -495,12 +471,6 @@
 
 
 /obj/machinery/mecha_part_fabricator/proc/sync(silent=null)
-/*		if(queue.len)
-			if(!silent)
-				temp = "Error.  Please clear processing queue before updating!"
-				src.updateUsrDialog()
-			return
-*/
 	if(!silent)
 		temp = "Updating local R&D database..."
 		src.updateUsrDialog()
@@ -525,8 +495,9 @@
 	return
 
 /obj/machinery/mecha_part_fabricator/proc/get_resource_cost_w_coeff(var/obj/item/part as obj,var/resource as text, var/roundto=1)
-//Be SURE to add any new equipment to this switch, but don't be suprised if it spits out children objects
 	if(part.vars.Find("construction_time") && part.vars.Find("construction_cost"))
+		if (resource=="iron" && !("iron" in part:construction_cost))
+			resource="metal"
 		return round(part:construction_cost[resource]*resource_coeff, roundto)
 	else
 		return 0