Merge pull request #7088 from mwerezak/skrell

Implements skrell changes for Searif

code/modules/client/preferences_gear.dm

@@ -3,6 +3,7 @@ var/global/list/gear_datums = list()
 /hook/startup/proc/populate_gear_list()
 	var/list/sort_categories = list(
 		"[slot_head]"		= list(),
+		"ears"				= list(),
 		"[slot_glasses]" 	= list(),
 		"[slot_wear_mask]"	= list(),
 		"[slot_w_uniform]"	= list(),
@@ -801,3 +802,33 @@ var/global/list/gear_datums = list()
 	path = /obj/item/weapon/haircomb
 	sort_category = "misc"
 	cost = 2
+
+// Stuff worn on the ears. Items here go in the "ears" sort_category but they must not use
+// the slot_r_ear or slot_l_ear as the slot, or else players will spawn with no headset.
+/datum/gear/skrell_chain
+	display_name = "skrell headtail-wear, female, chain"
+	path = /obj/item/clothing/ears/skrell/chain
+	cost = 2
+	sort_category = "ears"
+	whitelisted = "Skrell"
+
+/datum/gear/skrell_plate
+	display_name = "skrell headtail-wear, male, bands"
+	path = /obj/item/clothing/ears/skrell/band
+	cost = 2
+	sort_category = "ears"
+	whitelisted = "Skrell"
+
+/datum/gear/skrell_cloth_male
+	display_name = "skrell headtail-wear, male, cloth"
+	path = /obj/item/clothing/ears/skrell/cloth_male
+	cost = 2
+	sort_category = "ears"
+	whitelisted = "Skrell"
+
+/datum/gear/skrell_cloth_female
+	display_name = "skrell headtail-wear, female, cloth"
+	path = /obj/item/clothing/ears/skrell/cloth_female
+	cost = 2
+	sort_category = "ears"
+	whitelisted = "Skrell"

code/modules/clothing/ears/skrell.dm

@@ -0,0 +1,35 @@
+/*
+	Skrell tentacle wear
+*/
+
+/obj/item/clothing/ears/skrell
+	name = "skrell tentacle wear"
+	desc = "Some stuff worn by skrell to adorn their head tentacles."
+	icon = 'icons/obj/clothing/ears.dmi'
+	w_class = 1
+	slot_flags = SLOT_EARS | SLOT_TWOEARS
+	species_restricted = list("Skrell")
+
+/obj/item/clothing/ears/skrell/chain
+	name = "skrell headtail chains"
+	desc = "A delicate golden chain worn by female skrell to decorate their head tails."
+	icon_state = "skrell_chain"
+	item_state = "skrell_chain"
+
+/obj/item/clothing/ears/skrell/band
+	name = "skrell headtail bands"
+	desc = "Golden metallic bands worn by male skrell to adorn their head tails."
+	icon_state = "skrell_band"
+	item_state = "skrell_band"
+
+/obj/item/clothing/ears/skrell/cloth_female
+	name = "skrell headtail cloth"
+	desc = "A cloth shawl worn by female skrell draped around their head tails."
+	icon_state = "skrell_cloth_female"
+	item_state = "skrell_cloth_female"
+
+/obj/item/clothing/ears/skrell/cloth_male
+	name = "skrell headtail cloth"
+	desc = "A cloth band worn by male skrell around their head tails."
+	icon_state = "skrell_cloth_male"
+	item_state = "skrell_cloth_male"

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

@@ -209,7 +209,7 @@
 	primitive = /mob/living/carbon/monkey
 	unarmed_type = /datum/unarmed_attack/punch
 
-	flags = HAS_SKIN_TONE | HAS_LIPS | HAS_UNDERWEAR
+	flags = HAS_SKIN_TONE | HAS_LIPS | HAS_UNDERWEAR | HAS_EYE_COLOR
 
 	//If you wanted to add a species-level ability:
 	/*abilities = list(/client/proc/test_ability)*/
@@ -235,7 +235,7 @@
 	heat_level_2 = 480 //Default 400
 	heat_level_3 = 1100 //Default 1000
 
-	flags = IS_WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR
+	flags = IS_WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR
 
 	flesh_color = "#34AF10"
 
@@ -263,7 +263,7 @@
 
 	primitive = /mob/living/carbon/monkey/tajara
 
-	flags = IS_WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR
+	flags = IS_WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR
 
 	flesh_color = "#AFA59E"
 	base_color = "#333333"
@@ -273,6 +273,7 @@
 	name_plural = "Skrell"
 	icobase = 'icons/mob/human_races/r_skrell.dmi'
 	deform = 'icons/mob/human_races/r_def_skrell.dmi'
+	eyes = "skrell_eyes_s"
 	language = "Skrellian"
 	primitive = /mob/living/carbon/monkey/skrell
 	unarmed_type = /datum/unarmed_attack/punch
@@ -280,6 +281,7 @@
 	flags = IS_WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR
 
 	flesh_color = "#8CD7A3"
+	blood_color = "#1D2CBF"
 
 	reagent_tag = IS_SKRELL
 
@@ -310,7 +312,7 @@
 	poison_type = "oxygen"
 	insulated = 1
 
-	flags = NO_SCAN
+	flags = NO_SCAN | HAS_EYE_COLOR
 
 	blood_color = "#2299FC"
 	flesh_color = "#808D11"
@@ -356,7 +358,7 @@
 	breath_type = "nitrogen"
 	poison_type = "oxygen"
 
-	flags = NO_SCAN | NO_BLOOD | NO_PAIN
+	flags = NO_SCAN | NO_BLOOD | NO_PAIN | HAS_EYE_COLOR
 
 	blood_color = "#2299FC"
 	flesh_color = "#808D11"
@@ -406,7 +408,7 @@
 
 	body_temperature = T0C + 15		//make the plant people have a bit lower body temperature, why not
 
-	flags = IS_WHITELISTED | NO_BREATHE | NO_SCAN | IS_PLANT | NO_BLOOD | NO_PAIN | NO_SLIP
+	flags = IS_WHITELISTED | NO_BREATHE | NO_SCAN | IS_PLANT | NO_BLOOD | NO_PAIN | NO_SLIP | HAS_EYE_COLOR
 
 	blood_color = "#004400"
 	flesh_color = "#907E4A"

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

@@ -369,7 +369,8 @@ proc/get_damage_icon_part(damage_state, body_part)
 		//Eyes
 		if(!skeleton)
 			var/icon/eyes = new/icon('icons/mob/human_face.dmi', species.eyes)
-			eyes.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
+			if (species.flags & HAS_EYE_COLOR)
+				eyes.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
 			stand_icon.Blend(eyes, ICON_OVERLAY)
 
 		//Mouth	(lipstick!)

code/modules/mob/new_player/preferences_setup.dm

@@ -224,7 +224,8 @@ datum/preferences
 				preview_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)
 
 		var/icon/eyes_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = current_species ? current_species.eyes : "eyes_s")
-		eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
+		if ((current_species && (current_species.flags & HAS_EYE_COLOR)))
+			eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
 
 		var/datum/sprite_accessory/hair_style = hair_styles_list[h_style]
 		if(hair_style)

code/modules/mob/new_player/sprite_accessories.dm

@@ -609,30 +609,6 @@
 		species_allowed = list("Skrell")
 		gender = FEMALE
 
-	skr_gold_m
-		name = "Gold plated Skrell Male Tentacles"
-		icon_state = "skrell_goldhair_m"
-		species_allowed = list("Skrell")
-		gender = MALE
-
-	skr_gold_f
-		name = "Gold chained Skrell Female Tentacles"
-		icon_state = "skrell_goldhair_f"
-		species_allowed = list("Skrell")
-		gender = FEMALE
-
-	skr_clothtentacle_m
-		name = "Cloth draped Skrell Male Tentacles"
-		icon_state = "skrell_clothhair_m"
-		species_allowed = list("Skrell")
-		gender = MALE
-
-	skr_clothtentacle_f
-		name = "Cloth draped Skrell Female Tentacles"
-		icon_state = "skrell_clothhair_f"
-		species_allowed = list("Skrell")
-		gender = FEMALE
-
 	taj_ears
 		name = "Tajaran Ears"
 		icon_state = "ears_plain"