From c118f8a3ce6ef6a19ad76d9f68265609206a8421 Mon Sep 17 00:00:00 2001
From: ikarrus <ericgfwong@hotmail.com>
Date: Fri, 15 Aug 2014 19:25:50 -0600
Subject: [PATCH 1/2] Ore Redemption Machine can now Smelt Plasteel

We've been seeing plasteel production plummet to basically zero simply because the only way to do it was via the production line that:
A) Is sealed off with wooden barriers and
B) Does not give any point rewards
---
 code/modules/mining/equipment_locker.dm | 27 +++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index aa118b234d1..ebcae0e7608 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -3,7 +3,7 @@
 
 /obj/machinery/mineral/ore_redemption
 	name = "ore redemption machine"
-	desc = "A machine that accepts ore and instantly transforms it into workable material sheets, but cannot produce alloys such as Plasteel. Points for ore are generated based on type and can be redeemed at a mining equipment vendor."
+	desc = "A machine that accepts ore and instantly transforms it into workable material sheets. Points for ore are generated based on type and can be redeemed at a mining equipment vendor."
 	icon = 'icons/obj/machines/mining_machines.dmi'
 	icon_state = "ore_redemption"
 	density = 1
@@ -36,7 +36,7 @@
 			stack_list[processed_sheet] = s
 			if(s.name != "glass" && s.name != "metal")		//we can get these from cargo anyway
 				var/msg = "[capitalize(s.name)] sheets are now available in the Cargo Bay."
-				for(var/obj/machinery/requests_console/D in allConsoles)		
+				for(var/obj/machinery/requests_console/D in allConsoles)
 					if(D.department == "Science" || D.department == "Robotics" || D.department == "Research Director's Desk" || (D.department == "Chemistry" && (s.name == "uranium" || s.name == "solid plasma")))
 						D.createmessage("Ore Redemption Machine", "New minerals available!", msg, 1, 0)
 		var/obj/item/stack/sheet/storage = stack_list[processed_sheet]
@@ -118,6 +118,13 @@
 		if(s.amount > 0)
 			dat += text("[capitalize(s.name)]: [s.amount] <A href='?src=\ref[src];release=[s.type]'>Release</A><br>")
 
+	if(!(/obj/item/stack/sheet/metal in stack_list)) return
+	if(!(/obj/item/stack/sheet/mineral/plasma in stack_list)) return
+	var/obj/item/stack/sheet/metalstack = stack_list[/obj/item/stack/sheet/metal]
+	var/obj/item/stack/sheet/plasmastack = stack_list[/obj/item/stack/sheet/mineral/plasma]
+	if(min(metalstack.amount, plasmastack.amount))
+		dat += text("Plasteel Alloy (Metal + Plasma): <A href='?src=\ref[src];plasteel=1'>Smelt</A><BR>")
+
 	dat += text("<HR><b>Mineral Value List:</b><BR>[get_ore_values()]")
 
 	user << browse("[dat]", "window=console_stacking_machine")
@@ -166,6 +173,22 @@
 				unload_mineral(out)
 		else
 			usr << "<span class='warning'>Required access not found.</span>"
+	if(href_list["plasteel"] && istype(inserted_id))
+		if(check_access(inserted_id))
+			if(!(/obj/item/stack/sheet/metal in stack_list)) return
+			if(!(/obj/item/stack/sheet/mineral/plasma in stack_list)) return
+			var/obj/item/stack/sheet/metalstack = stack_list[/obj/item/stack/sheet/metal]
+			var/obj/item/stack/sheet/plasmastack = stack_list[/obj/item/stack/sheet/mineral/plasma]
+
+			var/desired = input("How much?", "How much would you like to smelt?", 1) as num
+			var/obj/item/stack/sheet/plasteel/plasteelout = new
+			plasteelout.amount = min(desired,50,metalstack.amount,plasmastack.amount)
+			if(plasteelout.amount >= 1)
+				metalstack.amount -= plasteelout.amount
+				plasmastack.amount -= plasteelout.amount
+				unload_mineral(plasteelout)
+		else
+			usr << "<span class='warning'>Required access not found.</span>"
 	updateUsrDialog()
 	return
 

From 7a988c64978200dc3a3bbff45e2a15e06cfdfe6d Mon Sep 17 00:00:00 2001
From: ikarrus <ericgfwong@hotmail.com>
Date: Sat, 16 Aug 2014 10:09:37 -0600
Subject: [PATCH 2/2] Removing a premature return

---
 code/modules/mining/equipment_locker.dm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index ebcae0e7608..56289fd60c7 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -118,12 +118,11 @@
 		if(s.amount > 0)
 			dat += text("[capitalize(s.name)]: [s.amount] <A href='?src=\ref[src];release=[s.type]'>Release</A><br>")
 
-	if(!(/obj/item/stack/sheet/metal in stack_list)) return
-	if(!(/obj/item/stack/sheet/mineral/plasma in stack_list)) return
-	var/obj/item/stack/sheet/metalstack = stack_list[/obj/item/stack/sheet/metal]
-	var/obj/item/stack/sheet/plasmastack = stack_list[/obj/item/stack/sheet/mineral/plasma]
-	if(min(metalstack.amount, plasmastack.amount))
-		dat += text("Plasteel Alloy (Metal + Plasma): <A href='?src=\ref[src];plasteel=1'>Smelt</A><BR>")
+	if((/obj/item/stack/sheet/metal in stack_list) && (/obj/item/stack/sheet/mineral/plasma in stack_list))
+		var/obj/item/stack/sheet/metalstack = stack_list[/obj/item/stack/sheet/metal]
+		var/obj/item/stack/sheet/plasmastack = stack_list[/obj/item/stack/sheet/mineral/plasma]
+		if(min(metalstack.amount, plasmastack.amount))
+			dat += text("Plasteel Alloy (Metal + Plasma): <A href='?src=\ref[src];plasteel=1'>Smelt</A><BR>")
 
 	dat += text("<HR><b>Mineral Value List:</b><BR>[get_ore_values()]")