TGUI Mining Equipment Vendor

code/modules/mining/ore_redemption_machine/equipment_vendor.dm

@@ -1,3 +1,9 @@
+// Use this define to register something as a purchasable!
+// * n — The proper name of the purchasable
+// * o — The object type path of the purchasable to spawn
+// * p — The price of the purchasable in mining points
+#define EQUIPMENT(n, o, p) n = new /datum/data/mining_equipment(n, o, p)
+
 /**********************Mining Equipment Locker**************************/
 
 /obj/machinery/mineral/equipment_vendor
@@ -11,81 +17,8 @@
 	var/icon_vend = "adh-tool-vend"
 	circuit = /obj/item/weapon/circuitboard/mining_equipment_vendor
 	var/obj/item/weapon/card/id/inserted_id
-	//VOREStation Edit Start - Heavily modified list
+	var/list/prize_list // Initialized just below! (if you're wondering why - check CONTRIBUTING.md, look for: "hidden" init proc)
-	var/list/prize_list = list(
+	var/dirty_items = FALSE // Used to refresh the static/redundant data in case the machine gets VV'd
-		new /datum/data/mining_equipment("1 Marker Beacon",				/obj/item/stack/marker_beacon,										10),
-		new /datum/data/mining_equipment("10 Marker Beacons",			/obj/item/stack/marker_beacon/ten,									100),
-		new /datum/data/mining_equipment("30 Marker Beacons",			/obj/item/stack/marker_beacon/thirty,								300),
-		new /datum/data/mining_equipment("Whiskey",						/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey,		125),
-		new /datum/data/mining_equipment("Absinthe",					/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe,	125),
-		new /datum/data/mining_equipment("Cigar",						/obj/item/clothing/mask/smokable/cigarette/cigar/havana,			150),
-		new /datum/data/mining_equipment("Soap",						/obj/item/weapon/soap/nanotrasen,									200),
-		new /datum/data/mining_equipment("Laser Pointer",				/obj/item/device/laser_pointer,										900),
-		new /datum/data/mining_equipment("Geiger Counter",				/obj/item/device/geiger,											750),
-		new /datum/data/mining_equipment("Plush Toy",					/obj/random/plushie,												300),
-		new /datum/data/mining_equipment("GPS Device",					/obj/item/device/gps/mining,										100),
-		// TODO new /datum/data/mining_equipment("Advanced Scanner",	/obj/item/device/t_scanner/adv_mining_scanner,						800),
-		new /datum/data/mining_equipment("Fulton Beacon",				/obj/item/fulton_core,												500),
-		new /datum/data/mining_equipment("Shelter Capsule",				/obj/item/device/survivalcapsule,									500),
-		// TODO new /datum/data/mining_equipment("Explorer's Webbing",	/obj/item/storage/belt/mining,										500),
-		new /datum/data/mining_equipment("Umbrella",					/obj/item/weapon/melee/umbrella/random,								200),
-		new /datum/data/mining_equipment("Point Transfer Card",			/obj/item/weapon/card/mining_point_card,							500),
-		new /datum/data/mining_equipment("Trauma Medipen",				/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,	250),
-		new /datum/data/mining_equipment("Burn Medipen",				/obj/item/weapon/reagent_containers/hypospray/autoinjector/burn,	250),
-		new /datum/data/mining_equipment("Oxy Medipen",					/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,		250),
-		new /datum/data/mining_equipment("Detox Medipen",				/obj/item/weapon/reagent_containers/hypospray/autoinjector/detox,	250),
-		new /datum/data/mining_equipment("Mini-Translocator",			/obj/item/device/perfect_tele/one_beacon,							1200),
-		// new /datum/data/mining_equipment("Kinetic Crusher",			/obj/item/twohanded/required/kinetic_crusher,						750),
-		new /datum/data/mining_equipment("Kinetic Accelerator",			/obj/item/weapon/gun/energy/kinetic_accelerator,					900),
-		new /datum/data/mining_equipment("Resonator",					/obj/item/resonator,												900),
-		new /datum/data/mining_equipment("Fulton Pack",					/obj/item/extraction_pack,											1200),
-		new /datum/data/mining_equipment("Silver Pickaxe",				/obj/item/weapon/pickaxe/silver,									1200),
-		// new /datum/data/mining_equipment("Mining Conscription Kit",	/obj/item/storage/backpack/duffelbag/mining_conscript,				1000),
-		new /datum/data/mining_equipment("Thalers - 100",				/obj/item/weapon/spacecash/c100,									1000),
-		new /datum/data/mining_equipment("Hardsuit - Control Module",	/obj/item/weapon/rig/industrial/vendor,									2000),
-		new /datum/data/mining_equipment("Hardsuit - Plasma Cutter",		/obj/item/rig_module/device/plasmacutter,						800),
-		new /datum/data/mining_equipment("Hardsuit - Drill",				/obj/item/rig_module/device/drill,								5000),
-		new /datum/data/mining_equipment("Hardsuit - Ore Scanner",		/obj/item/rig_module/device/orescanner,								1000),
-		new /datum/data/mining_equipment("Hardsuit - Material Scanner",	/obj/item/rig_module/vision/material,								500),
-		new /datum/data/mining_equipment("Hardsuit - Maneuvering Jets",	/obj/item/rig_module/maneuvering_jets,								1250),
-		new /datum/data/mining_equipment("Hardsuit - Intelligence Storage",	/obj/item/rig_module/ai_container,								2500),
-		new /datum/data/mining_equipment("Hardsuit - Smoke Bomb Deployer",	/obj/item/rig_module/grenade_launcher/smoke,					2000),
-		new /datum/data/mining_equipment("Industrial Equipment - Phoron Bore",	/obj/item/weapon/gun/magnetic/matfed,						3000),
-		new /datum/data/mining_equipment("Industrial Equipment - Sheet-Snatcher",/obj/item/weapon/storage/bag/sheetsnatcher,				500),
-		new /datum/data/mining_equipment("Digital Tablet - Standard",	/obj/item/modular_computer/tablet/preset/custom_loadout/standard,	500),
-		new /datum/data/mining_equipment("Digital Tablet - Advanced",	/obj/item/modular_computer/tablet/preset/custom_loadout/advanced,	1000),
-		// new /datum/data/mining_equipment("Diamond Pickaxe",				/obj/item/weapon/pickaxe/diamond,									2000),
-		new /datum/data/mining_equipment("Super Resonator",				/obj/item/resonator/upgraded,										2500),
-		new /datum/data/mining_equipment("Jump Boots",					/obj/item/clothing/shoes/bhop,										2500),
-		new /datum/data/mining_equipment("Luxury Shelter Capsule",		/obj/item/device/survivalcapsule/luxury,							3100),
-		new /datum/data/mining_equipment("Bar Shelter Capsule",		/obj/item/device/survivalcapsule/luxurybar,							10000),
-		new /datum/data/mining_equipment("KA White Tracer Rounds",		/obj/item/borg/upgrade/modkit/tracer,								125),
-		new /datum/data/mining_equipment("KA Adjustable Tracer Rounds",	/obj/item/borg/upgrade/modkit/tracer/adjustable,					175),
-		new /datum/data/mining_equipment("KA Super Chassis",			/obj/item/borg/upgrade/modkit/chassis_mod,							250),
-		new /datum/data/mining_equipment("KA Hyper Chassis",			/obj/item/borg/upgrade/modkit/chassis_mod/orange,					300),
-		new /datum/data/mining_equipment("KA Range Increase",			/obj/item/borg/upgrade/modkit/range,								1000),
-		new /datum/data/mining_equipment("KA Damage Increase",			/obj/item/borg/upgrade/modkit/damage,								1000),
-		new /datum/data/mining_equipment("KA Efficiency Increase",		/obj/item/borg/upgrade/modkit/efficiency,							1200),
-		new /datum/data/mining_equipment("KA AoE Damage",				/obj/item/borg/upgrade/modkit/aoe/mobs,								2000),
-		new /datum/data/mining_equipment("KA Holster",				/obj/item/clothing/accessory/holster/waist/kinetic_accelerator,			350),
-		new /datum/data/mining_equipment("Fine Excavation Kit - Chisels",/obj/item/weapon/storage/excavation,								500),
-		new /datum/data/mining_equipment("Fine Excavation Kit - Measuring Tape",/obj/item/device/measuring_tape,							125),
-		new /datum/data/mining_equipment("Fine Excavation Kit - Hand Pick",/obj/item/weapon/pickaxe/hand,									375),
-		new /datum/data/mining_equipment("Explosive Excavation Kit - Plastic Charge",/obj/item/weapon/plastique/seismic/locked,					1500),
-		new /datum/data/mining_equipment("Injector (L) - Glucose",/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose,	500),
-		new /datum/data/mining_equipment("Injector (L) - Panacea",/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity,	500),
-		new /datum/data/mining_equipment("Injector (L) - Trauma",/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute,	500),
-		new /datum/data/mining_equipment("Nanopaste Tube",				/obj/item/stack/nanopaste,											1000),
-		new /datum/data/mining_equipment("Defense Equipment - Smoke Bomb",/obj/item/weapon/grenade/smokebomb,								100),
-		new /datum/data/mining_equipment("Defense Equipment - Razor Drone Deployer",/obj/item/weapon/grenade/spawnergrenade/manhacks/station/locked,	1000),
-		new /datum/data/mining_equipment("Defense Equipment - Sentry Drone Deployer",/obj/item/weapon/grenade/spawnergrenade/ward,			1500),
-		new /datum/data/mining_equipment("Defense Equipment - Plasteel Machete",	/obj/item/weapon/material/knife/machete,				500),
-		new /datum/data/mining_equipment("Fishing Net",					/obj/item/weapon/material/fishing_net,								500),
-		new /datum/data/mining_equipment("Titanium Fishing Rod",		/obj/item/weapon/material/fishing_rod/modern,						1000),
-		new /datum/data/mining_equipment("Durasteel Fishing Rod",		/obj/item/weapon/material/fishing_rod/modern/strong,				7500),
-		new /datum/data/mining_equipment("Survival Equipment - Insulated Poncho",	/obj/random/thermalponcho,								750)
-		)
-	//VOREStation Edit End
 
 /datum/data/mining_equipment
 	var/equipment_name = "generic"
@@ -97,9 +30,96 @@
 	src.equipment_path = path
 	src.cost = cost
 
-/obj/machinery/power/quantumpad/Initialize()
+/obj/machinery/mineral/equipment_vendor/Initialize(mapload)
 	. = ..()
-	default_apply_parts()
+	//VOREStation Edit Start - Heavily modified list
+	prize_list = list()
+	prize_list["Gear"] = list(
+		// TODO EQUIPMENT("Advanced Scanner",	/obj/item/device/t_scanner/adv_mining_scanner,										800),
+		// TODO EQUIPMENT("Explorer's Webbing",	/obj/item/storage/belt/mining,														500),
+		EQUIPMENT("Defense Equipment - Smoke Bomb",				/obj/item/weapon/grenade/smokebomb,									100),
+		EQUIPMENT("Defense Equipment - Razor Drone Deployer",	/obj/item/weapon/grenade/spawnergrenade/manhacks/station/locked,	1000),
+		EQUIPMENT("Defense Equipment - Sentry Drone Deployer",	/obj/item/weapon/grenade/spawnergrenade/ward,						1500),
+		EQUIPMENT("Defense Equipment - Plasteel Machete",		/obj/item/weapon/material/knife/machete,							500),
+		EQUIPMENT("Durasteel Fishing Rod",						/obj/item/weapon/material/fishing_rod/modern/strong,				7500),
+		EQUIPMENT("Fishing Net",								/obj/item/weapon/material/fishing_net,								500),
+		EQUIPMENT("Titanium Fishing Rod",						/obj/item/weapon/material/fishing_rod/modern,						1000),
+		EQUIPMENT("Fulton Beacon",								/obj/item/fulton_core,												500),
+		EQUIPMENT("Geiger Counter",								/obj/item/device/geiger,											750),
+		EQUIPMENT("GPS Device",									/obj/item/device/gps/mining,										100),
+		// EQUIPMENT("Mining Conscription Kit",					/obj/item/storage/backpack/duffelbag/mining_conscript,				1000),
+		EQUIPMENT("Jump Boots",									/obj/item/clothing/shoes/bhop,										2500),
+		EQUIPMENT("Mini-Translocator",							/obj/item/device/perfect_tele/one_beacon,							1200),
+		EQUIPMENT("Survival Equipment - Insulated Poncho",		/obj/random/thermalponcho,											750),
+
+	)
+	prize_list["Consumables"] = list(
+		EQUIPMENT("1 Marker Beacon",		/obj/item/stack/marker_beacon,													10),
+		EQUIPMENT("10 Marker Beacons",		/obj/item/stack/marker_beacon/ten,												100),
+		EQUIPMENT("30 Marker Beacons",		/obj/item/stack/marker_beacon/thirty,											300),
+		EQUIPMENT("Fulton Pack",			/obj/item/extraction_pack,														1200),
+		EQUIPMENT("Point Transfer Card",	/obj/item/weapon/card/mining_point_card,										500),
+		EQUIPMENT("Shelter Capsule",		/obj/item/device/survivalcapsule,												500),
+		EQUIPMENT("Trauma Medipen",			/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,				250),
+		EQUIPMENT("Burn Medipen",			/obj/item/weapon/reagent_containers/hypospray/autoinjector/burn,				250),
+		EQUIPMENT("Oxy Medipen",			/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,					250),
+		EQUIPMENT("Detox Medipen",			/obj/item/weapon/reagent_containers/hypospray/autoinjector/detox,				250),
+		EQUIPMENT("Injector (L) - Glucose",	/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose,	500),
+		EQUIPMENT("Injector (L) - Panacea",	/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity,	500),
+		EQUIPMENT("Injector (L) - Trauma",	/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute,	500),
+		EQUIPMENT("Nanopaste Tube",			/obj/item/stack/nanopaste,														1000),
+	)
+	prize_list["Kinetic Accelerator"] = list(
+		EQUIPMENT("Kinetic Accelerator",		/obj/item/weapon/gun/energy/kinetic_accelerator,				900),
+		EQUIPMENT("KA White Tracer Rounds",		/obj/item/borg/upgrade/modkit/tracer,							125),
+		EQUIPMENT("KA Adjustable Tracer Rounds",/obj/item/borg/upgrade/modkit/tracer/adjustable,				175),
+		EQUIPMENT("KA Super Chassis",			/obj/item/borg/upgrade/modkit/chassis_mod,						250),
+		EQUIPMENT("KA Hyper Chassis",			/obj/item/borg/upgrade/modkit/chassis_mod/orange,				300),
+		EQUIPMENT("KA Range Increase",			/obj/item/borg/upgrade/modkit/range,							1000),
+		EQUIPMENT("KA Damage Increase",			/obj/item/borg/upgrade/modkit/damage,							1000),
+		EQUIPMENT("KA Efficiency Increase",		/obj/item/borg/upgrade/modkit/efficiency,						1200),
+		EQUIPMENT("KA AoE Damage",				/obj/item/borg/upgrade/modkit/aoe/mobs,							2000),
+		EQUIPMENT("KA Holster",					/obj/item/clothing/accessory/holster/waist/kinetic_accelerator,	350),
+	)
+	prize_list["Digging Tools"] = list(
+		// EQUIPMENT("Diamond Pickaxe",	/obj/item/weapon/pickaxe/diamond,				2000),
+		// EQUIPMENT("Kinetic Crusher",	/obj/item/twohanded/required/kinetic_crusher,	750),
+		EQUIPMENT("Resonator",			/obj/item/resonator,							900),
+		EQUIPMENT("Silver Pickaxe",		/obj/item/weapon/pickaxe/silver,				1200),
+		EQUIPMENT("Super Resonator",	/obj/item/resonator/upgraded,					2500),
+		EQUIPMENT("Fine Excavation Kit - Chisels",			/obj/item/weapon/storage/excavation,			500),
+		EQUIPMENT("Fine Excavation Kit - Measuring Tape",	/obj/item/device/measuring_tape,				125),
+		EQUIPMENT("Fine Excavation Kit - Hand Pick",		/obj/item/weapon/pickaxe/hand,					375),
+		EQUIPMENT("Explosive Excavation Kit - Plastic Charge",/obj/item/weapon/plastique/seismic/locked,	1500),
+	)
+	prize_list["Hardsuit"] = list(
+		EQUIPMENT("Hardsuit - Control Module",		/obj/item/weapon/rig/industrial/vendor,		2000),
+		EQUIPMENT("Hardsuit - Plasma Cutter",		/obj/item/rig_module/device/plasmacutter,	800),
+		EQUIPMENT("Hardsuit - Drill",				/obj/item/rig_module/device/drill,			5000),
+		EQUIPMENT("Hardsuit - Ore Scanner",			/obj/item/rig_module/device/orescanner,		1000),
+		EQUIPMENT("Hardsuit - Material Scanner",	/obj/item/rig_module/vision/material,		500),
+		EQUIPMENT("Hardsuit - Maneuvering Jets",	/obj/item/rig_module/maneuvering_jets,		1250),
+		EQUIPMENT("Hardsuit - Intelligence Storage",/obj/item/rig_module/ai_container,			2500),
+		EQUIPMENT("Hardsuit - Smoke Bomb Deployer",	/obj/item/rig_module/grenade_launcher/smoke,2000),
+	)
+	prize_list["Miscellaneous"] = list(
+		EQUIPMENT("Absinthe",					/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe,	125),
+		EQUIPMENT("Bar Shelter Capsule",		/obj/item/device/survivalcapsule/luxurybar,							10000),
+		EQUIPMENT("Cigar",						/obj/item/clothing/mask/smokable/cigarette/cigar/havana,			150),
+		EQUIPMENT("Digital Tablet - Standard",	/obj/item/modular_computer/tablet/preset/custom_loadout/standard,	500),
+		EQUIPMENT("Digital Tablet - Advanced",	/obj/item/modular_computer/tablet/preset/custom_loadout/advanced,	1000),
+		EQUIPMENT("Industrial Equipment - Phoron Bore",	/obj/item/weapon/gun/magnetic/matfed,						3000),
+		EQUIPMENT("Industrial Equipment - Sheet-Snatcher",/obj/item/weapon/storage/bag/sheetsnatcher,				500),
+		EQUIPMENT("Laser Pointer",				/obj/item/device/laser_pointer,										900),
+		EQUIPMENT("Luxury Shelter Capsule",		/obj/item/device/survivalcapsule/luxury,							3100),
+		EQUIPMENT("Plush Toy",					/obj/random/plushie,												300),
+		EQUIPMENT("Soap",						/obj/item/weapon/soap/nanotrasen,									200),
+		EQUIPMENT("Thalers - 100",				/obj/item/weapon/spacecash/c100,									1000),
+		EQUIPMENT("Umbrella",					/obj/item/weapon/melee/umbrella/random,								200),
+		EQUIPMENT("Whiskey",					/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey,		125),
+	)
+	prize_list["Extra"] = list() // Used in child vendors
+	//VOREStation Edit End
 
 /obj/machinery/mineral/equipment_vendor/power_change()
 	var/old_stat = stat
@@ -126,73 +146,92 @@
 /obj/machinery/mineral/equipment_vendor/attack_hand(mob/user)
 	if(..())
 		return
-	interact(user)
+	tgui_interact(user)
 
 /obj/machinery/mineral/equipment_vendor/attack_ghost(mob/user)
-	interact(user)
+	tgui_interact(user)
 
-/obj/machinery/mineral/equipment_vendor/interact(mob/user)
+/obj/machinery/mineral/equipment_vendor/tgui_data(mob/user)
-	user.set_machine(src)
+	var/list/data = ..()
 
-	var/dat
+	// ID
-	dat +="<div class='statusDisplay'>"
+	if(inserted_id)
-	if(istype(inserted_id))
+		data["has_id"] = TRUE
-		dat += "You have [inserted_id.mining_points] mining points collected. <A href='?src=\ref[src];choice=eject'>Eject ID.</A><br>"
+		data["id"] = list(
+			"name" = inserted_id.registered_name,
+			"points" = inserted_id.mining_points,
+		)
 	else
-		dat += "No ID inserted.  <A href='?src=\ref[src];choice=insert'>Insert ID.</A><br>"
+		data["has_id"] = FALSE
-	dat += "</div>"
-	dat += "<br><b>Equipment point cost list:</b><BR><table border='0' width='100%'>"
-	for(var/datum/data/mining_equipment/prize in prize_list)
-		dat += "<tr><td>[prize.equipment_name]</td><td>[prize.cost]</td><td><A href='?src=\ref[src];purchase=\ref[prize]'>Purchase</A></td></tr>"
-	dat += "</table>"
-	var/datum/browser/popup = new(user, "miningvendor", "Mining Equipment Vendor", 400, 600)
-	popup.set_content(dat)
-	popup.open()
 
-/obj/machinery/mineral/equipment_vendor/Topic(href, href_list)
+	return data
+
+/obj/machinery/mineral/equipment_vendor/tgui_static_data(mob/user)
+	var/list/static_data[0]
+
+	// Available items - in static data because we don't wanna compute this list every time! It hardly changes.
+	static_data["items"] = list()
+	for(var/cat in prize_list)
+		var/list/cat_items = list()
+		for(var/prize_name in prize_list[cat])
+			var/datum/data/mining_equipment/prize = prize_list[cat][prize_name]
+			cat_items[prize_name] = list("name" = prize_name, "price" = prize.cost)
+		static_data["items"][cat] = cat_items
+
+	return static_data
+
+/obj/machinery/mineral/equipment_vendor/vv_edit_var(var_name, var_value)
+	// Gotta update the static data in case an admin VV's the items for some reason..!
+	if(var_name == "prize_list")
+		dirty_items = TRUE
+	return ..()
+
+/obj/machinery/mineral/equipment_vendor/tgui_interact(mob/user, datum/tgui/ui = null)
+	// Update static data if need be
+	if(dirty_items)
+		update_tgui_static_data(user, ui)
+		dirty_items = FALSE
+
+	// Open the window
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "MiningVendor", name)
+		ui.open()
+		ui.set_autoupdate(FALSE)
+
+
+/obj/machinery/mineral/equipment_vendor/tgui_act(action, params)
 	if(..())
-		return 1
+		return
 
-	if(href_list["choice"])
+	. = TRUE
-		if(istype(inserted_id))
+	switch(action)
-			if(href_list["choice"] == "eject")
+		if("logoff")
-				to_chat(usr, "<span class='notice'>You eject the ID from [src]'s card slot.</span>")
+			if(!inserted_id)
+				return
 			usr.put_in_hands(inserted_id)
 			inserted_id = null
-		else if(href_list["choice"] == "insert")
+		if("purchase")
-			var/obj/item/weapon/card/id/I = usr.get_active_hand()
+			if(!inserted_id)
-			if(istype(I) && !inserted_id && usr.unEquip(I))
-				I.forceMove(src)
-				inserted_id = I
-				interact(usr)
-				to_chat(usr, "<span class='notice'>You insert the ID into [src]'s card slot.</span>")
-			else
-				to_chat(usr, "<span class='warning'>No valid ID.</span>")
-				flick(icon_deny, src)
-
-	if(href_list["purchase"])
-		if(istype(inserted_id))
-			var/datum/data/mining_equipment/prize = locate(href_list["purchase"])
-			if (!prize || !(prize in prize_list))
-				to_chat(usr, "<span class='warning'>Error: Invalid choice!</span>")
-				flick(icon_deny, src)
 				return
-			if(prize.cost > inserted_id.mining_points)
+			var/category = params["cat"] // meow
-				to_chat(usr, "<span class='warning'>Error: Insufficent points for [prize.equipment_name]!</span>")
+			var/name = params["name"]
-				flick(icon_deny, src)
+			if(!(category in prize_list) || !(name in prize_list[category])) // Not trying something that's not in the list, are you?
-			else
+				return
+			var/datum/data/mining_equipment/prize = prize_list[category][name]
+			if(prize.cost > inserted_id.mining_points) // shouldn't be able to access this since the button is greyed out, but..
+				to_chat(usr, "<span class='danger'>You have insufficient points.</span>")
+				return
+
 			inserted_id.mining_points -= prize.cost
-				to_chat(usr, "<span class='notice'>[src] clanks to life briefly before vending [prize.equipment_name]!</span>")
+			new prize.equipment_path(loc)
-				new prize.equipment_path(drop_location())
-				flick(icon_vend, src)
 		else
-			to_chat(usr, "<span class='warning'>Error: Please insert a valid ID!</span>")
+			return FALSE
-			flick(icon_deny, src)
+	add_fingerprint()
-	updateUsrDialog()
+
 
 /obj/machinery/mineral/equipment_vendor/attackby(obj/item/I, mob/user, params)
 	if(default_deconstruction_screwdriver(user, I))
-		updateUsrDialog()
 		return
 	if(default_part_replacement(user, I))
 		return
@@ -201,7 +240,7 @@
 	if(istype(I, /obj/item/mining_voucher))
 		if(!powered())
 			return
-		RedeemVoucher(I, user)
+		redeem_voucher(I, user)
 		return
 	if(istype(I,/obj/item/weapon/card/id))
 		if(!powered())
@@ -209,16 +248,23 @@
 		else if(!inserted_id && user.unEquip(I))
 			I.forceMove(src)
 			inserted_id = I
-			interact(user)
+			tgui_interact(user)
 		return
-	..()
+	return ..()
 
 /obj/machinery/mineral/equipment_vendor/dismantle()
 	if(inserted_id)
 		inserted_id.forceMove(loc) //Prevents deconstructing the ORM from deleting whatever ID was inside it.
 	. = ..()
 
-/obj/machinery/mineral/equipment_vendor/proc/RedeemVoucher(obj/item/mining_voucher/voucher, mob/redeemer)
+/**
+  * Called when someone slaps the machine with a mining voucher
+  *
+  * Arguments:
+  * * voucher - The voucher card item
+  * * redeemer - The person holding it
+  */
+/obj/machinery/mineral/equipment_vendor/proc/redeem_voucher(obj/item/mining_voucher/voucher, mob/redeemer)
 	var/selection = input(redeemer, "Pick your equipment", "Mining Voucher Redemption") as null|anything in list("Kinetic Accelerator", "Resonator", "Mining Drone", "Advanced Scanner", "Crusher")
 	if(!selection || !Adjacent(redeemer) || voucher.loc != redeemer)
 		return

tgui/packages/tgui/interfaces/MiningVendor.js

@@ -0,0 +1,217 @@
+import { createSearch } from 'common/string';
+import { Fragment } from 'inferno';
+import { useBackend, useLocalState } from "../backend";
+import { Box, Button, Collapsible, Dropdown, Flex, Input, NoticeBox, Section } from '../components';
+import { Window } from "../layouts";
+import { refocusLayout } from '../layouts';
+
+const sortTypes = {
+  'Alphabetical': (a, b) => a - b,
+  'By availability': (a, b) => -(a.affordable - b.affordable),
+  'By price': (a, b) => a.price - b.price,
+};
+
+export const MiningVendor = (_properties, _context) => {
+  return (
+    <Window width={400} height={450} resizable>
+      <Window.Content className="Layout__content--flexColumn" scrollable>
+        <MiningVendorUser />
+        <MiningVendorSearch />
+        <MiningVendorItems />
+      </Window.Content>
+    </Window>
+  );
+};
+
+const MiningVendorUser = (_properties, context) => {
+  const { act, data } = useBackend(context);
+  const {
+    has_id,
+    id,
+  } = data;
+  return (
+    <NoticeBox success={has_id}>
+      {has_id ? (
+        <Fragment>
+          <Box
+            display="inline-block"
+            verticalAlign="middle"
+            style={{
+              float: 'left',
+            }}>
+            Logged in as {id.name}.<br />
+            You have {id.points.toLocaleString('en-US')} points.
+          </Box>
+          <Button
+            icon="eject"
+            content="Eject ID"
+            style={{
+              float: 'right',
+            }}
+            onClick={() => act('logoff')}
+          />
+          <Box
+            style={{
+              clear: "both",
+            }}
+          />
+        </Fragment>
+      ) : (
+        "Please insert an ID in order to make purchases."
+      )}
+    </NoticeBox>
+  );
+};
+
+const MiningVendorItems = (_properties, context) => {
+  const { act, data } = useBackend(context);
+  const {
+    has_id,
+    id,
+    items,
+  } = data;
+  // Search thingies
+  const [
+    searchText,
+    _setSearchText,
+  ] = useLocalState(context, 'search', '');
+  const [
+    sortOrder,
+    _setSortOrder,
+  ] = useLocalState(context, 'sort', 'Alphabetical');
+  const [
+    descending,
+    _setDescending,
+  ] = useLocalState(context, 'descending', false);
+  const searcher = createSearch(searchText, item => {
+    return item[0];
+  });
+
+  let has_contents = false;
+  let contents = Object.entries(items).map((kv, _i) => {
+    let items_in_cat = Object.entries(kv[1])
+      .filter(searcher)
+      .map(kv2 => {
+        kv2[1].affordable = has_id && id.points >= kv2[1].price;
+        return kv2[1];
+      })
+      .sort(sortTypes[sortOrder]);
+    if (items_in_cat.length === 0) {
+      return;
+    }
+    if (descending) {
+      items_in_cat = items_in_cat.reverse();
+    }
+
+    has_contents = true;
+    return (
+      <MiningVendorItemsCategory
+        key={kv[0]}
+        title={kv[0]}
+        items={items_in_cat}
+      />
+    );
+  });
+  return (
+    <Flex.Item grow="1" overflow="auto">
+      <Section onClick={e => refocusLayout()}>
+        {has_contents
+          ? contents : (
+            <Box color="label">
+              No items matching your criteria was found!
+            </Box>
+          )}
+      </Section>
+    </Flex.Item>
+  );
+};
+
+const MiningVendorSearch = (_properties, context) => {
+  const [
+    _searchText,
+    setSearchText,
+  ] = useLocalState(context, 'search', '');
+  const [
+    _sortOrder,
+    setSortOrder,
+  ] = useLocalState(context, 'sort', '');
+  const [
+    descending,
+    setDescending,
+  ] = useLocalState(context, 'descending', false);
+  return (
+    <Box mb="0.5rem">
+      <Flex width="100%">
+        <Flex.Item grow="1" mr="0.5rem">
+          <Input
+            placeholder="Search by item name.."
+            width="100%"
+            onInput={(_e, value) => setSearchText(value)}
+          />
+        </Flex.Item>
+        <Flex.Item basis="30%">
+          <Dropdown
+            selected="Alphabetical"
+            options={Object.keys(sortTypes)}
+            width="100%"
+            lineHeight="19px"
+            onSelected={v => setSortOrder(v)} />
+        </Flex.Item>
+        <Flex.Item>
+          <Button
+            icon={descending ? "arrow-down" : "arrow-up"}
+            height="19px"
+            tooltip={descending ? "Descending order" : "Ascending order"}
+            tooltipPosition="bottom-left"
+            ml="0.5rem"
+            onClick={() => setDescending(!descending)}
+          />
+        </Flex.Item>
+      </Flex>
+    </Box>
+  );
+};
+
+const MiningVendorItemsCategory = (properties, context) => {
+  const { act, data } = useBackend(context);
+  const {
+    title,
+    items,
+    ...rest
+  } = properties;
+  return (
+    <Collapsible open title={title} {...rest}>
+      {items.map(item => (
+        <Box key={item.name}>
+          <Box
+            display="inline-block"
+            verticalAlign="middle"
+            lineHeight="20px"
+            style={{
+              float: 'left',
+            }}>
+            {item.name}
+          </Box>
+          <Button
+            disabled={!data.has_id || data.id.points < item.price}
+            content={item.price.toLocaleString('en-US')}
+            width="15%"
+            textAlign="center"
+            style={{
+              float: 'right',
+            }}
+            onClick={() => act('purchase', {
+              cat: title,
+              name: item.name,
+            })}
+          />
+          <Box
+            style={{
+              clear: "both",
+            }}
+          />
+        </Box>
+      ))}
+    </Collapsible>
+  );
+};