From 11562a8e039122fed7777f0b335f51e7a088c3b4 Mon Sep 17 00:00:00 2001
From: Crazylemon <tlrgue17@gmail.com>
Date: Tue, 1 Dec 2015 22:19:54 -0800
Subject: [PATCH 1/2] Lets the ore reclaimer make plasma glass from plasma and
 glass

---
 code/modules/mining/equipment_locker.dm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index f86c3e2d6c2..b7c6969da70 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -169,6 +169,11 @@
 		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/glass in stack_list) && (/obj/item/stack/sheet/mineral/plasma in stack_list))
+		var/obj/item/stack/sheet/glassstack = stack_list[/obj/item/stack/sheet/glass]
+		var/obj/item/stack/sheet/plasmastack = stack_list[/obj/item/stack/sheet/mineral/plasma]
+		if(min(glassstack.amount, plasmastack.amount))
+			dat += "Plasma Glass (Glass + Plasma): <A href='?src=\ref[src];plasglass=1'>Smelt</A><BR>"
 
 	dat += text("<br><div class='statusDisplay'><b>Mineral Value List:</b><BR>[get_ore_values()]</div>")
 
@@ -238,6 +243,22 @@
 				unload_mineral(plasteelout)
 		else
 			usr << "<span class='warning'>Required access not found.</span>"
+	if(href_list["plasglass"])
+		if(check_access(inserted_i) || allowed(usr))
+			if(!(/obj/item/stack/sheet/glass in stack_list)) return
+			if(!(/obj/item/stack/sheet/mineral/plasma in stack_list)) return
+			var/obj/item/stack/sheet/glassstack = stack_list[/obj/item/stack/sheet/glass]
+			var/obj/item/stack/sheet/plasmastack = stack_list[/obj/item/stack/sheet/plasma]
+			
+			var/desired = input("How much?", "How much would you like to smelt?", 1) as num
+			var/obj/item/stack/sheet/plasmaglass/plasglassout = new
+			plasglassout.amount = min(desired, 50, glassstack.amount, plasmastack.amount)
+			if(plasglassout.amount >= 1)
+				glassstack.amount -= plasglassout.amount
+				plasmastack.amount -= plasglass.amount
+				unload_mineral(plasglassout)
+		else
+			use << "<span class='warning'>Required access not found.</span>"
 	updateUsrDialog()
 	return
 

From b12ce7eb5acec62d4477ab308c05368847e317b1 Mon Sep 17 00:00:00 2001
From: Crazylemon <tlrgue17@gmail.com>
Date: Tue, 1 Dec 2015 22:48:10 -0800
Subject: [PATCH 2/2] i r a gud pro gammer

---
 code/modules/mining/equipment_locker.dm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index b7c6969da70..d410bf2fd97 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -244,21 +244,21 @@
 		else
 			usr << "<span class='warning'>Required access not found.</span>"
 	if(href_list["plasglass"])
-		if(check_access(inserted_i) || allowed(usr))
+		if(check_access(inserted_id) || allowed(usr))
 			if(!(/obj/item/stack/sheet/glass in stack_list)) return
 			if(!(/obj/item/stack/sheet/mineral/plasma in stack_list)) return
 			var/obj/item/stack/sheet/glassstack = stack_list[/obj/item/stack/sheet/glass]
-			var/obj/item/stack/sheet/plasmastack = stack_list[/obj/item/stack/sheet/plasma]
+			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/plasmaglass/plasglassout = new
 			plasglassout.amount = min(desired, 50, glassstack.amount, plasmastack.amount)
 			if(plasglassout.amount >= 1)
 				glassstack.amount -= plasglassout.amount
-				plasmastack.amount -= plasglass.amount
+				plasmastack.amount -= plasglassout.amount
 				unload_mineral(plasglassout)
 		else
-			use << "<span class='warning'>Required access not found.</span>"
+			usr << "<span class='warning'>Required access not found.</span>"
 	updateUsrDialog()
 	return