TGS Test Merge (#5838)

code/datums/diseases/black_goo.dm

@@ -257,7 +257,6 @@
 /obj/item/reagent_container/glass/bottle/labeled_black_goo_cure
 	name = "\"Pathogen\" cure bottle"
 	desc = "The bottle has a biohazard symbol on the front, and has a label, designating its use against Agent A0-3959X.91–15, colloquially known as the \"Black Goo\"."
-	icon_state = "bottle20"
 
 /obj/item/reagent_container/glass/bottle/labeled_black_goo_cure/Initialize()
 	. = ..()

code/game/machinery/autolathe_datums.dm

@@ -409,7 +409,7 @@
 	path = /obj/item/reagent_container/blood
 
 /datum/autolathe/recipe/medilathe/bluespace
-	name = "bluespace beaker"
+	name = "high-capacity beaker"
 	path = /obj/item/reagent_container/glass/beaker/bluespace
 
 /datum/autolathe/recipe/medilathe/bonesetter

code/game/objects/items/reagent_containers/glass.dm

@@ -217,17 +217,16 @@
 	overlays.Cut()
 
 	if(reagents && reagents.total_volume)
-		var/image/filling = image('icons/obj/items/reagentfillings.dmi', src, "[icon_state]10")
+		var/image/filling = image('icons/obj/items/reagentfillings.dmi', src, "[icon_state]-20")
 
 		var/percent = round((reagents.total_volume / volume) * 100)
 		switch(percent)
-			if(0 to 9) filling.icon_state = "[icon_state]-10"
-			if(10 to 24) filling.icon_state = "[icon_state]10"
-			if(25 to 49) filling.icon_state = "[icon_state]25"
-			if(50 to 74) filling.icon_state = "[icon_state]50"
-			if(75 to 79) filling.icon_state = "[icon_state]75"
-			if(80 to 90) filling.icon_state = "[icon_state]80"
-			if(91 to INFINITY) filling.icon_state = "[icon_state]100"
+			if(0) filling.icon_state = null
+			if(1 to 20) filling.icon_state = "[icon_state]-20"
+			if(21 to 40) filling.icon_state = "[icon_state]-40"
+			if(41 to 60) filling.icon_state = "[icon_state]-60"
+			if(61 to 80) filling.icon_state = "[icon_state]-80"
+			if(81 to INFINITY) filling.icon_state = "[icon_state]-100"
 
 		filling.color = mix_color_from_reagents(reagents.reagent_list)
 		overlays += filling
@@ -345,8 +344,8 @@
 	flags_atom = FPRINT|OPENCONTAINER|NOREACT
 
 /obj/item/reagent_container/glass/beaker/bluespace
-	name = "bluespace beaker"
-	desc = "A beaker with an enlarged holding capacity, made with blue-tinted plexiglass in order to withstand greater pressure - affectionately nicknamed \"bluespace\". Can hold up to 300 units."
+	name = "high-capacity beaker"
+	desc = "A beaker with an enlarged holding capacity, made with blue-tinted plexiglass in order to withstand greater pressure. Can hold up to 300 units."
 	icon_state = "beakerbluespace"
 	matter = list("glass" = 10000)
 	volume = 300