Merge remote-tracking branch 'upstream/master' into universal-damage

code/controllers/subsystem/mapping.dm

@@ -31,7 +31,7 @@ SUBSYSTEM_DEF(mapping)
 	if (mining_type == "lavaland")
 		// Spawn Lavaland ruins and rivers.
 		seedRuins(list(level_name_to_num(MINING)), config.lavaland_budget, /area/lavaland/surface/outdoors/unexplored, lava_ruins_templates)
-		spawn_rivers()
+		spawn_rivers(list(level_name_to_num(MINING)))
 	else
 		// Populate mining Z-level hidden rooms
 		for(var/i = 0, i < max_secret_rooms, i++)

code/controllers/subsystem/tickets/tickets.dm

@@ -263,7 +263,12 @@ UI STUFF
 			else
 				continue
 
-	dat += "</table></body>"
+	dat += "</table>"
+	dat += "<h1>Resolve All</h1>"
+	if(ticket_system_name == "Mentor Tickets")
+		dat += "<a href='?src=[UID()];resolveall=1'>Resolve All Open Mentor Tickets</a></body>"
+	else
+		dat += "<a href='?src=[UID()];resolveall=1'>Resolve All Open Admin Tickets</a></body>"
 
 	return dat
 
@@ -402,6 +407,12 @@ UI STUFF
 		takeTicket(indexNum)
 		showDetailUI(usr, indexNum)
 
+	if(href_list["resolveall"])
+		if(ticket_system_name == "Mentor Tickets")
+			usr.client.resolveAllMentorTickets()
+		else
+			usr.client.resolveAllAdminTickets()
+
 /datum/controller/subsystem/tickets/proc/takeTicket(var/index)
 	if(assignStaffToTicket(usr.client, index))
 		if(span_class == "mentorhelp")