Merge remote-tracking branch 'upstream/master' into cashlogging

code/modules/mining/laborcamp/laborstacker.dm

@@ -39,7 +39,7 @@ GLOBAL_LIST(labor_sheet_values)
 									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "labor_claim_console", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, ui_key, "LaborClaimConsole", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/mineral/labor_claim_console/ui_data(mob/user)

code/modules/mining/machine_redemption.dm

@@ -205,7 +205,7 @@
 /obj/machinery/mineral/ore_redemption/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "ore_redemption_machine", "Ore Redemption Machine", ui_x, ui_y, master_ui, state)
+		ui = new(user, src, ui_key, "OreRedemptionMachine", "Ore Redemption Machine", ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/mineral/ore_redemption/ui_data(mob/user)

code/modules/mining/machine_vending.dm

@@ -99,7 +99,7 @@
 	if(!ui)
 		var/datum/asset/assets = get_asset_datum(/datum/asset/spritesheet/vending)
 		assets.send(user)
-		ui = new(user, src, ui_key, "mining_vendor", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, ui_key, "MiningVendor", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/mineral/equipment_vendor/ui_static_data(mob/user)

code/modules/mining/mint.dm

@@ -82,24 +82,23 @@
 											datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "mint", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, ui_key, "Mint", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/machinery/mineral/mint/ui_data()
 	var/list/data = list()
-	var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
+	data["inserted_materials"] = list()
+	data["chosen_material"] = null
 
+	var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
 	for(var/datum/material/inserted_material in materials.materials)
 		var/amount = materials.get_material_amount(inserted_material)
-
 		if(!amount)
 			continue
-
 		data["inserted_materials"] += list(list(
 			"material" = inserted_material.name,
-			"amount" = amount
+			"amount" = amount,
 		))
-
 		if(chosen == inserted_material)
 			data["chosen_material"] = inserted_material.name
 
@@ -109,10 +108,10 @@
 	return data;
 
 /obj/machinery/mineral/mint/ui_act(action, params, datum/tgui/ui)
-
 	. = ..()
 	if(.)
 		return
+<<<<<<< HEAD
 
 	switch(action)
 		if ("startpress")
@@ -130,6 +129,24 @@
 			for(var/datum/material/mat in materials.materials)
 				if (params["material_name"] == mat.name)
 					chosen = mat
+=======
+	if(action == "startpress")
+		if (!processing)
+			produced_coins = 0
+		processing = TRUE
+		begin_processing()
+		return TRUE
+	if (action == "stoppress")
+		processing = FALSE
+		end_processing()
+		return TRUE
+	if (action == "changematerial")
+		var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
+		for(var/datum/material/mat in materials.materials)
+			if (params["material_name"] == mat.name)
+				chosen = mat
+		return TRUE
+>>>>>>> upstream/master
 
 /obj/machinery/mineral/mint/proc/create_coins()
 	var/turf/T = get_step(src,output_dir)

code/modules/mining/satchel_ore_boxdm.dm

@@ -65,7 +65,7 @@
 									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "ore_box", name, ui_x, ui_y, master_ui, state)
+		ui = new(user, src, ui_key, "OreBox", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
 /obj/structure/ore_box/ui_data()