Finished colors for other prespawned pillbottles, new colors, finished template for changing wrappers in chemmaster

code/__DEFINES/misc.dm

@@ -57,16 +57,88 @@
 #define MAX_STACK_AMOUNT_GLASS	50
 #define MAX_STACK_AMOUNT_RODS	60
 
-//some colors
-#define COLOR_RED 		"#FF0000"
-#define COLOR_GREEN 	"#00FF00"
-#define COLOR_BLUE 		"#0000FF"
-#define COLOR_CYAN 		"#00FFFF"
-#define COLOR_PINK 		"#FF00FF"
-#define COLOR_YELLOW 	"#FFFF00"
-#define COLOR_ORANGE 	"#FF9900"
-#define COLOR_WHITE 	"#FFFFFF"
-#define COLOR_GRAY      "#808080"
+//Colors
+#define COLOR_RED 			   "#FF0000"
+#define COLOR_GREEN 		   "#00FF00"
+#define COLOR_BLUE 			   "#0000FF"
+#define COLOR_CYAN 			   "#00FFFF"
+#define COLOR_PINK 			   "#FF00FF"
+#define COLOR_YELLOW 		   "#FFFF00"
+#define COLOR_ORANGE 		   "#FF9900"
+#define COLOR_WHITE 		   "#FFFFFF"
+#define COLOR_GRAY      	   "#808080"
+#define COLOR_BLACK            "#000000"
+#define COLOR_NAVY_BLUE        "#000080"
+#define COLOR_LIGHT_GREEN      "#008000"
+#define COLOR_DARK_GRAY        "#404040"
+#define COLOR_MAROON           "#800000"
+#define COLOR_PURPLE           "#800080"
+#define COLOR_VIOLET           "#9933ff"
+#define COLOR_OLIVE            "#808000"
+#define COLOR_BROWN_ORANGE     "#824b28"
+#define COLOR_DARK_ORANGE      "#b95a00"
+#define COLOR_GRAY40           "#666666"
+#define COLOR_GRAY20           "#333333"
+#define COLOR_GRAY15           "#151515"
+#define COLOR_SEDONA           "#cc6600"
+#define COLOR_DARK_BROWN       "#917448"
+#define COLOR_DEEP_SKY_BLUE    "#00e1ff"
+#define COLOR_LIME             "#00ff00"
+#define COLOR_TEAL             "#33cccc"
+#define COLOR_PALE_PINK        "#bf89ba"
+#define COLOR_YELLOW_GRAY      "#c9a344"
+#define COLOR_PALE_YELLOW      "#c1bb7a"
+#define COLOR_WARM_YELLOW      "#b3863c"
+#define COLOR_RED_GRAY         "#aa5f61"
+#define COLOR_BROWN            "#b19664"
+#define COLOR_GREEN_GRAY       "#8daf6a"
+#define COLOR_DARK_GREEN_GRAY  "#54654c"
+#define COLOR_BLUE_GRAY        "#6a97b0"
+#define COLOR_DARK_BLUE_GRAY   "#3e4855"
+#define COLOR_SUN              "#ec8b2f"
+#define COLOR_PURPLE_GRAY      "#a2819e"
+#define COLOR_BLUE_LIGHT       "#33ccff"
+#define COLOR_RED_LIGHT        "#ff3333"
+#define COLOR_BEIGE            "#ceb689"
+#define COLOR_BABY_BLUE        "#89cff0"
+#define COLOR_PALE_GREEN_GRAY  "#aed18b"
+#define COLOR_PALE_RED_GRAY    "#cc9090"
+#define COLOR_PALE_PURPLE_GRAY "#bda2ba"
+#define COLOR_PALE_BLUE_GRAY   "#8bbbd5"
+#define COLOR_LUMINOL          "#66ffff"
+#define COLOR_SILVER           "#c0c0c0"
+#define COLOR_GRAY80           "#cccccc"
+#define COLOR_OFF_WHITE        "#eeeeee"
+#define COLOR_GOLD             "#6d6133"
+#define COLOR_NT_RED           "#9d2300"
+#define COLOR_BOTTLE_GREEN     "#1f6b4f"
+#define COLOR_PALE_BTL_GREEN   "#57967f"
+#define COLOR_GUNMETAL         "#545c68"
+#define COLOR_WALL_GUNMETAL    "#353a42"
+#define COLOR_STEEL            "#a8b0b2"
+#define COLOR_MUZZLE_FLASH     "#ffffb2"
+#define COLOR_CHESTNUT         "#996633"
+#define COLOR_BEASTY_BROWN     "#663300"
+#define COLOR_WHEAT            "#ffff99"
+#define COLOR_CYAN_BLUE        "#3366cc"
+#define COLOR_LIGHT_CYAN       "#66ccff"
+#define COLOR_PAKISTAN_GREEN   "#006600"
+#define COLOR_HULL             "#436b8e"
+#define COLOR_AMBER            "#ffbf00"
+#define COLOR_COMMAND_BLUE     "#46698c"
+#define COLOR_SKY_BLUE         "#5ca1cc"
+#define COLOR_PALE_ORANGE      "#b88a3b"
+#define COLOR_CIVIE_GREEN      "#b7f27d"
+#define COLOR_TITANIUM         "#d1e6e3"
+#define COLOR_DARK_GUNMETAL    "#4c535b"
+#define COLOR_BRONZE           "#8c7853"
+#define COLOR_BRASS            "#b99d71"
+#define COLOR_INDIGO           "#4b0082"
+#define COLOR_ALUMINIUM        "#bbbbbb"
+#define COLOR_CRYSTAL          "#00c8a5"
+#define COLOR_ASTEROID_ROCK    "#735555"
+#define COLOR_NULLGLASS        "#ff6088"
+#define COLOR_DIAMOND          "#d8d4ea"
 
 //FONTS:
 // Used by Paper and PhotoCopier (and PaperBin once a year).

code/game/objects/items/contraband.dm

@@ -54,6 +54,7 @@
 /obj/item/storage/pill_bottle/random_drug_bottle
 	name = "pill bottle (???)"
 	desc = "Huh."
+	wrapper_color = COLOR_GRAY
 
 /obj/item/storage/pill_bottle/random_drug_bottle/New()
 	..()

code/game/objects/items/random_items.dm

@@ -123,6 +123,7 @@
 /obj/item/storage/pill_bottle/random_meds
 	name = "unlabelled pillbottle"
 	desc = "The sheer recklessness of this bottle's existence astounds you."
+	wrapper_color = COLOR_GRAY
 	var/labelled = FALSE
 
 /obj/item/storage/pill_bottle/random_meds/New()

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

@@ -269,9 +269,6 @@
 		var/image/I = image(icon, "pillbottle_wrap")
 		I.color = wrapper_color
 		overlays += I
-	else
-		wrapper_color = pick(COLOR_RED, COLOR_BLUE, COLOR_CYAN, COLOR_GRAY, COLOR_GREEN, COLOR_ORANGE, COLOR_PINK, COLOR_RED, COLOR_YELLOW)
-		apply_wrap()
 
 /obj/item/storage/pill_bottle/attack(mob/M, mob/user)
 	if(iscarbon(M) && contents.len)
@@ -288,6 +285,9 @@
 	else
 		return ..()
 
+/obj/item/storage/pill_bottle/ert
+	wrapper_color = COLOR_TEAL
+
 /obj/item/storage/pill_bottle/ert/New()
 	..()
 	new /obj/item/reagent_containers/food/pill/salicylic(src)
@@ -333,6 +333,7 @@
 
 /obj/item/storage/pill_bottle/patch_pack
 	name = "Patch Pack"
+	desc = "It's a container for storing medical patches."
 	icon_state = "patch_pack"
 	can_hold = list(/obj/item/reagent_containers/food/pill/patch)
 	cant_hold = list()
@@ -358,7 +359,7 @@
 /obj/item/storage/pill_bottle/painkillers
 	name = "Pill Bottle (Salicylic Acid)"
 	desc = "Contains various pills for minor pain relief."
-	wrapper_color = COLOR_RED
+	wrapper_color = LIGHT_COLOR_RED
 
 /obj/item/storage/pill_bottle/painkillers/New()
 	..()
@@ -371,8 +372,11 @@
 	new /obj/item/reagent_containers/food/pill/salicylic(src)
 	new /obj/item/reagent_containers/food/pill/salicylic(src)
 
+/obj/item/storage/pill_bottle/fakedeath
+	wrapper_color = COLOR_GRAY
+
 /obj/item/storage/pill_bottle/fakedeath/New()
 	..()
 	new /obj/item/reagent_containers/food/pill/fakedeath(src)
 	new /obj/item/reagent_containers/food/pill/fakedeath(src)
-	new /obj/item/reagent_containers/food/pill/fakedeath(src)
+	new /obj/item/reagent_containers/food/pill/fakedeath(src)

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -110,6 +110,7 @@
 /obj/item/storage/pill_bottle/psychiatrist
 	name = "psychiatrist's pill bottle"
 	desc = "Contains various pills to calm or sedate patients."
+	wrapper_color = COLOR_WHITE
 
 /obj/item/storage/pill_bottle/psychiatrist/New()
 	..()

code/modules/reagents/chemistry/machinery/chem_master.dm

@@ -133,6 +133,11 @@
 		if(loaded_pill_bottle)
 			loaded_pill_bottle.forceMove(loc)
 			loaded_pill_bottle = null
+	else if(href_list["change_pillbottle"])
+		if(loaded_pill_bottle)
+			loaded_pill_bottle.wrapper_color = COLOR_RED;
+			loaded_pill_bottle.apply_wrap();
+			usr << browse(null, "window=chem_master_iconsel")
 	else if(href_list["close"])
 		usr << browse(null, "window=chem_master")
 		onclose(usr, "chem_master")