From 297f2f804d539f94491165d184ba93587e3b98b8 Mon Sep 17 00:00:00 2001 From: Cydia Date: Sun, 11 Oct 2020 00:52:41 -0500 Subject: [PATCH 1/3] new lipstick wip --- code/game/objects/items/cosmetics.dm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index 4dcaed2c..254827d7 100644 --- a/code/game/objects/items/cosmetics.dm +++ b/code/game/objects/items/cosmetics.dm @@ -20,6 +20,34 @@ /obj/item/lipstick/black name = "black lipstick" colour = "black" + +/obj/item/lipstick/yellow + name = "yellow lipstick" + colour = "yellow" + +/obj/item/lipstick/blue + name = "blue lipstick" + colour = "blue" + +/obj/item/lipstick/teal + name = "teal lipstick" + colour = "teal" + +/obj/item/lipstick/fuchsia + name = "fuchsia lipstick" + colour = "fuchsia" + +/obj/item/lipstick/navy + name = "navy blue lipstick" + colour = "navy" + +/obj/item/lipstick/aqua + name = "cyan lipstick" + colour = "aqua" + +/obj/item/lipstick/white + name = "white lipstick" + colour = "white" /obj/item/lipstick/random name = "lipstick" From f84f10681e5738351cded36fee71303b639b57a7 Mon Sep 17 00:00:00 2001 From: Cydia Date: Sun, 11 Oct 2020 01:06:18 -0500 Subject: [PATCH 2/3] Lipstick to the loadout!! --- .../code/modules/client/loadout/backpack.dm | 68 ++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/client/loadout/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm index 1c0b40f4..04c47593 100644 --- a/modular_citadel/code/modules/client/loadout/backpack.dm +++ b/modular_citadel/code/modules/client/loadout/backpack.dm @@ -138,4 +138,70 @@ name = "A diamond ring box" category = SLOT_IN_BACKPACK path = /obj/item/storage/fancy/ringbox/diamond - cost = 5 \ No newline at end of file + cost = 5 + +/datum/gear/lipstick + name = "Lipstick" + category = SLOT_IN_BACKPACK + path = /obj/item/lipstick + cost = 1 + +/datum/gear/lipstick_jade + name = "Jade Lipstick" + category = SLOT_IN_BACKPACK + path = /obj/item/lipstick/jade + cost = 1 + +/datum/gear/lipstick_purple + name = "Purple Lipstick" + category = SLOT_IN_BACKPACK + path = /obj/item/lipstick/purple + cost = 1 + +/datum/gear/lipstick_black + name = "Black Lipstick" + category = SLOT_IN_BACKPACK + path = /obj/item/lipstick/black + cost = 1 + +/datum/gear/lipstick_yellow + name = "Yellow Lipstick" + category = SLOT_IN_BACKPACK + path = /obj/item/lipstick/yellow + cost = 1 + +/datum/gear/lipstick_blue + name = "Blue Lipstick" + category = SLOT_IN_BACKPACK + path = /obj/item/lipstick/blue + cost = 1 + +/datum/gear/lipstick_teal + name = "Teal Lipstick" + category = SLOT_IN_BACKPACK + path = /obj/item/lipstick/teal + cost = 1 + +/datum/gear/lipstick_fuchsia + name = "Fuchsia Lipstick" + category = SLOT_IN_BACKPACK + path = /obj/item/lipstick/fuchsia + cost = 1 + +/datum/gear/lipstick_navy + name = "Navy Blue Lipstick" + category = SLOT_IN_BACKPACK + path = /obj/item/lipstick/navy + cost = 1 + +/datum/gear/lipstick_aqua + name = "Cyan Lipstick" + category = SLOT_IN_BACKPACK + path = /obj/item/lipstick/aqua + cost = 1 + +/datum/gear/lipstick_white + name = "White Lipstick" + category = SLOT_IN_BACKPACK + path = /obj/item/lipstick/white + cost = 1 \ No newline at end of file From ac36a86763a33d31b7576c43068b015d147fd8e6 Mon Sep 17 00:00:00 2001 From: Cydia Date: Sun, 11 Oct 2020 01:10:43 -0500 Subject: [PATCH 3/3] some fixes --- .../code/modules/client/loadout/backpack.dm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/modular_citadel/code/modules/client/loadout/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm index 04c47593..c8c6d7b6 100644 --- a/modular_citadel/code/modules/client/loadout/backpack.dm +++ b/modular_citadel/code/modules/client/loadout/backpack.dm @@ -150,58 +150,48 @@ name = "Jade Lipstick" category = SLOT_IN_BACKPACK path = /obj/item/lipstick/jade - cost = 1 /datum/gear/lipstick_purple name = "Purple Lipstick" category = SLOT_IN_BACKPACK path = /obj/item/lipstick/purple - cost = 1 /datum/gear/lipstick_black name = "Black Lipstick" category = SLOT_IN_BACKPACK path = /obj/item/lipstick/black - cost = 1 /datum/gear/lipstick_yellow name = "Yellow Lipstick" category = SLOT_IN_BACKPACK path = /obj/item/lipstick/yellow - cost = 1 /datum/gear/lipstick_blue name = "Blue Lipstick" category = SLOT_IN_BACKPACK path = /obj/item/lipstick/blue - cost = 1 /datum/gear/lipstick_teal name = "Teal Lipstick" category = SLOT_IN_BACKPACK path = /obj/item/lipstick/teal - cost = 1 /datum/gear/lipstick_fuchsia name = "Fuchsia Lipstick" category = SLOT_IN_BACKPACK path = /obj/item/lipstick/fuchsia - cost = 1 /datum/gear/lipstick_navy name = "Navy Blue Lipstick" category = SLOT_IN_BACKPACK path = /obj/item/lipstick/navy - cost = 1 /datum/gear/lipstick_aqua name = "Cyan Lipstick" category = SLOT_IN_BACKPACK path = /obj/item/lipstick/aqua - cost = 1 /datum/gear/lipstick_white name = "White Lipstick" category = SLOT_IN_BACKPACK - path = /obj/item/lipstick/white - cost = 1 \ No newline at end of file + path = /obj/item/lipstick/white \ No newline at end of file