Merge branch 'master' into upstream-merge-33470

2017-12-21 03:24:03 -06:00
parent 1b6b8a7c00 56ecc13289
commit 3973b368de
327 changed files with 4405 additions and 3275 deletions
@@ -154,7 +154,7 @@


 /obj/item/reagent_containers/syringe/update_icon()
-	var/rounded_vol = Clamp(round((reagents.total_volume / volume * 15),5), 0, 15)
+	var/rounded_vol = CLAMP(round((reagents.total_volume / volume * 15),5), 0, 15)
 	cut_overlays()
 	if(ismob(loc))
 		var/injoverlay