From 4d9f5ba8907296e8664c43f062e4e74d31a99d8e Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Fri, 13 May 2016 23:21:27 -0400 Subject: [PATCH 1/4] Fixing tail sprites slightly --- .../mob/living/carbon/human/update_icons.dm | 6 +++++- .../mob/new_player/preferences_setup.dm | 7 ++++++- .../mob/new_player/sprite_accessories_vr.dm | 6 +++--- icons/mob/human_races/r_akula.dmi | Bin 3319 -> 3321 bytes icons/mob/human_races/r_nevrean.dmi | Bin 2514 -> 2515 bytes icons/mob/human_races/r_sergal.dmi | Bin 9934 -> 9935 bytes 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index b313ae0d8ab..329f901e635 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -993,7 +993,11 @@ var/global/list/damage_icon_parts = list() var/species_tail_anim = species.get_tail_animation(src) if(!species_tail_anim) species_tail_anim = 'icons/effects/species.dmi' tail_icon = new/icon(species_tail_anim) - tail_icon.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD) + //VOREStation Code Start + if(species.color_mult) + tail_icon.Blend(rgb(r_skin, g_skin, b_skin), ICON_MULTIPLY) + else + tail_icon.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD) // The following will not work with animated tails. var/use_species_tail = species.get_tail_hair(src) if(use_species_tail) diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 3db8be967ac..dbef63dfd5e 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -272,7 +272,12 @@ "icon" = (current_species.icobase_tail ? current_species.icobase : 'icons/effects/species.dmi'), "icon_state" = "[current_species.tail]_s") if(current_species && (current_species.appearance_flags & HAS_SKIN_COLOR)) - temp.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD) + //VOREStation Code Start + if(current_species.color_mult) + temp.Blend(rgb(r_skin, g_skin, b_skin), ICON_MULTIPLY) + else + temp.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD) + //VOREStation Code End if(current_species && (current_species.appearance_flags & HAS_SKIN_TONE)) if (s_tone >= 0) temp.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD) diff --git a/code/modules/mob/new_player/sprite_accessories_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm index 05d1c614c28..9a85bdf4b55 100644 --- a/code/modules/mob/new_player/sprite_accessories_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_vr.dm @@ -10,17 +10,17 @@ icon_state = "serg_plain" species_allowed = list("Sergal") - sergal_plain + sergal_medicore name = "Sergal Medicore" icon_state = "serg_medicore" species_allowed = list("Sergal") - sergal_plain + sergal_tapered name = "Sergal Tapered" icon_state = "serg_tapered" species_allowed = list("Sergal") - sergal_plain + sergal_fairytail name = "Sergal Fairytail" icon_state = "serg_fairytail" species_allowed = list("Sergal") \ No newline at end of file diff --git a/icons/mob/human_races/r_akula.dmi b/icons/mob/human_races/r_akula.dmi index 114d5c0fa9e460569e602eaf1aad6e1690291132..877c45265750a94ff09339dd9931105ffb49a48d 100644 GIT binary patch delta 149 zcmV;G0BZmD8TlEIz5&URzbXMkk?J>pRKj^IEh-JB6oqyams6rJqpBWXAmKcg7C|dhib6Yz%PCP9f*zN7_rv-uOMznG zJ7pj-ZT^a1$IA4|gpg;%V_tde7-1ac6;S^Dh^4%;Fla^?i-oyb9$v~m<2{QXgrmbL l>pBW Date: Fri, 13 May 2016 23:22:24 -0400 Subject: [PATCH 2/4] External organ sprites need to handle species that use ICON_MULTIPLY --- code/modules/organs/organ_icon.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/organs/organ_icon.dm b/code/modules/organs/organ_icon.dm index 21e1e337b8e..6a698fc349e 100644 --- a/code/modules/organs/organ_icon.dm +++ b/code/modules/organs/organ_icon.dm @@ -147,7 +147,10 @@ var/global/list/limb_icon_cache = list() else applying.Blend(rgb(-s_tone, -s_tone, -s_tone), ICON_SUBTRACT) else if(s_col && s_col.len >= 3) - applying.Blend(rgb(s_col[1], s_col[2], s_col[3]), ICON_ADD) + if(species && species.color_mult) + applying.Blend(rgb(s_col[1], s_col[2], s_col[3]), ICON_MULTIPLY) + else + applying.Blend(rgb(s_col[1], s_col[2], s_col[3]), ICON_ADD) // Translucency. if(nonsolid) applying += rgb(,,,180) // SO INTUITIVE TY BYOND From 2c2362e8b058f91cd19cbef0c7e46c3504042229 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 14 May 2016 00:17:30 -0400 Subject: [PATCH 3/4] Made tails go --- .../mob/living/carbon/human/species/station/station_vr.dm | 1 + code/modules/mob/living/carbon/human/update_icons.dm | 1 + 2 files changed, 2 insertions(+) diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index b58b30e8850..c6a14b1d3c5 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -89,6 +89,7 @@ icobase = 'icons/mob/human_races/r_nevrean.dmi' deform = 'icons/mob/human_races/r_def_nevrean.dmi' tail = "tail" + tail_animation = 'icons/mob/species/nevrean/tail.dmi' icobase_tail = 1 unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) //darksight = 8 diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 329f901e635..0fb90dbc751 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -991,6 +991,7 @@ var/global/list/damage_icon_parts = list() if(!tail_icon) //generate a new one var/species_tail_anim = species.get_tail_animation(src) + if(species.icobase_tail) species_tail_anim = species.icobase //VOREStation Code if(!species_tail_anim) species_tail_anim = 'icons/effects/species.dmi' tail_icon = new/icon(species_tail_anim) //VOREStation Code Start From df711353d23a1f04c81ca614c015dde43f66daee Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 14 May 2016 00:18:43 -0400 Subject: [PATCH 4/4] yup --- .../mob/living/carbon/human/species/station/station_vr.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index c6a14b1d3c5..b58b30e8850 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -89,7 +89,6 @@ icobase = 'icons/mob/human_races/r_nevrean.dmi' deform = 'icons/mob/human_races/r_def_nevrean.dmi' tail = "tail" - tail_animation = 'icons/mob/species/nevrean/tail.dmi' icobase_tail = 1 unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) //darksight = 8