cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-07-18 03:32:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8822 from MistakeNot4892/voxicon

Browse Source 
Sideports multiplicative colour vox icon and markings from Neb.
This commit is contained in:
Spookerton
2022-11-13 12:29:35 +00:00
committed by GitHub
parent 1d9f63d02c e234e58c2c
commit e7ca4ddd93
17 changed files with 63 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ_external.dm
+1 -1
View File
@@ -40,9 +40,9 @@
var/gendered_icon = 0 // Whether or not the icon state appends a gender.
var/s_tone // Skin tone.
var/list/s_col // skin colour
var/s_col_blend = ICON_ADD // How the skin colour is applied.
var/list/h_col // hair colour
var/body_hair // Icon blend for body hair if any.
var/mob/living/applied_pressure
var/list/markings = list() // Markings (body_markings) to apply to the icon
code/modules/organs/organ_icon.dm
+6 -6
View File
@@ -119,7 +119,7 @@ var/global/list/limb_icon_cache = list()
for(var/M in markings)
var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"]
var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]")
mark_s.Blend(markings[M]["color"], ICON_ADD)
mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode)
add_overlay(mark_s) //So when it's not on your body, it has icons
mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons
icon_cache_key += "[M][markings[M]["color"]]"
@@ -139,7 +139,7 @@ var/global/list/limb_icon_cache = list()
for(var/M in markings)
var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"]
var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]")
mark_s.Blend(markings[M]["color"], ICON_ADD)
mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode)
add_overlay(mark_s) //So when it's not on your body, it has icons
mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons
icon_cache_key += "[M][markings[M]["color"]]"
@@ -168,10 +168,10 @@ var/global/list/limb_icon_cache = list()
else
applying.Blend(rgb(-s_tone, -s_tone, -s_tone), ICON_SUBTRACT)
icon_cache_key += "_tone_[s_tone]"
else
if(s_col && s_col.len >= 3)
applying.Blend(rgb(s_col[1], s_col[2], s_col[3]), s_col_blend)
icon_cache_key += "_color_[s_col[1]]_[s_col[2]]_[s_col[3]]_[s_col_blend]"
else if(s_col && s_col.len >= 3)
var/blend = species?.limb_blend || ICON_ADD
applying.Blend(rgb(s_col[1], s_col[2], s_col[3]), blend)
icon_cache_key += "_color_[s_col[1]]_[s_col[2]]_[s_col[3]]_[blend]"
// Translucency.
if(nonsolid) applying += rgb(,,,180) // SO INTUITIVE TY BYOND
code/modules/organs/subtypes/vox.dm
+1
View File
@@ -1,5 +1,6 @@
/obj/item/organ/external/head/vox
eye_icon = "vox_eyes_s"
eye_icon_location = 'icons/mob/eyes_vox.dmi'
//vox got different organs within. This will also help with regular surgeons knowing the organs within an alien as alien as vox.
/obj/item/organ/internal/brain/vox