Merge branch 'master' into hooks-part4

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

@@ -30,6 +30,7 @@
 	msg += "<EM>[name]</EM>"
 
 	var/displayed_species = dna.species.name
+	var/examine_color = dna.species.flesh_color
 	for(var/obj/item/clothing/C in src)			//Disguise checks
 		if(C == src.head || C == src.wear_suit || C == src.wear_mask || C == src.w_uniform || C == src.belt || C == src.back)
 			if(C.species_disguise)
@@ -37,11 +38,11 @@
 	if(skipjumpsuit && skipface || (NO_EXAMINE in dna.species.species_traits)) //either obscured or on the nospecies list
 		msg += "!\n"    //omit the species when examining
 	else if(displayed_species == "Slime People") //snowflakey because Slime People are defined as a plural
-		msg += ", a slime person!\n"
+		msg += ", a<b><font color='[examine_color]'> slime person</font></b>!\n"
 	else if(displayed_species == "Unathi") //DAMN YOU, VOWELS
-		msg += ", a unathi!\n"
+		msg += ", a<b><font color='[examine_color]'> unathi</font></b>!\n"
 	else
-		msg += ", \a [lowertext(displayed_species)]!\n"
+		msg += ", a<b><font color='[examine_color]'> [lowertext(displayed_species)]</font></b>!\n"
 
 	//uniform
 	if(w_uniform && !skipjumpsuit && !(w_uniform.flags & ABSTRACT))

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

@@ -1331,11 +1331,13 @@
 
 	var/list/thing_to_check = list(slot_wear_mask, slot_head, slot_shoes, slot_gloves, slot_l_ear, slot_r_ear, slot_glasses, slot_l_hand, slot_r_hand)
 	var/list/kept_items[0]
-
+	var/list/item_flags[0]
 	for(var/thing in thing_to_check)
 		var/obj/item/I = get_item_by_slot(thing)
 		if(I)
 			kept_items[I] = thing
+			item_flags[I] = I.flags
+			I.flags = 0 // Temporary set the flags to 0
 
 	if(retain_damage)
 		//Create a list of body parts which are damaged by burn or brute and save them to apply after new organs are generated. First we just handle external organs.
@@ -1401,8 +1403,9 @@
 	else
 		dna.species.create_organs(src)
 
-	for(var/thing in kept_items)
+	for(var/obj/item/thing in kept_items)
 		equip_to_slot_if_possible(thing, kept_items[thing], redraw_mob = 0)
+		thing.flags = item_flags[thing] // Reset the flags to the origional ones
 
 	//Handle default hair/head accessories for created mobs.
 	var/obj/item/organ/external/head/H = get_organ("head")

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

@@ -80,7 +80,7 @@
 	var/dietflags  = 0	// Make sure you set this, otherwise it won't be able to digest a lot of foods
 
 	var/blood_color = "#A10808" //Red.
-	var/flesh_color = "#FFC896" //Pink.
+	var/flesh_color = "#d1aa2e" //Gold.
 	var/single_gib_type = /obj/effect/decal/cleanable/blood/gibs
 	var/remains_type = /obj/effect/decal/remains/human //What sort of remains is left behind when the species dusts
 	var/base_color      //Used when setting species.

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

@@ -27,6 +27,7 @@
 	dietflags = DIET_HERB
 	has_gender = FALSE
 	reagent_tag = PROCESS_ORG
+	flesh_color = "#a598ad"
 	blood_color = "#A200FF"
 
 /datum/species/grey/handle_dna(mob/living/carbon/human/H, remove)

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

@@ -13,6 +13,7 @@
 	bodyflags = HAS_HEAD_ACCESSORY | HAS_HEAD_MARKINGS | HAS_BODY_MARKINGS
 	eyes = "kidan_eyes_s"
 	dietflags = DIET_HERB
+	flesh_color = "#ba7814"
 	blood_color = "#FB9800"
 	reagent_tag = PROCESS_ORG
 	//Default styles for created mobs.

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

@@ -41,6 +41,7 @@
 		)
 
 	speciesbox = /obj/item/storage/box/survival_plasmaman
+	flesh_color = "#8b3fba"
 
 /datum/species/plasmaman/say_filter(mob/M, message, datum/language/speaking)
 	if(copytext(message, 1, 2) != "*")

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

@@ -32,6 +32,7 @@
 	dietflags = DIET_CARN
 	reagent_tag = PROCESS_ORG
 
+	flesh_color = "#5fe8b1"
 	blood_color = "#0064C8"
 	exotic_blood = "water"
 	blood_damage_type = TOX

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

@@ -31,7 +31,7 @@
 	taste_sensitivity = TASTE_SENSITIVITY_SHARP
 	reagent_tag = PROCESS_ORG
 
-	flesh_color = "#AFA59E"
+	flesh_color = "#b5a69b"
 	base_color = "#424242"
 	butt_sprite = "tajaran"