cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-27 23:28:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Getting vox tail icons and markings to work.

Browse Source
This commit is contained in:
MistakeNot4892
2022-11-09 21:53:02 +11:00
parent 12114eece0
commit e234e58c2c
10 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/outsider/vox.dm
+1
View File
@@ -60,6 +60,7 @@
flesh_color = "#808D11"
tail = "voxtail"
tail_hair = "quills"
tail_blend = ICON_MULTIPLY
reagent_tag = IS_VOX
code/modules/mob/living/carbon/human/species/species.dm
+3 -1
View File
@@ -13,7 +13,7 @@
// Icon/appearance vars.
var/icobase = 'icons/mob/human_races/r_human.dmi' // Normal icon set.
var/deform = 'icons/mob/human_races/r_def_human.dmi' // Mutated icon set.
var/limb_blend = ICON_ADD // Specify a blending mode for limbs and tail.
var/limb_blend = ICON_ADD // Specify a blending mode for limb colourisation.
var/speech_bubble_appearance = "normal" // Part of icon_state to use for speech bubbles when talking. See talk.dmi for available icons.
var/fire_icon_state = "humanoid" // The icon_state used inside OnFire.dmi for when on fire.
@@ -32,6 +32,8 @@
var/tail // Name of tail state in species effects icon file.
var/tail_animation // If set, the icon to obtain tail animation states from.
var/tail_hair
var/tail_blend = ICON_ADD // Blending mode for tail colourisation.
var/tail_hair_blend = ICON_ADD // Blending mode for tail hair colourisation.
var/icon_scale_x = 1 // Makes the icon wider/thinner.
var/icon_scale_y = 1 // Makes the icon taller/shorter.
code/modules/mob/living/carbon/human/update_icons.dm
+4 -4
View File
@@ -915,12 +915,12 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
if(!species_tail_anim && species.icobase_tail) species_tail_anim = species.icobase //Allow override of file for non-animated tails
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), species?.limb_blend || ICON_ADD)
tail_icon.Blend(rgb(r_skin, g_skin, b_skin), species?.tail_blend || ICON_ADD)
// The following will not work with animated tails.
var/use_species_tail = species.get_tail_hair(src)
if(use_species_tail)
var/icon/hair_icon = icon('icons/effects/species.dmi', "[species.get_tail(src)]_[use_species_tail]")
hair_icon.Blend(rgb(r_hair, g_hair, b_hair), species?.limb_blend || ICON_ADD)
hair_icon.Blend(rgb(r_hair, g_hair, b_hair), species?.tail_hair_blend || ICON_ADD)
tail_icon.Blend(hair_icon, ICON_OVERLAY)
tail_icon_cache[icon_key] = tail_icon
@@ -1075,7 +1075,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
//If you are FBP with wing style and didn't set a custom one
if(synthetic && synthetic.includes_wing && !wing_style)
var/icon/wing_s = new/icon("icon" = synthetic.icon, "icon_state" = "wing") //I dunno. If synths have some custom wing?
wing_s.Blend(rgb(src.r_skin, src.g_skin, src.b_skin), species?.limb_blend || ICON_ADD)
wing_s.Blend(rgb(src.r_skin, src.g_skin, src.b_skin), species?.limb_blend || ICON_ADD) // Are wings even used on Polaris? This might need an additional blend mode var.
return image(wing_s)
//If you have custom wings selected
@@ -1125,7 +1125,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
var/datum/robolimb/model = isSynthetic()
if(istype(model) && model.includes_tail && !tail_style)
var/icon/tail_s = new/icon("icon" = synthetic.icon, "icon_state" = "tail")
tail_s.Blend(rgb(src.r_skin, src.g_skin, src.b_skin), species?.limb_blend || ICON_ADD)
tail_s.Blend(rgb(src.r_skin, src.g_skin, src.b_skin), species?.tail_blend || ICON_ADD)
return image(tail_s)
//If you have a custom tail selected
code/modules/mob/new_player/preferences_setup.dm
+4
View File
@@ -22,6 +22,10 @@
r_skin = rand (0,255)
g_skin = rand (0,255)
b_skin = rand (0,255)
for(var/marking in body_markings)
body_markings[marking] = rgb(rand(0,255), rand(0,255), rand(0,255))
if(current_species.appearance_flags & HAS_UNDERWEAR)
all_underwear.Cut()
for(var/datum/category_group/underwear/WRC in global_underwear.categories)
code/modules/mob/new_player/sprite_accessories.dm
+1 -1
View File
@@ -2112,7 +2112,7 @@ shaved
/datum/sprite_accessory/marking/vox/scutes
name = "Vox Scutes"
icon_state = "scutes"
body_parts = list(BP_L_HAND, BP_R_HAND, BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT)
body_parts = list(BP_L_ARM, BP_L_HAND, BP_R_ARM, BP_R_HAND, BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT)
/datum/sprite_accessory/marking/vox/arm_markings
name = "Vox Arm Markings (Left)"