Merge pull request #5551 from IcyV/BottleFixes

Makes bottles not as terrible

code/modules/client/asset_cache.dm

@@ -268,8 +268,8 @@ proc/getFilesSlow(var/client/client, var/list/files, var/register_asset = TRUE)
 /datum/asset/chem_master/register()
 	for(var/i = 1 to 20)
 		assets["pill[i].png"] = icon('icons/obj/chemical.dmi', "pill[i]")
-	for(var/i = 1 to 20)
-		assets["bottle[i].png"] = icon('icons/obj/chemical.dmi', "bottle[i]")
+	for(var/i in list("bottle", "small_bottle", "wide_bottle", "round_bottle"))
+		assets["[i].png"] = icon('icons/obj/chemical.dmi', "[i]")
 	for(var/asset_name in assets)
 		register_asset(asset_name, assets[asset_name])
 

code/modules/reagents/Chemistry-Machinery.dm

@@ -394,7 +394,7 @@
 	var/useramount = 30 // Last used amount
 	var/pillamount = 10
 	var/patchamount = 10
-	var/bottlesprite = "1" //yes, strings
+	var/bottlesprite = "bottle"
 	var/pillsprite = "1"
 	var/client/has_sprites = list()
 	var/printing = null
@@ -646,7 +646,7 @@
 				P.name = "[name] bottle"
 				P.pixel_x = rand(-7, 7) //random position
 				P.pixel_y = rand(-7, 7)
-				P.icon_state = "bottle"+bottlesprite
+				P.icon_state = bottlesprite
 				reagents.trans_to(P,30)
 			else
 				var/obj/item/weapon/reagent_containers/food/condiment/P = new/obj/item/weapon/reagent_containers/food/condiment(loc)
@@ -667,14 +667,13 @@
 			usr << browse(dat, "window=chem_master_iconsel;size=225x193")
 			return
 		else if(href_list["change_bottle"])
-			#define MAX_BOTTLE_SPRITE 20 //max icon state of the bottle sprites
 			var/dat = "<table>"
 			var/j = 0
-			for(var/i = 1 to MAX_BOTTLE_SPRITE)
+			for(var/i in list("bottle", "small_bottle", "wide_bottle", "round_bottle"))
 				j++
 				if(j == 1)
 					dat += "<tr>"
-				dat += "<td><a href=\"?src=\ref[src]&bottle_sprite=[i]\"><img src=\"bottle[i].png\" /></a></td>"
+				dat += "<td><a href=\"?src=\ref[src]&bottle_sprite=[i]\"><img src=\"[i].png\" /></a></td>"
 				if(j == 5)
 					dat += "</tr>"
 					j = 0
@@ -728,6 +727,7 @@
 			buffer_reagents_list[++buffer_reagents_list.len] = list("name" = R.name, "volume" = R.volume, "id" = R.id, "description" = R.description)
 
 	data["pillsprite"] = pillsprite
+	data["bottlesprite"] = bottlesprite
 	data["mode"] = mode
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)

code/modules/reagents/reagent_containers/bottle.dm

@@ -1,27 +1,24 @@
 
 //Not to be confused with /obj/item/weapon/reagent_containers/food/drinks/bottle
 
+
 /obj/item/weapon/reagent_containers/glass/bottle
 	name = "bottle"
 	desc = "A small bottle."
 	icon = 'icons/obj/chemical.dmi'
-	icon_state = null
+	icon_state = "round_bottle"
 	item_state = "atoxinbottle"
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,25,30)
 	flags = OPENCONTAINER
 	volume = 30
 
-/obj/item/weapon/reagent_containers/glass/bottle/New()
-	..()
-	if(!icon_state)
-		icon_state = "bottle[rand(1,20)]"
-
 /obj/item/weapon/reagent_containers/glass/bottle/on_reagent_change()
 	update_icon()
 
 /obj/item/weapon/reagent_containers/glass/bottle/update_icon()
 	overlays.Cut()
+	underlays.Cut()
 
 	if(reagents.total_volume)
 		var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10")
@@ -40,7 +37,7 @@
 				filling.icon_state = "[icon_state]100"
 
 		filling.icon += mix_color_from_reagents(reagents.reagent_list)
-		overlays += filling
+		underlays += filling
 
 	if(!is_open_container())
 		var/image/lid = image(icon, src, "lid_bottle")
@@ -49,43 +46,37 @@
 /obj/item/weapon/reagent_containers/glass/bottle/toxin
 	name = "toxin bottle"
 	desc = "A small bottle of toxins. Do not drink, it is poisonous."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle12"
+	icon_state = "small_bottle"
 	list_reagents = list("toxin" = 30)
 
 /obj/item/weapon/reagent_containers/glass/bottle/cyanide
 	name = "cyanide bottle"
 	desc = "A small bottle of cyanide. Bitter almonds?"
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle12"
+	icon_state = "small_bottle"
 	list_reagents = list("cyanide" = 30)
 
 /obj/item/weapon/reagent_containers/glass/bottle/mutagen
 	name = "unstable mutagen bottle"
 	desc = "A small bottle of unstable mutagen. Randomly changes the DNA structure of whoever comes in contact."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle20"
+	icon_state = "bottle"
 	list_reagents = list("mutagen" = 30)
 
 /obj/item/weapon/reagent_containers/glass/bottle/ammonia
 	name = "ammonia bottle"
 	desc = "A small bottle."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle20"
+	icon_state = "bottle"
 	list_reagents = list("ammonia" = 30)
 
 /obj/item/weapon/reagent_containers/glass/bottle/diethylamine
 	name = "diethylamine bottle"
 	desc = "A small bottle."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle17"
+	icon_state = "round_bottle"
 	list_reagents = list("diethylamine" = 30)
 
 /obj/item/weapon/reagent_containers/glass/bottle/facid
 	name = "Fluorosulfuric Acid Bottle"
 	desc = "A small bottle. Contains a small amount of Fluorosulfuric Acid"
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle17"
+	icon_state = "round_bottle"
 	list_reagents = list("facid" = 30)
 
 /obj/item/weapon/reagent_containers/glass/bottle/adminordrazine
@@ -98,57 +89,49 @@
 /obj/item/weapon/reagent_containers/glass/bottle/capsaicin
 	name = "Capsaicin Bottle"
 	desc = "A small bottle. Contains hot sauce."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle3"
+	icon_state = "round_bottle"
 	list_reagents = list("capsaicin" = 30)
 
 /obj/item/weapon/reagent_containers/glass/bottle/frostoil
 	name = "Frost Oil Bottle"
 	desc = "A small bottle. Contains cold sauce."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle17"
+	icon_state = "round_bottle"
 	list_reagents = list("frostoil" = 30)
 
 /obj/item/weapon/reagent_containers/glass/bottle/morphine
 	name = "Morphine Bottle"
 	desc = "A small bottle. Contains morphine."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle17"
+	icon_state = "round_bottle"
 	list_reagents = list("morphine" = 30)
 
 /obj/item/weapon/reagent_containers/glass/bottle/ether
 	name = "Ether Bottle"
 	desc = "A small bottle. Contains ether."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle17"
+	icon_state = "round_bottle"
 	list_reagents = list("ether" = 30)
 
 /obj/item/weapon/reagent_containers/glass/bottle/charcoal
 	name = "Charcoal Bottle"
 	desc = "A small bottle. Contains charcoal."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle17"
+	icon_state = "round_bottle"
 	list_reagents = list("charcoal" = 30)
 
 /obj/item/weapon/reagent_containers/glass/bottle/epinephrine
 	name = "Epinephrine Bottle"
 	desc = "A small bottle. Contains epinephrine."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle17"
+	icon_state = "round_bottle"
 	list_reagents = list("epinephrine" = 30)
 
 /obj/item/weapon/reagent_containers/glass/bottle/pancuronium
 	name = "Pancuronium Bottle"
 	desc = "A small bottle of pancuronium."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle14"
+	icon_state = "round_bottle"
 	list_reagents = list("pancuronium" = 30)
 
 /obj/item/weapon/reagent_containers/glass/bottle/sulfonal
 	name = "Sulfonal Bottle"
 	desc = "A small bottle of Sulfonal."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle19"
+	icon_state = "round_bottle"
 	list_reagents = list("sulfonal" = 30)
 
 //Reagent bottles
@@ -156,49 +139,52 @@
 /obj/item/weapon/reagent_containers/glass/bottle/reagent
 	name = "Reagent Bottle"
 	desc = "A bottle for storing reagents"
-	icon_state = "rbottle"
+	icon_state = "reagent_bottle"
 	volume = 50
 
 /obj/item/weapon/reagent_containers/glass/bottle/reagent/oil
 	name = "Oil Bottle"
 	desc = "A reagent bottle. Contains oil."
-	icon_state = "rbottle1"
 	list_reagents = list("oil" = 50)
+	pixel_x = -4
+	pixel_y = 6
 
 /obj/item/weapon/reagent_containers/glass/bottle/reagent/phenol
 	name = "Phenol Bottle"
 	desc = "A reagent bottle. Contains phenol."
-	icon_state = "rbottle2"
 	list_reagents = list("phenol" = 50)
+	pixel_x = 6
+	pixel_y = 6
 
 /obj/item/weapon/reagent_containers/glass/bottle/reagent/acetone
 	name = "Acetone Bottle"
 	desc = "A reagent bottle. Contains acetone."
-	icon_state = "rbottle3"
 	list_reagents = list("acetone" = 50)
+	pixel_x = -4
 
 /obj/item/weapon/reagent_containers/glass/bottle/reagent/ammonia
 	name = "Ammonia Bottle"
 	desc = "A reagent bottle. Contains ammonia."
-	icon_state = "rbottle4"
 	list_reagents = list("ammonia" = 50)
+	pixel_x = 6
 
 /obj/item/weapon/reagent_containers/glass/bottle/reagent/diethylamine
 	name = "Diethylamine Bottle"
 	desc = "A reagent bottle. Contains diethylamine."
-	icon_state = "rbottle5"
 	list_reagents = list("diethylamine" = 50)
+	pixel_x = -4
+	pixel_y = -6
 
 /obj/item/weapon/reagent_containers/glass/bottle/reagent/acid
 	name = "Acid Bottle"
 	desc = "A reagent bottle. Contains sulfuric acid."
-	icon_state = "rbottle6"
 	list_reagents = list("sacid" = 50)
+	pixel_x = 6
+	pixel_y = -6
 
 /obj/item/weapon/reagent_containers/glass/bottle/reagent/formaldehyde
 	name = "Formaldehyde Bottle"
 	desc = "A reagent bottle. Contains formaldehyde."
-	icon_state = "rbottle"
 	list_reagents = list("formaldehyde" = 50)
 
 /obj/item/weapon/reagent_containers/glass/bottle/reagent/morphine
@@ -211,7 +197,6 @@
 	desc = "A reagent bottle. Contains insulin."
 	list_reagents = list("insulin" = 50)
 
-
 /obj/item/weapon/reagent_containers/glass/bottle/reagent/hairgrownium
 	name = "Hair Grow Gel"
 	desc = "A bottle full of a stimulative hair growth formula"
@@ -236,114 +221,114 @@
 /obj/item/weapon/reagent_containers/glass/bottle/plasma
 	name = "plasma dust bottle"
 	desc = "A small bottle of plasma in dust form. Extremely toxic and reacts with micro-organisms inside blood."
-	icon_state = "bottle8"
+	icon_state = "wide_bottle"
 	list_reagents = list("plasma_dust" = 30)
 
 /obj/item/weapon/reagent_containers/glass/bottle/diphenhydramine
 	name = "diphenhydramine bottle"
 	desc = "A small bottle of diphenhydramine."
-	icon_state = "bottle20"
+	icon_state = "bottle"
 	list_reagents = list("diphenhydramine" = 30)
 
 /obj/item/weapon/reagent_containers/glass/bottle/flu_virion
 	name = "Flu virion culture bottle"
 	desc = "A small bottle. Contains H13N1 flu virion culture in synthblood medium."
-	icon_state = "bottle3"
+	icon_state = "round_bottle"
 	spawned_disease = /datum/disease/advance/flu
 
 /obj/item/weapon/reagent_containers/glass/bottle/epiglottis_virion
 	name = "Epiglottis virion culture bottle"
 	desc = "A small bottle. Contains Epiglottis virion culture in synthblood medium."
-	icon_state = "bottle3"
+	icon_state = "round_bottle"
 	spawned_disease = /datum/disease/advance/voice_change
 
 /obj/item/weapon/reagent_containers/glass/bottle/liver_enhance_virion
 	name = "Liver enhancement virion culture bottle"
 	desc = "A small bottle. Contains liver enhancement virion culture in synthblood medium."
-	icon_state = "bottle3"
+	icon_state = "round_bottle"
 	spawned_disease = /datum/disease/advance/heal
 
 /obj/item/weapon/reagent_containers/glass/bottle/hullucigen_virion
 	name = "Hullucigen virion culture bottle"
 	desc = "A small bottle. Contains hullucigen virion culture in synthblood medium."
-	icon_state = "bottle3"
+	icon_state = "round_bottle"
 	spawned_disease = /datum/disease/advance/hullucigen
 
 /obj/item/weapon/reagent_containers/glass/bottle/pierrot_throat
 	name = "Pierrot's Throat culture bottle"
 	desc = "A small bottle. Contains H0NI<42 virion culture in synthblood medium."
-	icon_state = "bottle3"
+	icon_state = "round_bottle"
 	spawned_disease = /datum/disease/pierrot_throat
 
 /obj/item/weapon/reagent_containers/glass/bottle/cold
 	name = "Rhinovirus culture bottle"
 	desc = "A small bottle. Contains XY-rhinovirus culture in synthblood medium."
-	icon_state = "bottle3"
+	icon_state = "round_bottle"
 	spawned_disease = /datum/disease/advance/cold
 
 /obj/item/weapon/reagent_containers/glass/bottle/retrovirus
 	name = "Retrovirus culture bottle"
 	desc = "A small bottle. Contains a retrovirus culture in a synthblood medium."
-	icon_state = "bottle3"
+	icon_state = "round_bottle"
 	spawned_disease = /datum/disease/dna_retrovirus
 
 /obj/item/weapon/reagent_containers/glass/bottle/gbs
 	name = "GBS culture bottle"
 	desc = "A small bottle. Contains Gravitokinetic Bipotential SADS+ culture in synthblood medium."//Or simply - General BullShit
-	icon_state = "bottle3"
+	icon_state = "round_bottle"
 	amount_per_transfer_from_this = 5
 	spawned_disease = /datum/disease/gbs
 
 /obj/item/weapon/reagent_containers/glass/bottle/fake_gbs
 	name = "GBS culture bottle"
 	desc = "A small bottle. Contains Gravitokinetic Bipotential SADS- culture in synthblood medium."//Or simply - General BullShit
-	icon_state = "bottle3"
+	icon_state = "round_bottle"
 	spawned_disease = /datum/disease/fake_gbs
 
 /obj/item/weapon/reagent_containers/glass/bottle/brainrot
 	name = "Brainrot culture bottle"
 	desc = "A small bottle. Contains Cryptococcus Cosmosis culture in synthblood medium."
-	icon_state = "bottle3"
+	icon_state = "round_bottle"
 	spawned_disease = /datum/disease/brainrot
 
 /obj/item/weapon/reagent_containers/glass/bottle/magnitis
 	name = "Magnitis culture bottle"
 	desc = "A small bottle. Contains a small dosage of Fukkos Miracos."
-	icon_state = "bottle3"
+	icon_state = "round_bottle"
 	spawned_disease = /datum/disease/magnitis
 
 /obj/item/weapon/reagent_containers/glass/bottle/wizarditis
 	name = "Wizarditis culture bottle"
 	desc = "A small bottle. Contains a sample of Rincewindus Vulgaris."
-	icon_state = "bottle3"
+	icon_state = "round_bottle"
 	spawned_disease = /datum/disease/wizarditis
 
 /obj/item/weapon/reagent_containers/glass/bottle/anxiety
 	name = "Severe Anxiety culture bottle"
 	desc = "A small bottle. Contains a sample of Lepidopticides."
-	icon_state = "bottle3"
+	icon_state = "round_bottle"
 	spawned_disease = /datum/disease/anxiety
 
 /obj/item/weapon/reagent_containers/glass/bottle/beesease
 	name = "Beesease culture bottle"
 	desc = "A small bottle. Contains a sample of invasive Apidae."
-	icon_state = "bottle3"
+	icon_state = "round_bottle"
 	spawned_disease = /datum/disease/beesease
 
 /obj/item/weapon/reagent_containers/glass/bottle/fluspanish
 	name = "Spanish flu culture bottle"
 	desc = "A small bottle. Contains a sample of Inquisitius."
-	icon_state = "bottle3"
+	icon_state = "round_bottle"
 	spawned_disease = /datum/disease/fluspanish
 
 /obj/item/weapon/reagent_containers/glass/bottle/tuberculosis
 	name = "Fungal Tuberculosis culture bottle"
 	desc = "A small bottle. Contains a sample of Fungal Tubercle bacillus."
-	icon_state = "bottle3"
+	icon_state = "round_bottle"
 	spawned_disease = /datum/disease/tuberculosis
 
 /obj/item/weapon/reagent_containers/glass/bottle/tuberculosiscure
 	name = "BVAK bottle"
 	desc = "A small bottle containing Bio Virus Antidote Kit."
-	icon_state = "bottle5"
+	icon_state = "wide_bottle"
 	list_reagents = list("atropine" = 5, "epinephrine" = 5, "salbutamol" = 10, "spaceacillin" = 10)