Fix grey eyes, add bitching when hairstyles are invalid.

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/new_player/sprite_accessories.dm
This commit is contained in:
Rob Nelson
2014-08-04 18:14:04 -07:00
committed by ZomgPonies
parent a78316732f
commit 3a3e8ac7be
3 changed files with 8 additions and 3 deletions
@@ -56,6 +56,7 @@
..(new_loc, "Human")
/mob/living/carbon/human/diona/New(var/new_loc)
h_style = "Bald"
..(new_loc, "Diona")
/mob/living/carbon/human/machine/New(var/new_loc)
@@ -433,6 +433,8 @@ proc/get_damage_icon_part(damage_state, body_part)
if(facial_hair_style.do_colouration)
facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD)
face_standing.Blend(facial_s, ICON_OVERLAY)
else
warning("Invalid f_style for [species.name]: [f_style]")
if(h_style && !(head && (head.flags & BLOCKHEADHAIR)))
var/datum/sprite_accessory/hair_style = hair_styles_list[h_style]
@@ -442,6 +444,8 @@ proc/get_damage_icon_part(damage_state, body_part)
hair_s.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD)
face_standing.Blend(hair_s, ICON_OVERLAY)
else
warning("Invalid h_style for [species.name]: [h_style]")
overlays_standing[HAIR_LAYER] = image(face_standing)
@@ -45,13 +45,13 @@
/datum/sprite_accessory/hair
icon = 'icons/mob/Human_face.dmi' // default icon for all hairs
icon = 'icons/mob/human_face.dmi' // default icon for all hairs
bald
name = "Bald"
icon_state = "bald"
gender = MALE
species_allowed = list("Human","Unathi","Vox","Diona","Kidan","Greys")
species_allowed = list("Human","Unathi","Vox","Diona","Kidan","Grey","Plasmaman","Skellington")
short
name = "Short Hair" // try to capatilize the names please~
@@ -388,7 +388,7 @@
/datum/sprite_accessory/facial_hair
icon = 'icons/mob/Human_face.dmi'
icon = 'icons/mob/human_face.dmi'
gender = MALE // barf (unless you're a dorf, dorfs dig chix /w beards :P)
shaved