diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index c28fd68fc62..20766ef38cb 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -6,14 +6,26 @@ w_class = WEIGHT_CLASS_TINY var/colour = "red" var/open = 0 + var/list/lipstick_colors = list( + "purple" = "purple", + "jade" = "#216F43", + "lime" = "lime", + "black" = "black", + "green" = "green", + "blue" = "blue", + "white" = "white") + /obj/item/lipstick/purple name = "purple lipstick" colour = "purple" /obj/item/lipstick/jade - //It's still called Jade, but theres no HTML color for jade, so we use lime. name = "jade lipstick" + colour = "#216F43" + +/obj/item/lipstick/lime + name = "lime lipstick" colour = "lime" /obj/item/lipstick/black @@ -36,8 +48,9 @@ name = "lipstick" /obj/item/lipstick/random/New() - colour = pick("red","purple","lime","black","green","blue","white") - name = "[colour] lipstick" + var/lscolor = pick(lipstick_colors)//A random color is picked from the var defined initially in a new var. + colour = lipstick_colors[lscolor]//The color of the lipstick is pulled from the new variable (right hand side, HTML & Hex RGB) + name = "[lscolor] lipstick"//The new variable is also used to match the name to the color of the lipstick. Kudos to Desolate & Lemon /obj/item/lipstick/attack_self(mob/user as mob) diff --git a/code/modules/client/preference/loadout/loadout_cosmetics.dm b/code/modules/client/preference/loadout/loadout_cosmetics.dm index c9b82a0259b..aa7f5f02576 100644 --- a/code/modules/client/preference/loadout/loadout_cosmetics.dm +++ b/code/modules/client/preference/loadout/loadout_cosmetics.dm @@ -1,7 +1,11 @@ /datum/gear/lipstick + display_name = "lipstick, red" + path = /obj/item/lipstick + sort_category = "Cosmetics" + +/datum/gear/lipstick/black display_name = "lipstick, black" path = /obj/item/lipstick/black - sort_category = "Cosmetics" /datum/gear/lipstick/jade display_name = "lipstick, jade" @@ -11,9 +15,13 @@ display_name = "lipstick, purple" path = /obj/item/lipstick/purple -/datum/gear/lipstick/red - display_name = "lipstick, red" - path = /obj/item/lipstick +/datum/gear/lipstick/blue + display_name = "lipstick, blue" + path = /obj/item/lipstick/blue + +/datum/gear/lipstick/lime + display_name = "lipstick, lime" + path = /obj/item/lipstick/lime /datum/gear/monocle display_name = "monocle"