diff --git a/code/modules/power/fusion/core/core_field.dm b/code/modules/power/fusion/core/core_field.dm index c9bb540bcf0..d02b8b49ec4 100644 --- a/code/modules/power/fusion/core/core_field.dm +++ b/code/modules/power/fusion/core/core_field.dm @@ -126,38 +126,32 @@ /obj/effect/fusion_em_field/proc/update_light_colors() var/use_range - var/use_power + var/use_power = 0 + var/temp_mod = ((plasma_temperature-5000)/20000) + use_range = light_min_range + Ceil((light_max_range-light_min_range)*temp_mod) + use_power = light_min_power + Ceil((light_max_power-light_min_power)*temp_mod) switch (plasma_temperature) if (-INFINITY to 1000) light_color = COLOR_RED - use_range = light_min_range - use_power = light_min_power alpha = 30 + if (1000 to 6000) + light_color = COLOR_ORANGE + alpha = 50 + if (6000 to 20000) + light_color = COLOR_YELLOW + alpha = 80 + if (20000 to 50000) + light_color = COLOR_GREEN + alpha = 120 + if (50000 to 70000) + light_color = COLOR_CYAN + alpha = 160 + if (70000 to 100000) + light_color = COLOR_BLUE + alpha = 200 if (100000 to INFINITY) light_color = COLOR_VIOLET - use_range = light_max_range - use_power = light_max_power alpha = 230 - else - var/temp_mod = ((plasma_temperature-5000)/20000) - use_range = light_min_range + Ceil((light_max_range-light_min_range)*temp_mod) - use_power = light_min_power + Ceil((light_max_power-light_min_power)*temp_mod) - switch (plasma_temperature) - if (1000 to 6000) - light_color = COLOR_ORANGE - alpha = 50 - if (6000 to 20000) - light_color = COLOR_YELLOW - alpha = 80 - if (20000 to 50000) - light_color = COLOR_GREEN - alpha = 120 - if (50000 to 70000) - light_color = COLOR_CYAN - alpha = 160 - if (70000 to 100000) - light_color = COLOR_BLUE - alpha = 200 if (last_range != use_range || last_power != use_power || color != light_color) set_light(use_range / 6, use_power ? 6 : 0, light_color) diff --git a/html/changelogs/Sneakyranger-rainbow2.yml b/html/changelogs/Sneakyranger-rainbow2.yml new file mode 100644 index 00000000000..3254f2af4f2 --- /dev/null +++ b/html/changelogs/Sneakyranger-rainbow2.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: Sneakyranger + +# 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: "Fixed certain INDRA reactor colors not properly displaying colored lighting effects."