From 74ffb9bbdb4b6f9aa7ea6c409e1f919c38bbdd5c Mon Sep 17 00:00:00 2001 From: Gwydion Brain Date: Sun, 23 Sep 2018 01:37:09 -0700 Subject: [PATCH] Refactors lipstick New variable [stickprefix] so RGB codes can be called on all color variants --- code/game/objects/items/weapons/cosmetics.dm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index aa19909578c..e98a258378f 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -6,41 +6,49 @@ w_class = WEIGHT_CLASS_TINY var/colour = "red" var/open = 0 + var/stickprefix = "red" /obj/item/lipstick/purple name = "purple lipstick" colour = "purple" + stickprefix = "purple" /obj/item/lipstick/jade name = "jade lipstick" colour = "#216F43" + stickprefix = "jade" /obj/item/lipstick/lime name = "lime lipstick" colour = "lime" + stickprefix = "lime" /obj/item/lipstick/black name = "black lipstick" colour = "black" + stickprefix = "black" /obj/item/lipstick/green name = "green lipstick" colour = "green" + stickprefix = "green" /obj/item/lipstick/blue name = "blue lipstick" colour = "blue" + stickprefix = "blue" /obj/item/lipstick/white name = "white lipstick" colour = "white" + stickprefix = "white" /obj/item/lipstick/random name = "lipstick" /obj/item/lipstick/random/New() - colour = pick("red","purple","lime","black","green","blue","white") - name = "[colour] lipstick" + colour = pick("red","purple","lime","black","green","blue","white","#216F43") + name = "[stickprefix] lipstick" /obj/item/lipstick/attack_self(mob/user as mob)