diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index a9e33abc9ed..1433b2ba9f0 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -1152,7 +1152,12 @@ There are several things that need to be remembered: r_hand.auto_adapt_species(src) t_state = "[UNDERSCORE_OR_NULL(r_hand.icon_species_tag)][r_hand.item_state][WORN_RHAND]" - overlays_raw[R_HAND_LAYER] = image(r_hand.icon_override || r_hand.icon, t_state) + result_layer = image(r_hand.icon_override || r_hand.icon, t_state) + + if(r_hand.color) + result_layer.color = r_hand.color + + overlays_raw[R_HAND_LAYER] = result_layer else if(r_hand.item_state_slots && r_hand.item_state_slots[slot_r_hand_str]) t_state = r_hand.item_state_slots[slot_r_hand_str] @@ -1197,7 +1202,12 @@ There are several things that need to be remembered: l_hand.auto_adapt_species(src) t_state = "[UNDERSCORE_OR_NULL(l_hand.icon_species_tag)][l_hand.item_state][WORN_LHAND]" - overlays_raw[L_HAND_LAYER] = image(l_hand.icon_override || l_hand.icon, t_state) + result_layer = image(l_hand.icon_override || l_hand.icon, t_state) + + if(l_hand.color) + result_layer.color = l_hand.color + + overlays_raw[L_HAND_LAYER] = result_layer else if(l_hand.item_state_slots && l_hand.item_state_slots[slot_l_hand_str]) t_state = l_hand.item_state_slots[slot_l_hand_str] diff --git a/html/changelogs/wezzy_inhand_colora.yml b/html/changelogs/wezzy_inhand_colora.yml new file mode 100644 index 00000000000..a825d8c3eeb --- /dev/null +++ b/html/changelogs/wezzy_inhand_colora.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Inhand items using contained sprites should follow colorations properly now."