Merge pull request #10800 from VOREStation/Icons/chemistry

Swap chemmaster, port beaker sprites

code/modules/food/glass/bottle.dm

@@ -37,25 +37,26 @@
 /obj/item/weapon/reagent_containers/glass/bottle/update_icon()
 	cut_overlays()
 
-	if(reagents.total_volume && (icon_state == "bottle-1" || icon_state == "bottle-2" || icon_state == "bottle-3" || icon_state == "bottle-4"))
+	if(reagents.total_volume)
 		var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10")
 
 		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.1 to 20)	filling.icon_state = "[icon_state]-10"
+			if(20 to 40) 	filling.icon_state = "[icon_state]-20"
+			if(40 to 60)	filling.icon_state = "[icon_state]-40"
+			if(60 to 80)	filling.icon_state = "[icon_state]-60"
+			if(80 to 100)	filling.icon_state = "[icon_state]-80"
+			if(100 to INFINITY)	filling.icon_state = "[icon_state]-100"
 
 		filling.color = reagents.get_color()
 		add_overlay(filling)
 
 	if (!is_open_container())
-		var/image/lid = image(icon, src, "lid_bottle")
-		add_overlay(lid)
+		add_overlay("lid_[initial(icon_state)]")
+
+	if (label_text)
+		add_overlay("label_[initial(icon_state)]")
 
 /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline
 	name = "inaprovaline bottle"

code/modules/reagents/machinery/chem_master_vr.dm

@@ -1,2 +0,0 @@
-/obj/machinery/chem_master
-	icon = 'icons/obj/chemical_vr.dmi'

code/modules/reagents/reagent_containers/glass.dm

@@ -150,6 +150,7 @@
 	else
 		name = "[base_name] ([label_text])"
 	desc = "[base_desc] It is labeled \"[label_text]\"."
+	update_icon()
 
 /obj/item/weapon/reagent_containers/glass/beaker
 	name = "beaker"
@@ -189,13 +190,12 @@
 
 		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.1 to 20)	filling.icon_state = "[icon_state]-10"
+			if(20 to 40) 	filling.icon_state = "[icon_state]-20"
+			if(40 to 60)	filling.icon_state = "[icon_state]-40"
+			if(60 to 80)	filling.icon_state = "[icon_state]-60"
+			if(80 to 100)	filling.icon_state = "[icon_state]-80"
+			if(100 to INFINITY)	filling.icon_state = "[icon_state]-100"
 
 		filling.color = reagents.get_color()
 		add_overlay(filling)
@@ -203,6 +203,9 @@
 	if (!is_open_container())
 		add_overlay("lid_[initial(icon_state)]")
 
+	if (label_text)
+		add_overlay("label_[initial(icon_state)]")
+
 /obj/item/weapon/reagent_containers/glass/beaker/large
 	name = "large beaker"
 	desc = "A large beaker."

vorestation.dme

@@ -3810,7 +3810,6 @@
 #include "code\modules\reagents\hoses\hose.dm"
 #include "code\modules\reagents\hoses\hose_connector.dm"
 #include "code\modules\reagents\machinery\chem_master.dm"
-#include "code\modules\reagents\machinery\chem_master_vr.dm"
 #include "code\modules\reagents\machinery\chemalyzer.dm"
 #include "code\modules\reagents\machinery\distillery.dm"
 #include "code\modules\reagents\machinery\grinder.dm"