diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 420a92ff..2536c22b 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -453,6 +453,7 @@ H.update_inv_wear_mask() else H.lip_style = null + H.nail_style = null H.update_body() if(H.glasses && washglasses && wash_obj(H.glasses)) H.update_inv_glasses() diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index fd9fdcb5..021094fc 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -24,6 +24,9 @@ var/lip_style = null //no lipstick by default- arguably misleading, as it could be used for general makeup var/lip_color = "white" + var/nail_style = null + var/nail_color = "white" + var/age = 30 //Player's age var/underwear = "Nude" //Which underwear the player wants diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index e822b381..74a38d3e 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -550,6 +550,12 @@ GLOBAL_LIST_EMPTY(roundstart_races) MA.color = "#[H.socks_color]" standing += MA + // nail paint (hyper) + if(H.nail_style) + var/mutable_appearance/nail_overlay = mutable_appearance('hyperstation/icons/mobs/nails.dmi', "nails", -HANDS_PART_LAYER) + nail_overlay.color = H.nail_color + standing += nail_overlay + if(standing.len) H.overlays_standing[BODY_LAYER] = standing diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index aa87217b..83f8b666 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1242,6 +1242,7 @@ var/mob/living/carbon/human/H = M if(H.lip_style) H.lip_style = null + H.nail_style = null H.update_body() for(var/obj/item/I in C.held_items) SEND_SIGNAL(I, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK) diff --git a/hyperstation/code/game/objects/items/cosmetics.dm b/hyperstation/code/game/objects/items/cosmetics.dm new file mode 100644 index 00000000..711707f1 --- /dev/null +++ b/hyperstation/code/game/objects/items/cosmetics.dm @@ -0,0 +1,75 @@ +//hyperstation 13 nail polish + +/obj/item/nailpolish + name = "nail polish" + desc = "Paint with a fine brush to do your nails, or someone elses." + icon = 'hyperstation/icons/obj/cosmetic.dmi' + icon_state = "nailcap" + item_state = "nailpolish" + w_class = WEIGHT_CLASS_SMALL + var/paint = "black" + price = 5 + var/mutable_appearance/bottle //show the colour on the bottle. + +/obj/item/nailpolish/red + name = "red nail polish" + paint = "red" + +/obj/item/nailpolish/blue + name = "blue nail polish" + paint = "blue" + +/obj/item/nailpolish/aqua + name = "cyan nail polish" + paint = "aqua" + +/obj/item/nailpolish/black + name = "black nail polish" + paint = "black" + +/obj/item/nailpolish/white + name = "white nail polish" + paint = "white" + +/obj/item/nailpolish/navy + name = "navy nail polish" + paint = "navy" + +/obj/item/nailpolish/yellow + name = "yellow nail polish" + paint = "yellow" + +/obj/item/nailpolish/purple + name = "purple nail polish" + paint = "purple" + +/obj/item/nailpolish/Initialize() + . = ..() + bottle = mutable_appearance('hyperstation/icons/obj/cosmetic.dmi', "nailpolish") + bottle.color = paint + add_overlay(bottle) + + +/obj/item/nailpolish/attack(mob/M, mob/user) + if(!ismob(M)) + return + + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(H == user) + user.visible_message("[user] does [user.p_their()] nails with \the [src].", \ + "You take a moment to apply \the [src]. Perfect!") + H.nail_style = "nails" + H.nail_color = paint + H.update_body() + else + user.visible_message("[user] begins to do [H]'s nails with \the [src].", \ + "You begin to apply \the [src] on [H]'s nails...") + if(do_after(user, 20, target = H)) + user.visible_message("[user] does [H]'s nails with \the [src].", \ + "You apply \the [src] on [H]'s nails.") + H.nail_style = "nails" + H.nail_color = paint + H.update_body() + else + to_chat(user, "Where are the nail on that?") \ No newline at end of file diff --git a/hyperstation/icons/mobs/nails.dmi b/hyperstation/icons/mobs/nails.dmi new file mode 100644 index 00000000..575b5132 Binary files /dev/null and b/hyperstation/icons/mobs/nails.dmi differ diff --git a/hyperstation/icons/obj/cosmetic.dmi b/hyperstation/icons/obj/cosmetic.dmi new file mode 100644 index 00000000..2c329e9c Binary files /dev/null and b/hyperstation/icons/obj/cosmetic.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm index adb1d42a..7a257bdb 100644 --- a/modular_citadel/code/modules/client/loadout/backpack.dm +++ b/modular_citadel/code/modules/client/loadout/backpack.dm @@ -175,12 +175,12 @@ name = "Teal Lipstick" category = SLOT_IN_BACKPACK path = /obj/item/lipstick/teal - + /datum/gear/lipstick_fuchsia name = "Fuchsia Lipstick" category = SLOT_IN_BACKPACK path = /obj/item/lipstick/fuchsia - + /datum/gear/lipstick_navy name = "Navy Blue Lipstick" category = SLOT_IN_BACKPACK @@ -196,6 +196,46 @@ category = SLOT_IN_BACKPACK path = /obj/item/lipstick/white +/datum/gear/nailpolish_red + name = "Red Nail Polish" + category = SLOT_IN_BACKPACK + path = /obj/item/nailpolish/red + +/datum/gear/nailpolish_blue + name = "Blue Nail Polish" + category = SLOT_IN_BACKPACK + path = /obj/item/nailpolish/blue + +/datum/gear/nailpolish_aqua + name = "Cyan Nail Polish" + category = SLOT_IN_BACKPACK + path = /obj/item/nailpolish/aqua + +/datum/gear/nailpolish_black + name = "Black Nail Polish" + category = SLOT_IN_BACKPACK + path = /obj/item/nailpolish/black + +/datum/gear/nailpolish_white + name = "White Nail Polish" + category = SLOT_IN_BACKPACK + path = /obj/item/nailpolish/white + +/datum/gear/nailpolish_navy + name = "Navy Nail Polish" + category = SLOT_IN_BACKPACK + path = /obj/item/nailpolish/navy + +/datum/gear/nailpolish_yellow + name = "Yellow Nail Polish" + category = SLOT_IN_BACKPACK + path = /obj/item/nailpolish/yellow + +/datum/gear/nailpolish_purple + name = "Purple Nail Polish" + category = SLOT_IN_BACKPACK + path = /obj/item/nailpolish/purple + /datum/gear/condom name = "Condom" category = SLOT_IN_BACKPACK diff --git a/tgstation.dme b/tgstation.dme index ecd1b05a..63f3f9ed 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3036,6 +3036,7 @@ #include "hyperstation\code\datums\ruins\lavaland.dm" #include "hyperstation\code\datums\traits\good.dm" #include "hyperstation\code\datums\traits\neutral.dm" +#include "hyperstation\code\game\objects\items\cosmetics.dm" #include "hyperstation\code\game\objects\structures\ghost_role_spawners.dm" #include "hyperstation\code\gamemode\traitor_lewd.dm" #include "hyperstation\code\gamemode\traitor_thief.dm"