Darkens Unathi Horns/Spines/Frills, Adds Secondary Facial Hair Colours/Support, Further Adjustment to Tigerhead/TigerheadFace Sprites

You can now colour the webbing of webbed Unathi frills independently.
Morph and CMA support has been included.
Splits tigerhead sprites into 3 versions in order to better fit the
different ears of the three species that can use it.
This commit is contained in:
KasparoVy
2016-07-19 05:58:50 -04:00
parent b38e8ea190
commit b497aafb90
19 changed files with 228 additions and 108 deletions
@@ -338,6 +338,12 @@
facial_s.Blend(rgb(r_skin, g_skin, b_skin, 160), ICON_ADD)
else
facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD)
if(facial_hair_style.secondary_colour)
var/icon/facial_secondary_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_[facial_hair_style.secondary_colour]_s")
facial_secondary_s.Blend(rgb(r_facial_sec, g_facial_sec, b_facial_sec), ICON_ADD)
facial_s.Blend(facial_secondary_s, ICON_OVERLAY)
face_s.Blend(facial_s, ICON_OVERLAY)
var/icon/underwear_s = null
@@ -47,6 +47,7 @@
var/list/heads_allowed = null //Specifies which, if any, alt heads a head marking, hairstyle or facial hair style is compatible with.
var/list/tails_allowed = null //Specifies which, if any, tails a tail marking is compatible with.
var/marking_location //Specifies which bodypart a body marking is located on.
var/secondary_colour = null //If exists, there's a secondary colour to that hair style and the secondary colour's icon state's suffix is equal to this.
// Whether or not the accessory can be affected by colouration
var/do_colouration = 1
@@ -1107,6 +1108,12 @@
species_allowed = list("Unathi")
gender = NEUTER
una_frills_aquatic
name = "Aquatic Frills"
icon_state = "soghun_aquaticfrills"
species_allowed = list("Unathi")
gender = NEUTER
una_frills_long
name = "Long Frills"
icon_state = "soghun_longfrills"
@@ -1119,22 +1126,25 @@
species_allowed = list("Unathi")
gender = NEUTER
una_frills_webbed_aquatic
name = "Aquatic Webbed Frills"
icon_state = "soghun_aquaticfrills"
species_allowed = list("Unathi")
secondary_colour = "webbing"
gender = NEUTER
una_frills_webbed_long
name = "Long Webbed Frills"
icon_state = "soghun_longfrills_webbed"
icon_state = "soghun_longfrills"
species_allowed = list("Unathi")
secondary_colour = "webbing"
gender = NEUTER
una_frills_webbed_short
name = "Short Webbed Frills"
icon_state = "soghun_shortfrills_webbed"
species_allowed = list("Unathi")
gender = NEUTER
una_frills_webbed_aquatic
name = "Aquatic Frills"
icon_state = "soghun_aquaticfrills_webbed"
icon_state = "soghun_shortfrills"
species_allowed = list("Unathi")
secondary_colour = "webbing"
gender = NEUTER
@@ -1968,10 +1978,20 @@
species_allowed = list("Unathi", "Tajaran", "Vulpkanin")
icon_state = "markings_tiger"
/datum/sprite_accessory/body_markings/tigerhead
name = "Tiger Body and Head"
species_allowed = list("Unathi", "Tajaran", "Vulpkanin")
icon_state = "markings_tigerhead"
/datum/sprite_accessory/body_markings/tigerhead_taj
name = "Tajaran Tiger Body and Head"
species_allowed = list("Tajaran")
icon_state = "markings_tigerhead_taj"
/datum/sprite_accessory/body_markings/tigerhead_vulp
name = "Vulpkanin Tiger Body and Head"
species_allowed = list("Vulpkanin")
icon_state = "markings_tigerhead_vulp"
/datum/sprite_accessory/body_markings/tigerhead_una
name = "Unathi Tiger Body and Head"
species_allowed = list("Unathi")
icon_state = "markings_tigerhead_una"
/datum/sprite_accessory/body_markings/tigerheadface_taj
name = "Tajaran Tiger Body, Head and Face"