diff --git a/code/__HELPERS/colors.dm b/code/__HELPERS/colors.dm index 2fed8109779..c50ab79e0c4 100644 --- a/code/__HELPERS/colors.dm +++ b/code/__HELPERS/colors.dm @@ -63,3 +63,4 @@ animate(flashed_client, color = animate_color, time = flash_time) #define RANDOM_COLOUR (rgb(rand(0,255),rand(0,255),rand(0,255))) + diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index 96e670cbd63..204a78ea284 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -88,7 +88,7 @@ current_color = rgb(r2 + ((r1-r2)*healthpercent), g2 + ((g1-g2)*healthpercent), b2 + ((b1-b2)*healthpercent)) ethereal_light.set_light_range_power_color(1 + (2 * healthpercent), 1 + (1 * healthpercent), current_color) ethereal_light.set_light_on(TRUE) - fixed_mut_color = copytext_char(current_color, 2) + fixed_mut_color = current_color else ethereal_light.set_light_on(FALSE) fixed_mut_color = rgb(128,128,128) @@ -132,7 +132,7 @@ /datum/species/ethereal/proc/handle_emag(mob/living/carbon/human/H) if(!emageffect) return - current_color = pick(GLOB.color_list_ethereal) + current_color = GLOB.color_list_ethereal[pick(GLOB.color_list_ethereal)] spec_updatehealth(H) addtimer(CALLBACK(src, .proc/handle_emag, H), 5) //Call ourselves every 0.5 seconds to change color diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 6e0cd8fb465..ba69eb8c7a7 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -500,7 +500,7 @@ if(N.dna.species.use_skintones) N.skin_tone = "orange" else if(MUTCOLORS in N.dna.species.species_traits) //Aliens with custom colors simply get turned orange - N.dna.features["mcolor"] = "f80" + N.dna.features["mcolor"] = "#ff8800" N.regenerate_icons() if(DT_PROB(3.5, delta_time)) if(N.w_uniform)