Few bugfixes - namely species hair still having do coloration = 0 and the tail rendering over equipment. Tajaran and Unathi sprites are also now black to facilitate more vibrant colors.
Trying to color them while dark green and brown-grey ended up in odd colorations. Quality of life change.
@@ -97,26 +97,26 @@ Please contact me on #coderbus IRC. ~Carn x
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
//Human Overlays Indexes/////////
|
//Human Overlays Indexes/////////
|
||||||
#define MUTANTRACE_LAYER 1 //TODO: make part of body?
|
#define MUTANTRACE_LAYER 1
|
||||||
#define MUTATIONS_LAYER 2
|
#define MUTATIONS_LAYER 2
|
||||||
#define DAMAGE_LAYER 3
|
#define DAMAGE_LAYER 3
|
||||||
#define UNIFORM_LAYER 4
|
#define UNIFORM_LAYER 4
|
||||||
#define ID_LAYER 5
|
#define TAIL_LAYER 5 //bs12 specific. this hack is probably gonna come back to haunt me
|
||||||
#define SHOES_LAYER 6
|
#define ID_LAYER 6
|
||||||
#define GLOVES_LAYER 7
|
#define SHOES_LAYER 7
|
||||||
#define EARS_LAYER 8
|
#define GLOVES_LAYER 8
|
||||||
#define SUIT_LAYER 9
|
#define EARS_LAYER 9
|
||||||
#define GLASSES_LAYER 10
|
#define SUIT_LAYER 10
|
||||||
#define BELT_LAYER 11 //Possible make this an overlay of somethign required to wear a belt?
|
#define GLASSES_LAYER 11
|
||||||
#define SUIT_STORE_LAYER 12
|
#define BELT_LAYER 12 //Possible make this an overlay of somethign required to wear a belt?
|
||||||
#define BACK_LAYER 13
|
#define SUIT_STORE_LAYER 13
|
||||||
#define HAIR_LAYER 14 //TODO: make part of head layer?
|
#define BACK_LAYER 14
|
||||||
#define FACEMASK_LAYER 15
|
#define HAIR_LAYER 15 //TODO: make part of head layer?
|
||||||
#define HEAD_LAYER 16
|
#define FACEMASK_LAYER 16
|
||||||
#define COLLAR_LAYER 17
|
#define HEAD_LAYER 17
|
||||||
#define HANDCUFF_LAYER 18
|
#define COLLAR_LAYER 18
|
||||||
#define LEGCUFF_LAYER 19
|
#define HANDCUFF_LAYER 19
|
||||||
#define TAIL_LAYER 20 //bs12 specific. this hack is probably gonna come back to haunt me
|
#define LEGCUFF_LAYER 20
|
||||||
#define L_HAND_LAYER 21
|
#define L_HAND_LAYER 21
|
||||||
#define R_HAND_LAYER 22
|
#define R_HAND_LAYER 22
|
||||||
#define TARGETED_LAYER 23 //BS12: Layer for the target overlay from weapon targeting system
|
#define TARGETED_LAYER 23 //BS12: Layer for the target overlay from weapon targeting system
|
||||||
@@ -742,8 +742,7 @@ proc/get_damage_icon_part(damage_state, body_part)
|
|||||||
var/icon/tail_s = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[species.tail]_s")
|
var/icon/tail_s = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[species.tail]_s")
|
||||||
tail_s.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)
|
tail_s.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)
|
||||||
|
|
||||||
stand_icon.Blend(tail_s, ICON_OVERLAY)
|
overlays_standing[TAIL_LAYER] = image(tail_s)
|
||||||
overlays_standing[TAIL_LAYER] = image(stand_icon)
|
|
||||||
|
|
||||||
if(update_icons)
|
if(update_icons)
|
||||||
update_icons()
|
update_icons()
|
||||||
@@ -804,6 +803,7 @@ proc/get_damage_icon_part(damage_state, body_part)
|
|||||||
#undef MUTATIONS_LAYER
|
#undef MUTATIONS_LAYER
|
||||||
#undef DAMAGE_LAYER
|
#undef DAMAGE_LAYER
|
||||||
#undef UNIFORM_LAYER
|
#undef UNIFORM_LAYER
|
||||||
|
#undef TAIL_LAYER
|
||||||
#undef ID_LAYER
|
#undef ID_LAYER
|
||||||
#undef SHOES_LAYER
|
#undef SHOES_LAYER
|
||||||
#undef GLOVES_LAYER
|
#undef GLOVES_LAYER
|
||||||
@@ -821,6 +821,5 @@ proc/get_damage_icon_part(damage_state, body_part)
|
|||||||
#undef LEGCUFF_LAYER
|
#undef LEGCUFF_LAYER
|
||||||
#undef L_HAND_LAYER
|
#undef L_HAND_LAYER
|
||||||
#undef R_HAND_LAYER
|
#undef R_HAND_LAYER
|
||||||
#undef TAIL_LAYER
|
|
||||||
#undef TARGETED_LAYER
|
#undef TARGETED_LAYER
|
||||||
#undef TOTAL_LAYERS
|
#undef TOTAL_LAYERS
|
||||||
|
|||||||
@@ -483,145 +483,122 @@
|
|||||||
name = "Long Unathi Spines"
|
name = "Long Unathi Spines"
|
||||||
icon_state = "soghun_longspines"
|
icon_state = "soghun_longspines"
|
||||||
species_allowed = list("Unathi")
|
species_allowed = list("Unathi")
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
una_spines_short
|
una_spines_short
|
||||||
name = "Short Unathi Spines"
|
name = "Short Unathi Spines"
|
||||||
icon_state = "soghun_shortspines"
|
icon_state = "soghun_shortspines"
|
||||||
species_allowed = list("Unathi")
|
species_allowed = list("Unathi")
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
una_frills_long
|
una_frills_long
|
||||||
name = "Long Unathi Frills"
|
name = "Long Unathi Frills"
|
||||||
icon_state = "soghun_longfrills"
|
icon_state = "soghun_longfrills"
|
||||||
species_allowed = list("Unathi")
|
species_allowed = list("Unathi")
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
una_frills_short
|
una_frills_short
|
||||||
name = "Short Unathi Frills"
|
name = "Short Unathi Frills"
|
||||||
icon_state = "soghun_shortfrills"
|
icon_state = "soghun_shortfrills"
|
||||||
species_allowed = list("Unathi")
|
species_allowed = list("Unathi")
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
una_horns
|
una_horns
|
||||||
name = "Unathi Horns"
|
name = "Unathi Horns"
|
||||||
icon_state = "soghun_horns"
|
icon_state = "soghun_horns"
|
||||||
species_allowed = list("Unathi")
|
species_allowed = list("Unathi")
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
skr_tentacle_m
|
skr_tentacle_m
|
||||||
name = "Skrell Male Tentacles"
|
name = "Skrell Male Tentacles"
|
||||||
icon_state = "skrell_hair_m"
|
icon_state = "skrell_hair_m"
|
||||||
species_allowed = list("Skrell")
|
species_allowed = list("Skrell")
|
||||||
gender = MALE
|
gender = MALE
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
skr_tentacle_f
|
skr_tentacle_f
|
||||||
name = "Skrell Female Tentacles"
|
name = "Skrell Female Tentacles"
|
||||||
icon_state = "skrell_hair_f"
|
icon_state = "skrell_hair_f"
|
||||||
species_allowed = list("Skrell")
|
species_allowed = list("Skrell")
|
||||||
gender = FEMALE
|
gender = FEMALE
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
skr_gold_m
|
skr_gold_m
|
||||||
name = "Gold plated Skrell Male Tentacles"
|
name = "Gold plated Skrell Male Tentacles"
|
||||||
icon_state = "skrell_goldhair_m"
|
icon_state = "skrell_goldhair_m"
|
||||||
species_allowed = list("Skrell")
|
species_allowed = list("Skrell")
|
||||||
gender = MALE
|
gender = MALE
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
skr_gold_f
|
skr_gold_f
|
||||||
name = "Gold chained Skrell Female Tentacles"
|
name = "Gold chained Skrell Female Tentacles"
|
||||||
icon_state = "skrell_goldhair_f"
|
icon_state = "skrell_goldhair_f"
|
||||||
species_allowed = list("Skrell")
|
species_allowed = list("Skrell")
|
||||||
gender = FEMALE
|
gender = FEMALE
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
skr_clothtentacle_m
|
skr_clothtentacle_m
|
||||||
name = "Cloth draped Skrell Male Tentacles"
|
name = "Cloth draped Skrell Male Tentacles"
|
||||||
icon_state = "skrell_clothhair_m"
|
icon_state = "skrell_clothhair_m"
|
||||||
species_allowed = list("Skrell")
|
species_allowed = list("Skrell")
|
||||||
gender = MALE
|
gender = MALE
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
skr_clothtentacle_f
|
skr_clothtentacle_f
|
||||||
name = "Cloth draped Skrell Female Tentacles"
|
name = "Cloth draped Skrell Female Tentacles"
|
||||||
icon_state = "skrell_clothhair_f"
|
icon_state = "skrell_clothhair_f"
|
||||||
species_allowed = list("Skrell")
|
species_allowed = list("Skrell")
|
||||||
gender = FEMALE
|
gender = FEMALE
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
taj_ears
|
taj_ears
|
||||||
name = "Tajaran Ears"
|
name = "Tajaran Ears"
|
||||||
icon_state = "ears_plain"
|
icon_state = "ears_plain"
|
||||||
species_allowed = list("Tajaran")
|
species_allowed = list("Tajaran")
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
taj_ears_clean
|
taj_ears_clean
|
||||||
name = "Tajara Clean"
|
name = "Tajara Clean"
|
||||||
icon_state = "hair_clean"
|
icon_state = "hair_clean"
|
||||||
species_allowed = list("Tajaran")
|
species_allowed = list("Tajaran")
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
taj_ears_bangs
|
taj_ears_bangs
|
||||||
name = "Tajara Bangs"
|
name = "Tajara Bangs"
|
||||||
icon_state = "hair_bangs"
|
icon_state = "hair_bangs"
|
||||||
species_allowed = list("Tajaran")
|
species_allowed = list("Tajaran")
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
taj_ears_braid
|
taj_ears_braid
|
||||||
name = "Tajara Braid"
|
name = "Tajara Braid"
|
||||||
icon_state = "hair_tbraid"
|
icon_state = "hair_tbraid"
|
||||||
species_allowed = list("Tajaran")
|
species_allowed = list("Tajaran")
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
taj_ears_shaggy
|
taj_ears_shaggy
|
||||||
name = "Tajara Shaggy"
|
name = "Tajara Shaggy"
|
||||||
icon_state = "hair_shaggy"
|
icon_state = "hair_shaggy"
|
||||||
species_allowed = list("Tajaran")
|
species_allowed = list("Tajaran")
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
taj_ears_mohawk
|
taj_ears_mohawk
|
||||||
name = "Tajaran Mohawk"
|
name = "Tajaran Mohawk"
|
||||||
icon_state = "hair_mohawk"
|
icon_state = "hair_mohawk"
|
||||||
species_allowed = list("Tajaran")
|
species_allowed = list("Tajaran")
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
taj_ears_plait
|
taj_ears_plait
|
||||||
name = "Tajara Plait"
|
name = "Tajara Plait"
|
||||||
icon_state = "hair_plait"
|
icon_state = "hair_plait"
|
||||||
species_allowed = list("Tajaran")
|
species_allowed = list("Tajaran")
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
taj_ears_straight
|
taj_ears_straight
|
||||||
name = "Tajara Straight"
|
name = "Tajara Straight"
|
||||||
icon_state = "hair_straight"
|
icon_state = "hair_straight"
|
||||||
species_allowed = list("Tajaran")
|
species_allowed = list("Tajaran")
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
taj_ears_long
|
taj_ears_long
|
||||||
name = "Tajara Long"
|
name = "Tajara Long"
|
||||||
icon_state = "hair_long"
|
icon_state = "hair_long"
|
||||||
species_allowed = list("Tajaran")
|
species_allowed = list("Tajaran")
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
taj_ears_rattail
|
taj_ears_rattail
|
||||||
name = "Tajara Rat Tail"
|
name = "Tajara Rat Tail"
|
||||||
icon_state = "hair_rattail"
|
icon_state = "hair_rattail"
|
||||||
species_allowed = list("Tajaran")
|
species_allowed = list("Tajaran")
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
taj_ears_spiky
|
taj_ears_spiky
|
||||||
name = "Tajara Spiky"
|
name = "Tajara Spiky"
|
||||||
icon_state = "hair_tajspiky"
|
icon_state = "hair_tajspiky"
|
||||||
species_allowed = list("Tajaran")
|
species_allowed = list("Tajaran")
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
taj_ears_messy
|
taj_ears_messy
|
||||||
name = "Tajara Messy"
|
name = "Tajara Messy"
|
||||||
icon_state = "hair_messy"
|
icon_state = "hair_messy"
|
||||||
species_allowed = list("Tajaran")
|
species_allowed = list("Tajaran")
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
vox_quills_short
|
vox_quills_short
|
||||||
name = "Short Vox Quills"
|
name = "Short Vox Quills"
|
||||||
@@ -634,37 +611,31 @@
|
|||||||
name = "Tajara Sideburns"
|
name = "Tajara Sideburns"
|
||||||
icon_state = "facial_mutton"
|
icon_state = "facial_mutton"
|
||||||
species_allowed = list("Tajaran")
|
species_allowed = list("Tajaran")
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
taj_mutton
|
taj_mutton
|
||||||
name = "Tajara Mutton"
|
name = "Tajara Mutton"
|
||||||
icon_state = "facial_mutton"
|
icon_state = "facial_mutton"
|
||||||
species_allowed = list("Tajaran")
|
species_allowed = list("Tajaran")
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
taj_pencilstache
|
taj_pencilstache
|
||||||
name = "Tajara Pencilstache"
|
name = "Tajara Pencilstache"
|
||||||
icon_state = "facial_pencilstache"
|
icon_state = "facial_pencilstache"
|
||||||
species_allowed = list("Tajaran")
|
species_allowed = list("Tajaran")
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
taj_moustache
|
taj_moustache
|
||||||
name = "Tajara Moustache"
|
name = "Tajara Moustache"
|
||||||
icon_state = "facial_moustache"
|
icon_state = "facial_moustache"
|
||||||
species_allowed = list("Tajaran")
|
species_allowed = list("Tajaran")
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
taj_goatee
|
taj_goatee
|
||||||
name = "Tajara Goatee"
|
name = "Tajara Goatee"
|
||||||
icon_state = "facial_goatee"
|
icon_state = "facial_goatee"
|
||||||
species_allowed = list("Tajaran")
|
species_allowed = list("Tajaran")
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
taj_smallstache
|
taj_smallstache
|
||||||
name = "Tajara Smallsatche"
|
name = "Tajara Smallsatche"
|
||||||
icon_state = "facial_smallstache"
|
icon_state = "facial_smallstache"
|
||||||
species_allowed = list("Tajaran")
|
species_allowed = list("Tajaran")
|
||||||
do_colouration = 0
|
|
||||||
|
|
||||||
//skin styles - WIP
|
//skin styles - WIP
|
||||||
//going to have to re-integrate this with surgery
|
//going to have to re-integrate this with surgery
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 49 KiB |
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.1 KiB |