Merge pull request #11767 from Arkatos1/pillbottle

New Medical Directive - Colored Pillbottles!

code/game/objects/items/contraband.dm

@@ -4,6 +4,7 @@
 /obj/item/storage/pill_bottle/happy
 	name = "Happy pills"
 	desc = "Highly illegal drug. When you want to see the rainbow."
+	wrapper_color = COLOR_PINK
 
 /obj/item/storage/pill_bottle/happy/New()
 	..()
@@ -18,6 +19,7 @@
 /obj/item/storage/pill_bottle/zoom
 	name = "Zoom pills"
 	desc = "Highly illegal drug. Trade brain for speed."
+	wrapper_color = COLOR_BLUE
 
 /obj/item/storage/pill_bottle/zoom/New()
 	..()
@@ -49,15 +51,12 @@
 		adulterants--
 		reagents.add_reagent(pick_list("chemistry_tools.json", "CYBERPUNK_drug_adulterants"), 3)
 
-
-
 /obj/item/storage/pill_bottle/random_drug_bottle
 	name = "pill bottle (???)"
 	desc = "Huh."
+	allow_wrap = FALSE
 
 /obj/item/storage/pill_bottle/random_drug_bottle/New()
 	..()
 	for(var/i in 1 to 5)
 		new /obj/item/reagent_containers/food/pill/random_drugs(src)
-
-

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."
+	allow_wrap = FALSE
 	var/labelled = FALSE
 
 /obj/item/storage/pill_bottle/random_meds/New()

code/game/objects/items/weapons/dice.dm

@@ -4,6 +4,7 @@
 	icon = 'icons/obj/dice.dmi'
 	icon_state = "dicebag"
 	can_hold = list(/obj/item/dice)
+	allow_wrap = FALSE
 
 /obj/item/storage/pill_bottle/dice/New()
 	..()

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

@@ -254,10 +254,21 @@
 	var/applying_meds = FALSE //To Prevent spam clicking and generating runtimes from apply a deleting pill multiple times.
 	var/rapid_intake_message = "unscrews the cap on the pill bottle and begins dumping the entire contents down their throat!"
 	var/rapid_post_instake_message = "downs the entire bottle of pills in one go!"
+	var/allow_wrap = TRUE
+	var/wrapper_color = null
 
 /obj/item/storage/pill_bottle/New()
 	..()
 	base_name = name
+	if(allow_wrap)
+		apply_wrap()
+
+/obj/item/storage/pill_bottle/proc/apply_wrap()
+	if(wrapper_color)
+		overlays.Cut()
+		var/image/I = image(icon, "pillbottle_wrap")
+		I.color = wrapper_color
+		overlays += I
 
 /obj/item/storage/pill_bottle/attack(mob/M, mob/user)
 	if(iscarbon(M) && contents.len)
@@ -274,6 +285,9 @@
 	else
 		return ..()
 
+/obj/item/storage/pill_bottle/ert
+	wrapper_color = COLOR_MAROON
+
 /obj/item/storage/pill_bottle/ert/New()
 	..()
 	new /obj/item/reagent_containers/food/pill/salicylic(src)
@@ -319,15 +333,18 @@
 
 /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()
 	rapid_intake_message = "flips the lid of the Patch Pack open and begins rapidly stamping patches on themselves!"
 	rapid_post_instake_message = "stamps the entire contents of the Patch Pack all over their entire body!"
+	allow_wrap = FALSE
 
 /obj/item/storage/pill_bottle/charcoal
 	name = "Pill bottle (Charcoal)"
 	desc = "Contains pills used to counter toxins."
+	wrapper_color = COLOR_GREEN
 
 	New()
 		..()
@@ -342,6 +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
 
 /obj/item/storage/pill_bottle/painkillers/New()
 	..()
@@ -354,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
+	allow_wrap = FALSE
+
 /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_PALE_BTL_GREEN
 
 /obj/item/storage/pill_bottle/psychiatrist/New()
 	..()