Add colors to pill bottles and patch packs (#25650)

* Add colors to pill bottles and patch packs

* Tweak chem master colors

* Make patch pack overlay lighter

* Deduplicate code and update colors

* Fix linter

* Move proc

---------

Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
This commit is contained in:
Arthri
2024-06-06 13:08:31 +00:00
committed by GitHub
co-authored by Arthri
parent eab017ce4e
commit ac5a4dfe11
4 changed files with 14 additions and 5 deletions
@@ -440,7 +440,8 @@
/obj/item/storage/box/pillbottles/populate_contents()
for(var/I in 1 to 7)
new /obj/item/storage/pill_bottle(src)
var/obj/item/storage/pill_bottle/P = new /obj/item/storage/pill_bottle(src)
P.apply_wrapper_color(I)
/obj/item/storage/box/patch_packs
name = "box of patch packs"
@@ -449,7 +450,8 @@
/obj/item/storage/box/patch_packs/populate_contents()
for(var/I in 1 to 7)
new /obj/item/storage/pill_bottle/patch_pack(src)
var/obj/item/storage/pill_bottle/P = new /obj/item/storage/pill_bottle/patch_pack(src)
P.apply_wrapper_color(I)
/obj/item/storage/box/bodybags
name = "body bags"
@@ -357,6 +357,11 @@
else
return ..()
/obj/item/storage/pill_bottle/proc/apply_wrapper_color(color_number)
var/static/list/colors = list(COLOR_RED, COLOR_ORANGE, COLOR_YELLOW, COLOR_GREEN, COLOR_CYAN_BLUE, COLOR_VIOLET, COLOR_PURPLE)
wrapper_color = colors[(color_number - 1) % length(colors) + 1]
apply_wrap()
/obj/item/storage/pill_bottle/patch_pack
name = "patch pack"
desc = "It's a container for storing medical patches."
@@ -24,16 +24,18 @@
var/production_mode = null
var/printing = FALSE
var/static/list/pill_bottle_wrappers = list(
COLOR_RED = "Red",
COLOR_RED_LIGHT = "Red",
COLOR_GREEN = "Green",
COLOR_PALE_BTL_GREEN = "Pale Green",
COLOR_BLUE = "Blue",
COLOR_CYAN_BLUE = "Light Blue",
COLOR_TEAL = "Teal",
COLOR_YELLOW = "Yellow",
COLOR_ORANGE = "Orange",
COLOR_PINK = "Pink",
COLOR_MAROON = "Brown"
COLOR_MAROON = "Brown",
COLOR_INDIGO = "Indigo",
COLOR_VIOLET = "Violet",
COLOR_PURPLE = "Purple"
)
var/list/datum/chemical_production_mode/production_modes = list()
Binary file not shown.

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 49 KiB