From b5b27cf9019abb27f1a01dc12f69ebc67a128b19 Mon Sep 17 00:00:00 2001 From: KasparoVy Date: Sat, 1 Apr 2017 05:44:24 -0400 Subject: [PATCH] Horn Icon State/Datum Name Fixes Woops. --- .../mob/new_player/sprite_accessories.dm | 14 +++++++++----- icons/mob/body_accessory.dmi | Bin 62665 -> 62662 bytes icons/mob/human_face.dmi | Bin 76807 -> 76808 bytes 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index b9fb718a137..51dc0e81a68 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -570,7 +570,7 @@ /datum/sprite_accessory/hair/unathi/una_frills_dorsal icon = 'icons/mob/human_face.dmi' name = "Dorsal Frills" - icon_state = "facial_dorsalfrills" + icon_state = "unathi_dorsalfrills" secondary_theme = "webbing" /datum/sprite_accessory/hair/unathi/simple @@ -812,6 +812,7 @@ /datum/sprite_accessory/hair/vulpkanin/vulp_hair_short2 name = "Short Alt." icon_state = "short2" + glasses_over = 1 /datum/sprite_accessory/hair/vulpkanin/vulp_hair_rough name = "Rough-Cropped Mane" @@ -1188,20 +1189,23 @@ /datum/sprite_accessory/facial_hair/unathi/una_frills_dorsal over_hair = null name = "Dorsal Frills" - icon_state = "facial_dorsalfrills" + icon_state = "unathi_dorsalfrills" secondary_theme = "webbing" /datum/sprite_accessory/facial_hair/unathi/una_chin_horns name = "Chin Horns" - icon_state = "facial_chinhorns" + icon = 'icons/mob/body_accessory.dmi' + icon_state = "horns_chin" /datum/sprite_accessory/facial_hair/unathi/una_horn_adorns name = "Horn Adorns" - icon_state = "facial_hornadorns" + icon = 'icons/mob/body_accessory.dmi' + icon_state = "horns_adorns" /datum/sprite_accessory/facial_hair/unathi/una_spikes name = "Spikes" - icon_state = "facial_spikes" + icon = 'icons/mob/body_accessory.dmi' + icon_state = "horns_spikes" //skin styles - WIP //going to have to re-integrate this with surgery diff --git a/icons/mob/body_accessory.dmi b/icons/mob/body_accessory.dmi index 4538e5057ff4c749404209eb677cc30b76cc9a6e..a9b6670b61871d6c83cf5aa01f1ed9bb123d4817 100644 GIT binary patch delta 395 zcmV;60d)S!=>x{;1CS&EDUl^R1GJ&rkz-ze|6_k7vkVoS*^Vve@1BoIR>5+sDdg6{ za_cGNHocVm7t*nsO8Ujk}joPD9XPztY+{2%EGPUT4 zXl_otsZ~W4jb*(o(8d4)A?v8fUG0&PThk+B*OxWY?P3?KDfm>7SYy?l+_m)@YNIZ9K9BuowaY!ptZ5%E`(G<#R zk4kY5-WwA@n99r41qAM;6Q<&zJipE?FZcgq-b-)g}(wmB8A?d05}|O@Q{OHH5T9zKIDcMyCeLa`WCz`&?Kh3*m>@^*eSmU(7fEskp|R zJV?d&5chGua$ZIi_$!m?0V4rhlMMnF0S}WU0w4i{lSTqX0ppX50-!1Z^GgEeN>GZx pr9x@~23e~b@3WEz3<7W2!}C46e|k**0@!$C-{wXjF0)w!aPg!hzy5>1CS&EERiKU18hULkz-ze$FV<>S%wPEY{!=KH_!Vdt6;g+6msie zx%Cusn_#)k6mr{Ox$ThL&q2AqUX=4R#wPs4FM(gO6^gpGtU)x?%_{7nOby2 zG&d*S)T*M2#&qcUnrM$4AsV?y|C0i2yt1i1f_0>S z1xrmv%lhR-;TRNjHpYO{ruMwnz^$ouHiD<^d&?_xB%ZrAj<$W;IHVP+HV&7eXbNSu zN2Rz2?~Mr{Oyy{=o|7~>0AF43)qFKy z_4e1;N?`5cJgo2fCO~`C8baD4-^2teqf>)rxq0iReJ-q$h44e{`VG68FXo#MDy}gn z4^r_x#C@FqI4`3L{2!C)0V4rxlMMnF0e6!n0w4i}lSTqX0sWJV0-!AqD9J69%Xp5v s5|kovsgRn0LDs6q`>f;vgTPz%@O;nipB|IHUO8k)UxLiTvsMFe@$+KCnE(I) diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index 6c8e8d7bf5e2cc60b3512a7e334147a17f8195b2..4959f0ebb538097858254475075fa13901c26dae 100644 GIT binary patch delta 4087 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 Z55OhyrpmJ09>a&arY1LyE3df5{|B$%72yB? delta 4080 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