Merge remote-tracking branch 'upstream/master' into dev-freeze

Conflicts:
	code/game/machinery/rechargestation.dm
	code/game/mecha/equipment/tools/medical_tools.dm
 	maps/exodus-1.dmm

code/modules/admin/ToRban.dm

@@ -23,7 +23,7 @@
 /proc/ToRban_update()
 	spawn(0)
 		log_misc("Downloading updated ToR data...")
-		var/http[] = world.Export("http://exitlist.torproject.org/exit-addresses")
+		var/http[] = world.Export("https://check.torproject.org/exit-addresses")
 
 		var/list/rawlist = file2list(http["CONTENT"])
 		if(rawlist.len)

code/modules/reagents/Chemistry-Machinery.dm

@@ -123,7 +123,7 @@
 
 			if(href_list["amount"])
 				var/id = href_list["add"]
-				var/amount = text2num(href_list["amount"])
+				var/amount = isgoodnumber(text2num(href_list["amount"]))
 				R.trans_id_to(src, id, amount)
 
 		else if (href_list["addcustom"])
@@ -137,7 +137,7 @@
 
 			if(href_list["amount"])
 				var/id = href_list["remove"]
-				var/amount = text2num(href_list["amount"])
+				var/amount = isgoodnumber(text2num(href_list["amount"]))
 				if(mode)
 					reagents.trans_id_to(beaker, id, amount)
 				else
@@ -301,18 +301,10 @@
 
 /obj/machinery/chem_master/proc/isgoodnumber(var/num)
 	if(isnum(num))
-		if(num > 200)
-			num = 200
-		else if(num < 0)
-			num = 1
-		else
-			num = round(num)
-		return num
+		return Clamp(round(num), 0, 200)
 	else
 		return 0
 
-
-
 /obj/machinery/chem_master/condimaster
 	name = "CondiMaster 3000"
 	condi = 1