From e985f859dced9521cbd3df8e06cbbd0195fb0613 Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Wed, 18 May 2016 15:20:31 -0400 Subject: [PATCH] Allows all the races to use all the hair styles. With the exception of species specific hair styles. Also lets species be bald if they want to be. Reorganizes the ears, making colorable ones come last Also adds in both Zorren ears --- .../mob/new_player/sprite_accessories_vr.dm | 10 +- .../vore/appearance/sprite_accessories_vr.dm | 106 +++++++++++------- icons/mob/vore/ears_vr.dmi | Bin 2937 -> 3419 bytes 3 files changed, 76 insertions(+), 40 deletions(-) diff --git a/code/modules/mob/new_player/sprite_accessories_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm index a08522ffc4f..4a4d418d134 100644 --- a/code/modules/mob/new_player/sprite_accessories_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_vr.dm @@ -27,4 +27,12 @@ name = "Sergal Fairytail" icon = 'icons/mob/human_face_vr.dmi' icon_state = "serg_fairytail" - species_allowed = list("Sergal") \ No newline at end of file + species_allowed = list("Sergal") + + species_allowed = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren") //This lets all races use the default hairstyles. + + bald + name = "Bald" + icon_state = "bald" + gender = MALE + species_allowed = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren") //Lets all the races be bald if they want. \ No newline at end of file diff --git a/code/modules/vore/appearance/sprite_accessories_vr.dm b/code/modules/vore/appearance/sprite_accessories_vr.dm index e169963b2a2..26c510ff049 100644 --- a/code/modules/vore/appearance/sprite_accessories_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_vr.dm @@ -43,25 +43,6 @@ desc = "" icon_state = "squirrel-red" -/datum/sprite_accessory/ears/squirrel - name = "squirrel, colorable" - desc = "" - icon_state = "squirrel" - do_colouration = 1 - -/datum/sprite_accessory/ears/kitty - name = "kitty, colorable" - desc = "" - icon_state = "kitty" - do_colouration = 1 - extra_overlay = "kittyinner" - -/datum/sprite_accessory/ears/bunny - name = "bunny, colorable" - desc = "" - icon_state = "bunny" - do_colouration = 1 - /datum/sprite_accessory/ears/bunny_white name = "bunny, white" desc = "" @@ -72,12 +53,6 @@ desc = "" icon_state = "bear-brown" -/datum/sprite_accessory/ears/bear - name = "bear, colorable" - desc = "" - icon_state = "bear" - do_colouration = 1 - /datum/sprite_accessory/ears/wolf_grey name = "wolf, grey" desc = "" @@ -93,25 +68,11 @@ desc = "" icon_state = "wolf-wise" -/datum/sprite_accessory/ears/wolf - name = "wolf, colorable" - desc = "" - icon_state = "wolf" - do_colouration = 1 - extra_overlay = "wolfinner" - /datum/sprite_accessory/ears/mouse_grey name = "mouse, grey" desc = "" icon_state = "mouse-grey" -/datum/sprite_accessory/ears/mouse - name = "mouse, colorable" - desc = "" - icon_state = "mouse" - do_colouration = 1 - extra_overlay = "mouseinner" - /datum/sprite_accessory/ears/bee name = "bee antennae" desc = "" @@ -127,6 +88,73 @@ desc = "" icon_state = "demon-horns1" +/datum/sprite_accessory/ears/foxears + name = "highlander zorren ears" + desc = "" + icon_state = "foxears" + +/datum/sprite_accessory/ears/fenears + name = "flatland zorren ears" + desc = "" + icon_state = "fenears" + +/datum/sprite_accessory/ears/sergal + name = "Sergal ears" + icon_state = "serg_plain_s" + +/datum/sprite_accessory/ears/foxearshc + name = "highlander zorren ears, colorable" + desc = "" + icon_state = "foxearshc" + do_colouration = 1 + +/datum/sprite_accessory/ears/fenearshc + name = "flatland zorren ears, colorable" + desc = "" + icon_state = "fenearshc" + do_colouration = 1 + +/datum/sprite_accessory/ears/sergalhc + name = "Sergal ears, colorable" + icon_state = "serg_plain_s" + do_colouration = 1 + +/datum/sprite_accessory/ears/mousehc + name = "mouse, colorable" + desc = "" + icon_state = "mouse" + do_colouration = 1 + extra_overlay = "mouseinner" + +/datum/sprite_accessory/ears/wolfhc + name = "wolf, colorable" + desc = "" + icon_state = "wolf" + do_colouration = 1 + extra_overlay = "wolfinner" + +/datum/sprite_accessory/ears/bearhc + name = "bear, colorable" + desc = "" + icon_state = "bear" + do_colouration = 1 + + name = "squirrel, colorable" + desc = "" + icon_state = "squirrel" + do_colouration = 1 + + name = "kitty, colorable" + desc = "" + icon_state = "kitty" + do_colouration = 1 + extra_overlay = "kittyinner" + + name = "bunny, colorable" + desc = "" + icon_state = "bunny" + do_colouration = 1 + // Special snowflake ears go below here. /datum/sprite_accessory/ears/molenar_kitsune diff --git a/icons/mob/vore/ears_vr.dmi b/icons/mob/vore/ears_vr.dmi index 6ed1ffde648adc708f89005f9bbf7ba6da1755af..f83e3101dc624b9fb3b6eed88244eccd1707f3ae 100644 GIT binary patch literal 3419 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 Q`CpIe^;Q% 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