Ports color standardization

from tg/52574
This commit is contained in:
DragonTrance
2022-06-06 11:58:34 -04:00
parent 68b73d8823
commit f3fe268d0c
188 changed files with 713 additions and 650 deletions
+5 -6
View File
@@ -333,16 +333,15 @@
switch(charging)
if(APC_NOT_CHARGING)
light_color = LIGHT_COLOR_RED
set_light_color(COLOR_SOFT_RED)
if(APC_CHARGING)
light_color = LIGHT_COLOR_BLUE
set_light_color(LIGHT_COLOR_BLUE)
if(APC_FULLY_CHARGED)
light_color = LIGHT_COLOR_GREEN
set_light(lon_range)
set_light_color(LIGHT_COLOR_GREEN)
set_light(l_range=lon_range)
lighteffect.color = light_color
else if(update_state & UPSTATE_BLUESCREEN)
light_color = LIGHT_COLOR_BLUE
set_light(lon_range)
set_light(l_range=lon_range, l_color=LIGHT_COLOR_BLUE)
else
set_light(0)
+12 -12
View File
@@ -1,12 +1,12 @@
GLOBAL_LIST_INIT(cable_colors, list(
"yellow" = "#ffff00",
"yellow" = COLOR_YELLOW,
"green" = "#00aa00",
"blue" = "#1919c8",
"pink" = "#ff3cc8",
"orange" = "#ff8000",
"cyan" = "#00ffff",
"cyan" = COLOR_CYAN,
"white" = "#ffffff",
"red" = "#ff0000"
"red" = COLOR_RED
))
///////////////////////////////
@@ -48,11 +48,11 @@ By design, d1 is the smallest direction and d2 is the highest
var/obj/item/stack/cable_coil/stored
var/cable_color = "red"
color = "#ff0000"
color = COLOR_RED
/obj/structure/cable/yellow
cable_color = "yellow"
color = "#ffff00"
color = COLOR_YELLOW
/obj/structure/cable/green
cable_color = "green"
@@ -72,7 +72,7 @@ By design, d1 is the smallest direction and d2 is the highest
/obj/structure/cable/cyan
cable_color = "cyan"
color = "#00ffff"
color = COLOR_CYAN
/obj/structure/cable/white
cable_color = "white"
@@ -770,11 +770,11 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
/obj/item/stack/cable_coil/red
item_color = "red"
color = "#ff0000"
color = COLOR_RED
/obj/item/stack/cable_coil/yellow
item_color = "yellow"
color = "#ffff00"
color = COLOR_YELLOW
/obj/item/stack/cable_coil/blue
item_color = "blue"
@@ -794,7 +794,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
/obj/item/stack/cable_coil/cyan
item_color = "cyan"
color = "#00ffff"
color = COLOR_CYAN
/obj/item/stack/cable_coil/white
item_color = "white"
@@ -821,11 +821,11 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
/obj/item/stack/cable_coil/cut/red
item_color = "red"
color = "#ff0000"
color = COLOR_RED
/obj/item/stack/cable_coil/cut/yellow
item_color = "yellow"
color = "#ffff00"
color = COLOR_YELLOW
/obj/item/stack/cable_coil/cut/blue
item_color = "blue"
@@ -845,7 +845,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
/obj/item/stack/cable_coil/cut/cyan
item_color = "cyan"
color = "#00ffff"
color = COLOR_CYAN
/obj/item/stack/cable_coil/cut/white
item_color = "white"
+1 -1
View File
@@ -219,7 +219,7 @@
var/emergency_mode = FALSE // if true, the light is in emergency mode
var/no_emergency = FALSE // if true, this light cannot ever have an emergency mode
var/bulb_emergency_brightness_mul = 0.6 // multiplier for this light's base brightness in emergency power mode
var/bulb_emergency_colour = "#FF3232" // determines the colour of the light while it's in emergency mode
var/bulb_emergency_colour = COLOR_VIVID_RED // determines the colour of the light while it's in emergency mode
var/bulb_emergency_pow_mul = 0.75 // the multiplier for determining the light's power in emergency mode
var/bulb_emergency_pow_min = 0.5 // the minimum value for the light's power in emergency mode