From f0b2c596e1412086b8fc3a52ff122c3d5ee52868 Mon Sep 17 00:00:00 2001 From: Gwydion Brain Date: Sat, 22 Sep 2018 21:39:14 -0700 Subject: [PATCH 1/4] Initial Fixes jade lipstick being lime. Adds lime lipstick. --- code/game/objects/items/weapons/cosmetics.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index c28fd68fc62..aa19909578c 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -12,8 +12,11 @@ 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 From 74ffb9bbdb4b6f9aa7ea6c409e1f919c38bbdd5c Mon Sep 17 00:00:00 2001 From: Gwydion Brain Date: Sun, 23 Sep 2018 01:37:09 -0700 Subject: [PATCH 2/4] 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) From 3e4c7b476b46c6c30d72eca40021e7a8d62b4db4 Mon Sep 17 00:00:00 2001 From: Gwydion Brain Date: Mon, 24 Sep 2018 23:06:21 -0700 Subject: [PATCH 3/4] I have no idea how this works --- code/game/objects/items/weapons/cosmetics.dm | 22 +++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index e98a258378f..96c13f0d54c 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -6,49 +6,51 @@ w_class = WEIGHT_CLASS_TINY var/colour = "red" var/open = 0 - var/stickprefix = "red" + 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" - 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","#216F43") - name = "[stickprefix] lipstick" + var/lscolor = pick(lipstick_colors) + colour = lipstick_colors[lscolor] + name = "[lscolor] lipstick" /obj/item/lipstick/attack_self(mob/user as mob) From d426ed18797465c88cc2ea732489a0dbf3baee30 Mon Sep 17 00:00:00 2001 From: Gwydion Brain Date: Thu, 27 Sep 2018 14:17:32 -0700 Subject: [PATCH 4/4] Adds comments and loadout --- code/game/objects/items/weapons/cosmetics.dm | 6 +++--- .../preference/loadout/loadout_cosmetics.dm | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 96c13f0d54c..20766ef38cb 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -48,9 +48,9 @@ name = "lipstick" /obj/item/lipstick/random/New() - var/lscolor = pick(lipstick_colors) - colour = lipstick_colors[lscolor] - name = "[lscolor] 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"