Merge resolution, master into dev.

code/modules/client/client procs.dm

@@ -254,7 +254,6 @@
 
 //send resources to the client. It's here in its own proc so we can move it around easiliy if need be
 /client/proc/send_resources()
-//	preload_vox() //Causes long delays with initial start window and subsequent windows when first logged in.
 	
 	getFiles(
 		'html/search.js',

code/modules/client/preferences.dm

@@ -292,6 +292,8 @@ datum/preferences
 
 	if(total_cost < MAX_GEAR_COST)
 		dat += " <a href='byond://?src=\ref[user];preference=loadout;task=input'>\[add\]</a>"
+		if(gear && gear.len)
+			dat += " <a href='byond://?src=\ref[user];preference=loadout;task=remove'>\[remove\]</a>"
 
 	dat += "<br><br><b>Occupation Choices</b><br>"
 	dat += "\t<a href='?_src_=prefs;preference=job;task=menu'><b>Set Preferences</b></a><br>"
@@ -999,10 +1001,18 @@ datum/preferences
 					user << "\red That item will exceed the maximum loadout cost of [MAX_GEAR_COST] points."
 
 		else if(href_list["task"] == "remove")
-			var/to_remove = href_list["gear"]
-			if(!to_remove) return
+		
+			if(isnull(gear) || !islist(gear))
+				gear = list()
+			if(!gear.len)
+				return
+			
+			var/choice = input(user, "Select gear to remove: ") as null|anything in gear
+			if(!choice)
+				return
+			
 			for(var/gear_name in gear)
-				if(gear_name == to_remove)
+				if(gear_name == choice)
 					gear -= gear_name
 					break