Adds earrings, purses, lip and polish, and probably some other things

code/_globalvars/lists/flavor_misc.dm

@@ -238,7 +238,15 @@ GLOBAL_LIST_INIT(backbaglist, list(DBACKPACK, DSATCHEL, DDUFFELBAG, //everything
 	"Mecha Shell Bag" = /obj/item/storage/backpack/skyrat/mechashell,
 	"Pyramid Shell Bag" = /obj/item/storage/backpack/skyrat/pyramidshell,
 	"Spiral Shell Bag" = /obj/item/storage/backpack/skyrat/spiralshell,
-	"Rock Shell Bag" = /obj/item/storage/backpack/skyrat/rockshell
+	"Rock Shell Bag" = /obj/item/storage/backpack/skyrat/rockshell,
+	"Purse" = /obj/item/storage/backpack/purse,
+	"Purse, black" = /obj/item/storage/backpack/purse/black,
+	"Purse, red" = /obj/item/storage/backpack/purse/red,
+	"Purse, green" = /obj/item/storage/backpack/purse/green,
+	"Purse, blue" = /obj/item/storage/backpack/purse/blue,
+	"Purse, yellow" = /obj/item/storage/backpack/purse/yellow, 
+	"Purse, cyan" = /obj/item/storage/backpack/purse/cyan,
+	"Purse, purple" = /obj/item/storage/backpack/purse/purple,
 	))
 
 //Suit/Skirt

code/datums/elements/flavor_text.dm

@@ -80,10 +80,10 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code
 		examine_list += span_notice("<a href='?src=[REF(src)];show_flavor=[REF(target)]'>\[[flavor_name]\]</a>")
 		return
 	var/msg = replacetext(text, "\n", " ")
-	if(length_char(msg) <= 40)
+	if(length_char(msg) <= 200)
 		examine_list += span_notice("[msg]")
 	else
-		examine_list += "<span class='notice'>[copytext_char(msg, 1, 37)]... <a href='?src=[REF(src)];show_flavor=[REF(target)]'>More...</span></a>"
+		examine_list += "<span class='notice'>[copytext_char(msg, 1, 197)]... <a href='?src=[REF(src)];show_flavor=[REF(target)]'>More...</span></a>"
 
 /datum/element/flavor_text/Topic(href, href_list)
 	. = ..()

code/game/objects/items/cosmetics.dm

@@ -183,3 +183,82 @@
 			..()
 	else
 		..()
+
+
+//port splurt nailpolish
+
+//Nail polish
+/obj/item/nailpolish
+	name = "nail polish"
+	desc = "Paint with a fine brush to do your nails, or someone elses."
+	icon = 'modular_splurt/icons/obj/cosmetic.dmi'
+	icon_state = "nailcap"
+	item_state = "nailpolish"
+	w_class = WEIGHT_CLASS_SMALL
+	var/paint = "black"
+	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('modular_splurt/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.nail_style) //to stop stacking bugs
+			to_chat(user, span_warning("Remove the old nail polish first!"))
+
+		if(H == user)
+			user.visible_message(span_notice("[user] does [user.p_their()] nails with \the [src]."), \
+								span_notice("You take a moment to apply \the [src]. Perfect!"))
+			H.nail_style = "nails"
+			H.nail_color = paint
+			H.update_body()
+		else
+			user.visible_message(span_warning("[user] begins to do [H]'s nails with \the [src]."), \
+								span_notice("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].", \
+									span_notice("You apply \the [src] on [H]'s nails."))
+				H.nail_style = "nails"
+				H.nail_color = paint
+				H.update_body()
+	else
+		to_chat(user, span_warning("Where are the nail on that?"))

code/game/objects/items/storage/backpack.dm

@@ -1005,3 +1005,33 @@
 	icon = 'icons/fallout/objects/storage.dmi'
 	icon_state = "invisipack"
 	item_state = "invisipack"
+
+/obj/item/storage/backpack/purse 
+	icon = 'icons/fallout/objects/storage.dmi'
+	desc = "A stylish handbag, not really recolorable!"
+	lefthand_file = 'icons/fallout/onmob/items/bags_lefthand.dmi'
+	righthand_file = 'icons/fallout/onmob/items/bags_righthand.dmi'
+	mob_overlay_icon = 'icons/fallout/onmob/backslot_bags.dmi'
+	icon_state = "purse"
+	item_state = "purse"
+
+/obj/item/storage/backpack/purse/black
+	color = "#333333"
+
+/obj/item/storage/backpack/purse/red
+	color = "#bb3333"
+
+/obj/item/storage/backpack/purse/green
+	color = "#33bb33"
+
+/obj/item/storage/backpack/purse/blue
+	color = "#3333bb"
+
+/obj/item/storage/backpack/purse/yellow
+	color = "#bbbb33"
+
+/obj/item/storage/backpack/purse/cyan
+	color = "#33bbbb"
+
+/obj/item/storage/backpack/purse/purple
+	color = "#bb33bb"

code/modules/mob/living/carbon/human/examine.dm

@@ -94,7 +94,7 @@ GLOBAL_LIST_INIT(personalitytrait2description, list(
 		if(HAS_TRAIT(L, TRAIT_PROSOPAGNOSIA))
 			obscure_name = TRUE
 
-	. = list("<span class='info'>*---------*\nThis is <EM>[!obscure_name ? name : "Unknown"]</EM>!")
+	. = list("<span class='info'>*---------*\nThis is <EM>[!obscure_name ? name : "Unknown"]</EM>! [t_He] [t_is] a [dna.custom_species ? dna.custom_species : dna.species.name]!")
 
 	if (profilePicture)
 		. += "<a href='?src=[REF(src)];enlargeImage=1'><img src='[PfpHostLink(profilePicture, pfphost)]' width='125' height='auto' max-height='300'></a>"
@@ -110,10 +110,7 @@ GLOBAL_LIST_INIT(personalitytrait2description, list(
 	var/list/obscured = check_obscured_slots()
 	var/skipface = !HAS_TRAIT(src, TRAIT_NOHIDEFACE) && ((wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)))
 
-	if(skipface || get_visible_name() == "Unknown")
-		. += "You can't make out what species they are."
-	else
-		. += "[t_He] [t_is] a [dna.custom_species ? dna.custom_species : dna.species.name]!"
+	. += "[t_He] [t_is] a [dna.custom_species ? dna.custom_species : dna.species.name]!"
 
 	//uniform
 	if(w_uniform && !(SLOT_W_UNIFORM in obscured))
@@ -210,6 +207,14 @@ GLOBAL_LIST_INIT(personalitytrait2description, list(
 				. += "[dicc.desc]"
 	//END OF CIT CHANGES
 
+	var/list/m8cup = list()
+	if(lip_style && lip_color)
+		m8cup += span_notice("[lip_color] lipstick")
+	if(nail_style && nail_color)
+		m8cup += span_notice("[nail_color] nail polish")
+	if(LAZYLEN(m8cup))
+		. += span_notice("[t_He] has [m8cup.Join(" and ")] applied.")
+
 	//Jitters
 	switch(jitteriness)
 		if(300 to INFINITY)
@@ -531,21 +536,21 @@ GLOBAL_LIST_INIT(personalitytrait2description, list(
 		if(digitalcamo)
 			msg += "[t_He] [t_is] moving [t_his] body in an unnatural and blatantly inhuman manner.\n"
 
-	var/scar_severity = 0
-	for(var/i in all_scars)
-		var/datum/scar/S = i
-		if(S.is_visible(user))
-			scar_severity += S.severity
-
-	switch(scar_severity)
-		if(1 to 2)
-			msg += span_smallnoticeital("[t_He] [t_has] visible scarring, you can look again to take a closer look...")
-		if(3 to 4)
-			msg += "<span class='notice'><i>[t_He] [t_has] several bad scars, you can look again to take a closer look...</i></span>\n"
-		if(5 to 6)
-			msg += "<span class='notice'><b><i>[t_He] [t_has] significantly disfiguring scarring, you can look again to take a closer look...</i></b></span>\n"
-		if(7 to INFINITY)
-			msg += "<span class='notice'><b><i>[t_He] [t_is] just absolutely fucked up, you can look again to take a closer look...</i></b></span>\n"
+	// var/scar_severity = 0
+	// for(var/i in all_scars)
+	// 	var/datum/scar/S = i
+	// 	if(S.is_visible(user))
+	// 		scar_severity += S.severity
+
+	// switch(scar_severity)
+	// 	if(1 to 2)
+	// 		msg += span_smallnoticeital("[t_He] [t_has] visible scarring, you can look again to take a closer look...")
+	// 	if(3 to 4)
+	// 		msg += "<span class='notice'><i>[t_He] [t_has] several bad scars, you can look again to take a closer look...</i></span>\n"
+	// 	if(5 to 6)
+	// 		msg += "<span class='notice'><b><i>[t_He] [t_has] significantly disfiguring scarring, you can look again to take a closer look...</i></b></span>\n"
+	// 	if(7 to INFINITY)
+	// 		msg += "<span class='notice'><b><i>[t_He] [t_is] just absolutely fucked up, you can look again to take a closer look...</i></b></span>\n"
 
 	/// my first labeled loop thingy~
 	//tat_check: // cut down before its time.
@@ -559,7 +564,6 @@ GLOBAL_LIST_INIT(personalitytrait2description, list(
 		. += span_warning("[msg.Join("")]")
 
 	if(HAS_TRAIT(src, TRAIT_JIGGLY_ASS))
-		. += ""
 		. += span_notice("[t_His] butt could use a firm smack.</span>")
 
 	var/trait_exam = common_trait_examine()
@@ -618,7 +622,7 @@ GLOBAL_LIST_INIT(personalitytrait2description, list(
 	else if(isobserver(user) && traitstring)
 		. += "<span class='info'><b>Traits:</b> [traitstring]</span>"
 
-	. += "[print_special()]"//This already includes breaks and newlines, don't add any more
+	// . += "[print_special()]"//This already includes breaks and newlines, don't add any more
 
 
 	SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .) //This also handles flavor texts now

code/modules/mob/living/carbon/human/human_defines.dm

@@ -59,6 +59,10 @@
 	var/socks = "Nude" //Which socks the player wants
 	var/socks_color = "FFFFFF"
 
+	var/nail_style = null
+	var/nail_color = "white"
+	var/cheesed //Handle cheesing lol
+
 	var/warpaint = null
 	var/warpaint_color = null
 
@@ -146,3 +150,5 @@
 	var/mob/living/L = attacker
 	if(istype(L))
 		L.Stagger(D.parry_data["HUMAN_PARRY_STAGGER"])
+
+

code/modules/mob/living/carbon/human/species.dm

@@ -851,6 +851,10 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	if(H.warpaint && !H.IsFeral())
 		standing += mutable_appearance('icons/mob/tribe_warpaint.dmi', H.warpaint, -MARKING_LAYER, color = H.warpaint_color)
 
+	if(H.nail_style)
+		var/mutable_appearance/nail_overlay = mutable_appearance('modular_splurt/icons/mobs/nails.dmi', "nails", -HANDS_PART_LAYER)
+		nail_overlay.color = H.nail_color
+		standing += nail_overlay
 
 	// if(standing.len) // MAYBE - WIZARD
 	H.overlays_standing[BODY_LAYER] = standing_undereyes | standing
@@ -1183,9 +1187,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 							winghacked += extra2_accessory_overlay
 				else
 					standing += extra2_accessory_overlay
-
 		H.overlays_standing[layernum] = standing
-
 	H.apply_overlay(BODY_BEHIND_LAYER)
 	H.apply_overlay(BODY_ADJ_LAYER)
 	H.apply_overlay(BODY_ADJ_UPPER_LAYER)

code/modules/paperwork/carbonpaper.dm

@@ -2,7 +2,7 @@
 	name = "sheet of carbon"
 	icon_state = "paper_stack"
 	item_state = "paper"
-	// inhand_icon_state = "paper"
+	// item_state = "paper"
 	show_written_words = FALSE
 	var/copied = FALSE
 	var/iscopy = FALSE

code/modules/paperwork/clipboard.dm

@@ -3,7 +3,7 @@
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "clipboard"
 	item_state = "clipboard"
-	// inhand_icon_state = "clipboard"
+	// item_state = "clipboard"
 	// worn_icon_state = "clipboard"
 	throwforce = 0
 	w_class = WEIGHT_CLASS_SMALL

code/modules/paperwork/handlabeler.dm

@@ -4,7 +4,7 @@
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "labeler0"
 	item_state = "flight"
-	// inhand_icon_state = "flight"
+	// item_state = "flight"
 	var/label = null
 	var/labels_left = 30
 	var/mode = 0
@@ -91,7 +91,7 @@
 	desc = "A roll of paper. Use it on a hand labeler to refill it."
 	icon_state = "labeler_refill"
 	item_state = "electropack"
-	// inhand_icon_state = "electropack"
+	// item_state = "electropack"
 	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
 	w_class = WEIGHT_CLASS_TINY

code/modules/paperwork/paper.dm

@@ -23,7 +23,7 @@
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "paper"
 	item_state = "paper"
-	// inhand_icon_state = "paper"
+	// item_state = "paper"
 	// worn_icon_state = "paper"
 	// custom_fire_overlay = "paper_onfire_overlay"
 	throwforce = 0

code/modules/paperwork/paper_cutter.dm

@@ -111,6 +111,6 @@
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "cutterblade"
 	item_state = "knife"
-	// inhand_icon_state = "knife"
+	// item_state = "knife"
 	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'

code/modules/paperwork/pen.dm

@@ -16,7 +16,7 @@
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "pen"
 	item_state = "pen"
-	// inhand_icon_state = "pen"
+	// item_state = "pen"
 	// worn_icon_state = "pen"
 	slot_flags = INV_SLOTBIT_BELT | INV_SLOTBIT_EARS
 	throwforce = 0
@@ -260,7 +260,7 @@
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "digging_pen"
 	item_state = "pen"
-	// inhand_icon_state = "pen"
+	// item_state = "pen"
 	// worn_icon_state = "pen"
 	force = 3
 	w_class = WEIGHT_CLASS_TINY

code/modules/paperwork/stamps.dm

@@ -4,7 +4,7 @@
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "stamp-ok"
 	item_state = "stamp"
-	// inhand_icon_state = "stamp"
+	// item_state = "stamp"
 	throwforce = 0
 	w_class = WEIGHT_CLASS_TINY
 	throw_speed = 3

code/modules/research/anomaly/anomaly_core.dm

@@ -3,7 +3,7 @@
 	name = "anomaly core"
 	desc = "The neutralized core of an anomaly. It'd probably be valuable for research."
 	icon_state = "anomaly_core"
-	//inhand_icon_state = "electronic"
+	//item_state = "electronic"
 	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
 	resistance_flags = FIRE_PROOF