Merge pull request #2374 from sirelgate/master

xenomorph round start update

code/modules/mob/dead/new_player/sprite_accessories_Citadel.dm

@@ -464,7 +464,6 @@
 /datum/sprite_accessory/mam_tails/rabbit
 	name = "Rabbit"
 	icon_state = "rabbit"
-	color_src = 0
 	icon = 'icons/mob/mam_bodyparts.dmi'
 
 /datum/sprite_accessory/mam_ears/rabbit
@@ -595,6 +594,13 @@
 	extra2 = 1
 	icon = 'icons/mob/mam_body_markings.dmi'
 
+	/datum/sprite_accessory/mam_body_markings/xeno
+	name = "Xeno"
+	icon_state = "xeno"
+	color_src = MUTCOLORS2
+	extra_color_src = MUTCOLORS3
+	gender_specific = 1
+
 /******************************************
 ************ Taur Bodies ******************
 *******************************************/
@@ -673,49 +679,67 @@
 
 //Xeno Dorsal Tubes
 /datum/sprite_accessory/xeno_dorsal
-	icon = 'icons/mob/exotic_bodyparts.dmi'
-	color_src = 0
+	icon = 'icons/mob/xeno_parts_greyscale.dmi'
 
 /datum/sprite_accessory/xeno_dorsal/none
 	name = "None"
 
-/datum/sprite_accessory/xeno_dorsal/normal
-	name = "Dorsal Tubes"
-	icon_state = "dortubes"
+/datum/sprite_accessory/xeno_dorsal/standard
+	name = "Standard"
+	icon_state = "standard"
+	icon = 'icons/mob/xeno_parts_greyscale.dmi'
+
+/datum/sprite_accessory/xeno_dorsal/royal
+	name = "Royal"
+	icon_state = "royal"
+	icon = 'icons/mob/xeno_parts_greyscale.dmi'
+
+/datum/sprite_accessory/xeno_dorsal/down
+	name = "Dorsal Down"
+	icon_state = "down"
+	icon = 'icons/mob/xeno_parts_greyscale.dmi'
 
 //Xeno Tail
 /datum/sprite_accessory/xeno_tail
-	icon = 'icons/mob/exotic_bodyparts.dmi'
-	color_src = 0
+	icon = 'icons/mob/xeno_parts_greyscale.dmi'
 
 /datum/sprite_accessory/xeno_tail/none
 	name = "None"
 
-/datum/sprite_accessory/xeno_tail/normal
+/datum/sprite_accessory/xeno_tail/standard
 	name = "Xenomorph Tail"
 	icon_state = "xeno"
+	icon = 'icons/mob/xeno_parts_greyscale.dmi'
 
 //Xeno Caste Heads
 //unused as of October 3, 2016
 /datum/sprite_accessory/xeno_head
-	icon = 'icons/mob/exotic_bodyparts.dmi'
-	color_src = 0
+	icon = 'icons/mob/xeno_parts_greyscale.dmi'
 
 /datum/sprite_accessory/xeno_head/none
 	name = "None"
 
+/datum/sprite_accessory/xeno_head/standard
+	name = "Standard"
+	icon_state = "standard"
+	icon = 'icons/mob/xeno_parts_greyscale.dmi'
 
-/datum/sprite_accessory/xeno_head/hunter
-	name = "Hunter"
-	icon_state = "hunter"
 
-/datum/sprite_accessory/xeno_head/drone
-	name = "Drone"
-	icon_state = "drone"
+/datum/sprite_accessory/xeno_head/royal
+	name = "royal"
+	icon_state = "royal"
+	icon = 'icons/mob/xeno_parts_greyscale.dmi'
+
+/datum/sprite_accessory/xeno_head/hollywood
+	name = "hollywood"
+	icon_state = "hollywood"
+	icon = 'icons/mob/xeno_parts_greyscale.dmi'
+
+/datum/sprite_accessory/xeno_head/warrior
+	name = "warrior"
+	icon_state = "warrior"
+	icon = 'icons/mob/xeno_parts_greyscale.dmi'
 
-/datum/sprite_accessory/xeno_head/sentinel
-	name = "Sentinel"
-	icon_state = "sentinel"
 /*
 //Slimecoon Parts
 /datum/sprite_accessory/slimecoon_ears

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

@@ -79,6 +79,30 @@ datum/species/mammal
 	return TRUE
 //HERBIVOROUS//
 
+//Alien//
+/datum/species/xeno
+	// A cloning mistake, crossing human and xenomorph DNA
+	name = "xeno"
+	id = "xeno"
+	say_mod = "hisses"
+	default_color = "00FF00"
+	species_traits = list(MUTCOLORS,LIPS,DIGITIGRADE,PIERCEIMMUNE)
+	mutant_bodyparts = list("xenotail", "xenohead", "xenodorsal", "taur","mam_body_markings")
+	default_features = list("xenotail"="xeno","xenohead"="standard","xenodorsal"="standard","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None","mam_body_markings" = "xeno")
+	armor = 15
+	heatmod = 1.7
+	no_equip = list(slot_head)
+	attack_verb = "slash"
+	attack_sound = 'sound/weapons/slash.ogg'
+	miss_sound = 'sound/weapons/slashmiss.ogg'
+	meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno
+	skinned_type = /obj/item/stack/sheet/animalhide/xeno
+	exotic_bloodtype = "L"
+	damage_overlay_type = "xeno"
+	roundstart = 1
+
+//Praise the Omnissiah, A challange worthy of my skills - HS
+
 //EXOTIC//
 //These races will likely include lots of downsides and upsides. Keep them relatively balanced.//
 /*