Fixes emag ethereals, also ensures mutcolor is used properly (#62088)

* Fixes emagged ethereals not working

* Ensures mutcolor is properly treated as something without # ahead of it

* gI take it all back (Someone else went in a different direction then me wth mutcolor, adding the sharp instead
of removing it. Just gonna roll back my unneeded stuff. Oh also I found an issue in spraytans, cleaning that up too
This commit is contained in:
LemonInTheDark
2021-10-27 08:22:21 +02:00
committed by GitHub
parent 17c022283b
commit a47ff2485c
3 changed files with 4 additions and 3 deletions
+1
View File
@@ -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)))
@@ -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
@@ -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)