Merge pull request #5342 from VOREStation/upstream-merge-6199

[MIRROR] Grey scale pills and colored pillbottles

code/game/objects/items/contraband.dm

@@ -4,30 +4,14 @@
 /obj/item/weapon/storage/pill_bottle/happy
 	name = "bottle of Happy pills"
 	desc = "Highly illegal drug. When you want to see the rainbow."
-
+	wrapper_color = COLOR_PINK
-/obj/item/weapon/storage/pill_bottle/happy/New()
+	starts_with = list(/obj/item/weapon/reagent_containers/pill/happy = 7)
-	..()
-	new /obj/item/weapon/reagent_containers/pill/happy( src )
-	new /obj/item/weapon/reagent_containers/pill/happy( src )
-	new /obj/item/weapon/reagent_containers/pill/happy( src )
-	new /obj/item/weapon/reagent_containers/pill/happy( src )
-	new /obj/item/weapon/reagent_containers/pill/happy( src )
-	new /obj/item/weapon/reagent_containers/pill/happy( src )
-	new /obj/item/weapon/reagent_containers/pill/happy( src )
 
 /obj/item/weapon/storage/pill_bottle/zoom
 	name = "bottle of Zoom pills"
 	desc = "Highly illegal drug. Trade brain for speed."
-
+	wrapper_color = COLOR_BLUE
-/obj/item/weapon/storage/pill_bottle/zoom/New()
+	starts_with = list(/obj/item/weapon/reagent_containers/pill/zoom = 7)
-	..()
-	new /obj/item/weapon/reagent_containers/pill/zoom( src )
-	new /obj/item/weapon/reagent_containers/pill/zoom( src )
-	new /obj/item/weapon/reagent_containers/pill/zoom( src )
-	new /obj/item/weapon/reagent_containers/pill/zoom( src )
-	new /obj/item/weapon/reagent_containers/pill/zoom( src )
-	new /obj/item/weapon/reagent_containers/pill/zoom( src )
-	new /obj/item/weapon/reagent_containers/pill/zoom( src )
 
 /obj/item/weapon/reagent_containers/glass/beaker/vial/random
 	flags = 0

code/game/objects/items/weapons/storage/firstaid.dm

@@ -177,15 +177,25 @@
 	use_sound = null
 	max_storage_space = ITEMSIZE_COST_TINY * 14
 	max_w_class = ITEMSIZE_TINY
+	var/wrapper_color
+	var/label
 
 	var/label_text = ""
 	var/base_name = " "
 	var/base_desc = " "
 
-/obj/item/weapon/storage/pill_bottle/New()
+/obj/item/weapon/storage/pill_bottle/Initialize()
-	..()
+	. = ..()
 	base_name = name
 	base_desc = desc
+	update_icon()
+
+/obj/item/weapon/storage/pill_bottle/update_icon()
+	overlays.Cut()
+	if(wrapper_color)
+		var/image/I = image(icon, "pillbottle_wrap")
+		I.color = wrapper_color
+		overlays += I
 
 /obj/item/weapon/storage/pill_bottle/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/device/flashlight/pen))
@@ -216,61 +226,71 @@
 	desc = "[base_desc] It is labeled \"[label_text]\"."
 
 /obj/item/weapon/storage/pill_bottle/antitox
-	name = "bottle of Dylovene pills"
+	name = "pill bottle (Dylovene)"
 	desc = "Contains pills used to counter toxins."
 	starts_with = list(/obj/item/weapon/reagent_containers/pill/antitox = 7)
+	wrapper_color = COLOR_GREEN
 
 /obj/item/weapon/storage/pill_bottle/bicaridine
-	name = "bottle of Bicaridine pills"
+	name = "pill bottle (Bicaridine)"
 	desc = "Contains pills used to stabilize the severely injured."
 	starts_with = list(/obj/item/weapon/reagent_containers/pill/bicaridine = 7)
+	wrapper_color = COLOR_MAROON
 
 /obj/item/weapon/storage/pill_bottle/dexalin_plus
-	name = "bottle of Dexalin Plus pills"
+	name = "pill bottle (Dexalin Plus)"
 	desc = "Contains pills used to treat extreme cases of oxygen deprivation."
 	starts_with = list(/obj/item/weapon/reagent_containers/pill/dexalin_plus = 7)
+	wrapper_color = "#3366cc"
 
 /obj/item/weapon/storage/pill_bottle/dermaline
-	name = "bottle of Dermaline pills"
+	name = "pill bottle (Dermaline)"
 	desc = "Contains pills used to treat burn wounds."
 	starts_with = list(/obj/item/weapon/reagent_containers/pill/dermaline = 7)
+	wrapper_color = "#e8d131"
 
 /obj/item/weapon/storage/pill_bottle/dylovene
-	name = "bottle of Dylovene pills"
+	name = "pill bottle (Dylovene)"
 	desc = "Contains pills used to treat toxic substances in the blood."
 	starts_with = list(/obj/item/weapon/reagent_containers/pill/dylovene = 7)
+	wrapper_color = COLOR_GREEN
 
 /obj/item/weapon/storage/pill_bottle/inaprovaline
-	name = "bottle of Inaprovaline pills"
+	name = "pill bottle (Inaprovaline)"
 	desc = "Contains pills used to stabilize patients."
 	starts_with = list(/obj/item/weapon/reagent_containers/pill/inaprovaline = 7)
+	wrapper_color = COLOR_PALE_BLUE_GRAY
 
 /obj/item/weapon/storage/pill_bottle/kelotane
-	name = "bottle of kelotane pills"
+	name = "pill bottle (Kelotane)"
 	desc = "Contains pills used to treat burns."
 	starts_with = list(/obj/item/weapon/reagent_containers/pill/kelotane = 7)
+	wrapper_color = "#ec8b2f"
 
 /obj/item/weapon/storage/pill_bottle/spaceacillin
-	name = "bottle of Spaceacillin pills"
+	name = "pill bottle (Spaceacillin)"
 	desc = "A theta-lactam antibiotic. Effective against many diseases likely to be encountered in space."
 	starts_with = list(/obj/item/weapon/reagent_containers/pill/spaceacillin = 7)
+	wrapper_color = COLOR_PALE_GREEN_GRAY
 
 /obj/item/weapon/storage/pill_bottle/tramadol
-	name = "bottle of Tramadol pills"
+	name = "pill bottle (Tramadol)"
 	desc = "Contains pills used to relieve pain."
 	starts_with = list(/obj/item/weapon/reagent_containers/pill/tramadol = 7)
+	wrapper_color = COLOR_PURPLE_GRAY
 
 /obj/item/weapon/storage/pill_bottle/citalopram
-	name = "bottle of Citalopram pills"
+	name = "pill bottle (Citalopram)"
 	desc = "Contains pills used to stabilize a patient's mood."
 	starts_with = list(/obj/item/weapon/reagent_containers/pill/citalopram = 7)
+	wrapper_color = COLOR_GRAY
 
 /obj/item/weapon/storage/pill_bottle/carbon
-	name = "bottle of Carbon pills"
+	name = "pill bottle (Carbon)"
 	desc = "Contains pills used to neutralise chemicals in the stomach."
 	starts_with = list(/obj/item/weapon/reagent_containers/pill/carbon = 7)
 
 /obj/item/weapon/storage/pill_bottle/iron
-	name = "bottle of Iron pills"
+	name = "pill bottle (Iron)"
 	desc = "Contains pills used to aid in blood regeneration."
 	starts_with = list(/obj/item/weapon/reagent_containers/pill/iron = 7)

code/modules/reagents/Chemistry-Machinery.dm

@@ -127,7 +127,7 @@
 	data["pillSprite"] = pillsprite
 	data["bottleSprite"] = bottlesprite
 
-	var/P[20] //how many pill sprites there are. Sprites are taken from chemical.dmi and can be found in nano/images/pill.png
+	var/P[24] //how many pill sprites there are. Sprites are taken from chemical.dmi and can be found in nano/images/pill.png
 	for(var/i = 1 to P.len)
 		P[i] = i
 	data["pillSpritesAmount"] = P
@@ -238,7 +238,7 @@
 			else
 				pill_cube = "pill"
 
-			var/name = sanitizeSafe(input(usr,"Name:","Name your [pill_cube]!","[reagents.get_master_reagent_name()] ([amount_per_pill] units)") as null|text, MAX_NAME_LEN)
+			var/name = sanitizeSafe(input(usr,"Name:","Name your [pill_cube]!","[reagents.get_master_reagent_name()] ([amount_per_pill]u)") as null|text, MAX_NAME_LEN)
 
 			if(!name) //Blank name (sanitized to nothing, or left empty) or cancel
 				return
@@ -257,6 +257,10 @@
 				else //If condi is on
 					P.icon_state = "bouilloncube"//Reskinned monkey cube
 					P.desc = "A dissolvable cube."
+
+				if(P.icon_state in list("pill1", "pill2", "pill3", "pill4")) // if using greyscale, take colour from reagent
+					P.color = reagents.get_color()
+
 				reagents.trans_to_obj(P,amount_per_pill)
 				if(src.loaded_pill_bottle)
 					if(loaded_pill_bottle.contents.len < loaded_pill_bottle.max_storage_space)

code/modules/reagents/reagent_containers/pill.dm

@@ -15,7 +15,7 @@
 /obj/item/weapon/reagent_containers/pill/Initialize()
 	. = ..()
 	if(!icon_state)
-		icon_state = "pill[rand(1, 20)]"
+		icon_state = "pill[rand(1, 4)]" //preset pills only use colour changing or unique icons
 
 /obj/item/weapon/reagent_containers/pill/attack(mob/M as mob, mob/user as mob)
 	if(M == user)
@@ -92,27 +92,29 @@
 
 //Pills
 /obj/item/weapon/reagent_containers/pill/antitox
-	name = "Anti-toxins pill"
+	name = "Dylovene (25u)"
-	desc = "Neutralizes many common toxins. Contains 25 units of Dylovene."
+	desc = "Neutralizes many common toxins."
-	icon_state = "pill17"
+	icon_state = "pill1"
 
 /obj/item/weapon/reagent_containers/pill/antitox/Initialize()
 	. = ..()
 	reagents.add_reagent("anti_toxin", 25)
+	color = reagents.get_color()
 
 /obj/item/weapon/reagent_containers/pill/tox
 	name = "Toxins pill"
-	desc = "Highly toxic." //this is cooler without "contains 50u toxin"
+	desc = "Highly toxic."
-	icon_state = "pill5"
+	icon_state = "pill4"
 
 /obj/item/weapon/reagent_containers/pill/tox/Initialize()
 	. = ..()
 	reagents.add_reagent("toxin", 50)
+	color = reagents.get_color()
 
 /obj/item/weapon/reagent_containers/pill/cyanide
-	name = "Cyanide pill"
+	name = "Strange pill"
-	desc = "Don't swallow this." //this is cooler without "contains 50u cyanide"
+	desc = "It's marked 'KCN'. Smells vaguely of almonds."
-	icon_state = "pill5"
+	icon_state = "pill9"
 
 /obj/item/weapon/reagent_containers/pill/cyanide/Initialize()
 	. = ..()
@@ -121,174 +123,180 @@
 
 /obj/item/weapon/reagent_containers/pill/adminordrazine
 	name = "Adminordrazine pill"
-	desc = "It's magic. We don't have to explain it." //it's space magic you don't need the quantity
+	desc = "It's magic. We don't have to explain it."
-	icon_state = "pill15"
+	icon_state = "pillA"
 
 /obj/item/weapon/reagent_containers/pill/adminordrazine/Initialize()
 	. = ..()
 	reagents.add_reagent("adminordrazine", 5)
 
+
 /obj/item/weapon/reagent_containers/pill/stox
-	name = "Sleeping pill"
+	name = "Soporific (15u)"
-	desc = "Commonly used to treat insomnia. Contains 15 units of Soporific."
+	desc = "Commonly used to treat insomnia."
-	icon_state = "pill8"
+	icon_state = "pill2"
 
 /obj/item/weapon/reagent_containers/pill/stox/Initialize()
 	. = ..()
 	reagents.add_reagent("stoxin", 15)
-
+	color = reagents.get_color()
 
 /obj/item/weapon/reagent_containers/pill/kelotane
-	name = "Kelotane pill"
+	name = "Kelotane (15u)"
-	desc = "Used to treat burns. Contains 15 units of Kelotane."
+	desc = "Used to treat burns."
-	icon_state = "pill11"
+	icon_state = "pill3"
 
 /obj/item/weapon/reagent_containers/pill/kelotane/Initialize()
 	. = ..()
 	reagents.add_reagent("kelotane", 15)
-
+	color = reagents.get_color()
 
 /obj/item/weapon/reagent_containers/pill/paracetamol
-	name = "Paracetamol pill"
+	name = "Paracetamol (15u)"
-	desc = "Paracetamol! A painkiller for the ages. Chewables! Contains 15 units of Paracetamol."
+	desc = "Paracetamol! A painkiller for the ages. Chewables!"
-	icon_state = "pill8"
+	icon_state = "pill3"
 
 /obj/item/weapon/reagent_containers/pill/paracetamol/Initialize()
 	. = ..()
 	reagents.add_reagent("paracetamol", 15)
-
+	color = reagents.get_color()
 
 /obj/item/weapon/reagent_containers/pill/tramadol
-	name = "Tramadol pill"
+	name = "Tramadol (15u)"
-	desc = "A simple painkiller. Contains 15 units of Tramadol."
+	desc = "A simple painkiller."
-	icon_state = "pill8"
+	icon_state = "pill3"
 
 /obj/item/weapon/reagent_containers/pill/tramadol/Initialize()
 	. = ..()
 	reagents.add_reagent("tramadol", 15)
-
+	color = reagents.get_color()
 
 /obj/item/weapon/reagent_containers/pill/methylphenidate
-	name = "Methylphenidate pill"
+	name = "Methylphenidate (15u)"
-	desc = "Improves the ability to concentrate. Contains 15 units of Methylphenidate."
+	desc = "Improves the ability to concentrate."
-	icon_state = "pill8"
+	icon_state = "pill2"
 
 /obj/item/weapon/reagent_containers/pill/methylphenidate/Initialize()
 	. = ..()
 	reagents.add_reagent("methylphenidate", 15)
-
+	color = reagents.get_color()
 
 /obj/item/weapon/reagent_containers/pill/citalopram
-	name = "Citalopram pill"
+	name = "Citalopram (15u)"
-	desc = "Mild anti-depressant. Contains 15 units of Citalopram."
+	desc = "Mild anti-depressant."
-	icon_state = "pill8"
+	icon_state = "pill4"
 
 /obj/item/weapon/reagent_containers/pill/citalopram/Initialize()
 	. = ..()
 	reagents.add_reagent("citalopram", 15)
+	color = reagents.get_color()
 
 /obj/item/weapon/reagent_containers/pill/dexalin
-	name = "Dexalin pill"
+	name = "Dexalin (15u)"
-	desc = "Used to treat oxygen deprivation. Contains 15 units of Dexalin."
+	desc = "Used to treat oxygen deprivation."
-	icon_state = "pill16"
+	icon_state = "pill1"
 
 /obj/item/weapon/reagent_containers/pill/dexalin/Initialize()
 	. = ..()
 	reagents.add_reagent("dexalin", 15)
-
+	color = reagents.get_color()
 
 /obj/item/weapon/reagent_containers/pill/dexalin_plus
-	name = "Dexalin Plus pill"
+	name = "Dexalin Plus (15u)"
-	desc = "Used to treat extreme oxygen deprivation. Contains 15 units of Dexalin Plus."
+	desc = "Used to treat extreme oxygen deprivation."
-	icon_state = "pill8"
+	icon_state = "pill2"
 
 /obj/item/weapon/reagent_containers/pill/dexalin_plus/Initialize()
 	. = ..()
 	reagents.add_reagent("dexalinp", 15)
+	color = reagents.get_color()
 
 /obj/item/weapon/reagent_containers/pill/dermaline
-	name = "Dermaline pill"
+	name = "Dermaline (15u)"
-	desc = "Used to treat burn wounds. Contains 15 units of Dermaline."
+	desc = "Used to treat burn wounds."
-	icon_state = "pill12"
+	icon_state = "pill2"
 
 /obj/item/weapon/reagent_containers/pill/dermaline/Initialize()
 	. = ..()
 	reagents.add_reagent("dermaline", 15)
+	color = reagents.get_color()
 
 /obj/item/weapon/reagent_containers/pill/dylovene
-	name = "Dylovene pill"
+	name = "Dylovene (15u)"
-	desc = "A broad-spectrum anti-toxin. Contains 15 units of Dylovene."
+	desc = "A broad-spectrum anti-toxin."
-	icon_state = "pill13"
+	icon_state = "pill1"
 
 /obj/item/weapon/reagent_containers/pill/dylovene/Initialize()
 	. = ..()
 	reagents.add_reagent("anti_toxin", 15)
+	color = reagents.get_color()
 
 /obj/item/weapon/reagent_containers/pill/inaprovaline
-	name = "Inaprovaline pill"
+	name = "Inaprovaline (30u)"
-	desc = "Used to stabilize patients. Contains 30 units of Inaprovaline."
+	desc = "Used to stabilize patients."
-	icon_state = "pill20"
+	icon_state = "pill2"
 
 /obj/item/weapon/reagent_containers/pill/inaprovaline/Initialize()
 	. = ..()
 	reagents.add_reagent("inaprovaline", 30)
-
+	color = reagents.get_color()
 
 /obj/item/weapon/reagent_containers/pill/bicaridine
-	name = "Bicaridine pill"
+	name = "Bicaridine (20u)"
-	desc = "Used to treat physical injuries. Contains 20 units of Bicaridine."
+	desc = "Used to treat physical injuries."
-	icon_state = "pill18"
+	icon_state = "pill2"
 
 /obj/item/weapon/reagent_containers/pill/bicaridine/Initialize()
 	. = ..()
 	reagents.add_reagent("bicaridine", 20)
-
+	color = reagents.get_color()
 
 /obj/item/weapon/reagent_containers/pill/spaceacillin
-	name = "Spaceacillin pill"
+	name = "Spaceacillin (10u)"
-	desc = "A theta-lactam antibiotic. Effective against many diseases likely to be encountered in space. Contains 15 units of Spaceacillin."
+	desc = "A theta-lactam antibiotic. Effective against many diseases likely to be encountered in space."
-	icon_state = "pill19"
+	icon_state = "pill3"
 
 /obj/item/weapon/reagent_containers/pill/spaceacillin/Initialize()
 	. = ..()
 	reagents.add_reagent("spaceacillin", 15)
-
+	color = reagents.get_color()
 
 /obj/item/weapon/reagent_containers/pill/carbon
-	name = "Carbon pill"
+	name = "Carbon (15u)"
-	desc = "Used to neutralise chemicals in the stomach. Contains 15 units of Carbon."
+	desc = "Used to neutralise chemicals in the stomach."
-	icon_state = "pill7"
+	icon_state = "pill3"
 
 /obj/item/weapon/reagent_containers/pill/carbon/Initialize()
 	. = ..()
 	reagents.add_reagent("carbon", 15)
-
+	color = reagents.get_color()
 
 /obj/item/weapon/reagent_containers/pill/iron
-	name = "Iron pill"
+	name = "Iron (15u)"
-	desc = "Used to aid in blood regeneration after bleeding. Contains 15 units of Iron."
+	desc = "Used to aid in blood regeneration after bleeding."
-	icon_state = "pill4"
+	icon_state = "pill1"
 
 /obj/item/weapon/reagent_containers/pill/iron/Initialize()
 	. = ..()
 	reagents.add_reagent("iron", 15)
+	color = reagents.get_color()
 
 //Not-quite-medicine
 /obj/item/weapon/reagent_containers/pill/happy
 	name = "Happy pill"
-	desc = "Happy happy joy joy!" //we're not giving quantities for shady maint drugs
+	desc = "Happy happy joy joy!"
-	icon_state = "pill18"
+	icon_state = "pill4"
 
 /obj/item/weapon/reagent_containers/pill/happy/Initialize()
 	. = ..()
 	reagents.add_reagent("space_drugs", 15)
 	reagents.add_reagent("sugar", 15)
-
+	color = reagents.get_color()
 
 /obj/item/weapon/reagent_containers/pill/zoom
 	name = "Zoom pill"
 	desc = "Zoooom!"
-	icon_state = "pill18"
+	icon_state = "pill4"
 
 /obj/item/weapon/reagent_containers/pill/zoom/Initialize()
 	. = ..()
@@ -296,12 +304,14 @@
 		reagents.add_reagent("mold", 2)	//Chance to be more dangerous
 	reagents.add_reagent("expired_medicine", 5)
 	reagents.add_reagent("stimm", 5)	//VOREStation edit end: Zoom pill adjustments
+	color = reagents.get_color()
 
 /obj/item/weapon/reagent_containers/pill/diet
 	name = "diet pill"
 	desc = "Guaranteed to get you slim!"
-	icon_state = "pill9"
+	icon_state = "pill4"
 
 /obj/item/weapon/reagent_containers/pill/diet/Initialize()
 	. = ..()
 	reagents.add_reagent("lipozine", 15) //VOREStation Edit
+	color = reagents.get_color()

html/changelogs/Novacat - Colorablepill.yml

@@ -0,0 +1,38 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Novacat
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Adds greyscale pills, which are colored by their reagent"
+  - rscadd: "Adds colored pill bottles, most pre-spawned pill bottles are colored"
+  - tweak: "Prespawn pills and pill bottles have had their names simplified"

nano/css/icons.css

@@ -265,26 +265,30 @@
 .uiIcon16.icon-external64 	{ background-image: url(uiIcons64.png); background-position: -256px -64px; width: 64px; height: 64px; }
 
 .uiIcon16.icon-pill 		{ background-image: url(pills32.png); width: 32px; height: 32px;}
-.uiIcon16.icon-pill.pill1   { background-position: 0 0; }
+.uiIcon16.icon-pill.pill1   { background-position: -64px -96px; }
-.uiIcon16.icon-pill.pill2   { background-position: -32px 0; }
+.uiIcon16.icon-pill.pill2   { background-position: -64px -96px; }
-.uiIcon16.icon-pill.pill3   { background-position: -64px 0; }
+.uiIcon16.icon-pill.pill3   { background-position: -96px -32px; }
-.uiIcon16.icon-pill.pill4   { background-position: -96px 0; }
+.uiIcon16.icon-pill.pill4   { background-position: -96px -32px; }
-.uiIcon16.icon-pill.pill5   { background-position: -128px 0; }
+.uiIcon16.icon-pill.pill5   { background-position: 0 0; }
-.uiIcon16.icon-pill.pill6   { background-position: 0 -32px; }
+.uiIcon16.icon-pill.pill6   { background-position: -32px 0; }
-.uiIcon16.icon-pill.pill7   { background-position: -32px -32px; }
+.uiIcon16.icon-pill.pill7   { background-position: -64px 0; }
-.uiIcon16.icon-pill.pill8   { background-position: -64px -32px; }
+.uiIcon16.icon-pill.pill8   { background-position: -96px 0; }
-.uiIcon16.icon-pill.pill9   { background-position: -96px -32px; }
+.uiIcon16.icon-pill.pill9   { background-position: -128px 0; }
-.uiIcon16.icon-pill.pill10  { background-position: -128px -32px; }
+.uiIcon16.icon-pill.pill10   { background-position: 0 -32px; }
-.uiIcon16.icon-pill.pill11  { background-position: 0 -64px; }
+.uiIcon16.icon-pill.pill11   { background-position: -32px -32px; }
-.uiIcon16.icon-pill.pill12  { background-position: -32px -64px; }
+.uiIcon16.icon-pill.pill12   { background-position: -64px -32px; }
-.uiIcon16.icon-pill.pill13  { background-position: -64px -64px; }
+.uiIcon16.icon-pill.pill13   { background-position: -96px -32px; }
-.uiIcon16.icon-pill.pill14  { background-position: -96px -64px; }
+.uiIcon16.icon-pill.pill14  { background-position: -128px -32px; }
-.uiIcon16.icon-pill.pill15  { background-position: -128px -64px; }
+.uiIcon16.icon-pill.pill15  { background-position: 0 -64px; }
-.uiIcon16.icon-pill.pill16  { background-position: 0 -96px; }
+.uiIcon16.icon-pill.pill16  { background-position: -32px -64px; }
-.uiIcon16.icon-pill.pill17  { background-position: -32px -96px; }
+.uiIcon16.icon-pill.pill17  { background-position: -64px -64px; }
-.uiIcon16.icon-pill.pill18  { background-position: -64px -96px; }
+.uiIcon16.icon-pill.pill18  { background-position: -96px -64px; }
-.uiIcon16.icon-pill.pill19  { background-position: -96px -96px; }
+.uiIcon16.icon-pill.pill19  { background-position: -128px -64px; }
-.uiIcon16.icon-pill.pill20  { background-position: -128px -96px; }
+.uiIcon16.icon-pill.pill20  { background-position: 0 -96px; }
+.uiIcon16.icon-pill.pill21  { background-position: -32px -96px; }
+.uiIcon16.icon-pill.pill22  { background-position: -64px -96px; }
+.uiIcon16.icon-pill.pill23  { background-position: -96px -96px; }
+.uiIcon16.icon-pill.pill24  { background-position: -128px -96px; }
 .uiIcon16.icon-pill.bottle1 { background-position: 0 -128px; }
 .uiIcon16.icon-pill.bottle2 { background-position: -32px -128px; }
 .uiIcon16.icon-pill.bottle3 { background-position: -64px -128px; }