Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor part1 change define in coulours.dm from COULOUR to COLOR #5361

Merged
merged 4 commits into from
Jan 4, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
358 changes: 186 additions & 172 deletions code/__DEFINES/colours.dm

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion code/__HELPERS/filters.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ GLOBAL_LIST_INIT(master_filter_info, list(
"y" = -1,
"size" = 1,
"offset" = 0,
"color" = COLOUR_HALF_TRANSPARENT_BLACK
"color" = CL_COLOR_HALF_TRANSPARENT_BLACK
)
),
"blur" = list(
Expand Down
2 changes: 1 addition & 1 deletion code/datums/tutorial/marine/basic_marine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
update_objective("Shoot at the Xenomorph until it dies.")
var/mob/living/carbon/xenomorph/drone/tutorial/xeno_dummy = new(loc_from_corner(4, 5))
add_to_tracking_atoms(xeno_dummy)
add_highlight(xeno_dummy, COLOUR_VIVID_RED)
add_highlight(xeno_dummy, CL_COLOR_VIVID_RED)
RegisterSignal(xeno_dummy, COMSIG_MOB_DEATH, PROC_REF(on_xeno_death))
RegisterSignal(tutorial_mob, COMSIG_MOB_GUN_EMPTY, PROC_REF(on_magazine_empty)) // I'd like to prevent unwilling softlocks as much as I can

Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/effects/aliens.dm
Original file line number Diff line number Diff line change
Expand Up @@ -500,13 +500,13 @@
QDEL_IN(src, ttl)

/obj/effect/xenomorph/xeno_telegraph/red
color = COLOUR_DARK_RED
color = CL_COLOR_DARK_RED

/obj/effect/xenomorph/xeno_telegraph/brown
color = COLOUR_BROWN
color = CL_COLOR_BROWN

/obj/effect/xenomorph/xeno_telegraph/green
color = COLOUR_GREEN
color = CL_COLOR_GREEN

/// This has a brown icon state and does not have a color overlay by default.
/obj/effect/xenomorph/xeno_telegraph/abduct_hook
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/effects/decals/cleanable/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
acid_damage = 1
icon_state = "greenglow"
light_range = 1
light_color = COLOUR_GREEN
light_color = CL_COLOR_GREEN
/obj/effect/decal/cleanable/flour
name = "flour"
desc = "It's still good. Four second rule!"
Expand All @@ -55,7 +55,7 @@
anchored = TRUE
layer = TURF_LAYER
light_range = 1
light_color = COLOUR_GREEN
light_color = CL_COLOR_GREEN
icon = 'icons/effects/effects.dmi'
icon_state = "greenglow"

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/helmet_visors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
/atom/movable/nvg_light
light_power = 0.5
light_range = 1
light_color = COLOUR_GREEN
light_color = CL_COLOR_GREEN
light_system = MOVABLE_LIGHT
light_flags = LIGHT_ATTACHED

Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/lightstick.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
icon = 'icons/obj/items/lighting.dmi'
icon_state = "lightstick_blue0"
light_range = 2
light_color = COLOUR_BLUE
light_color = CL_COLOR_BLUE
var/s_color = "blue"
var/trample_chance = 30
var/can_trample = TRUE
Expand Down Expand Up @@ -68,7 +68,7 @@
name = "red lightstick"
icon_state = "lightstick_red0"
s_color = "red"
light_color = COLOUR_RED
light_color = CL_COLOR_RED

/obj/item/lightstick/red/planted
icon_state = "lightstick_red1"
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/tools/flame_tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
flags_atom = CAN_BE_SYRINGED
attack_verb = list("burnt", "singed")
blood_overlay_type = ""
light_color = LIGHT_COLOUR_ORANGE
light_color = CL_LIGHT_COLOR_ORANGE
/// Note - these are in masks.dmi not in cigarette.dmi
var/icon_on = "cigon"
var/icon_off = "cigoff"
Expand Down Expand Up @@ -685,7 +685,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon = 'icons/obj/items/items.dmi'
icon_state = "lighter_g"
item_state = "lighter_g"
light_color = LIGHT_COLOUR_LAVA
light_color = CL_LIGHT_COLOR_LAVA
var/icon_on = "lighter_g_on"
var/icon_off = "lighter_g"
var/clr = "g"
Expand Down
32 changes: 16 additions & 16 deletions code/game/objects/structures/crates_lockers/largecrate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -268,22 +268,22 @@

GLOBAL_LIST_EMPTY(rbarrel_cap_states) // Will be set up in generate_barrel_states
GLOBAL_LIST_INIT(rbarrel_center_states, generate_barrel_states())
GLOBAL_LIST_INIT(rbarrel_color_list, list(COLOUR_SILVER,
COLOUR_FLOORTILE_GRAY,
COLOUR_MAROON,
COLOUR_SOFT_RED,
COLOUR_LIGHT_GRAYISH_RED,
COLOUR_VERY_SOFT_YELLOW,
COLOUR_OLIVE,
COLOUR_DARK_MODERATE_LIME_GREEN,
COLOUR_TEAL,
COLOUR_MODERATE_BLUE,
COLOUR_PURPLE,
COLOUR_STRONG_VIOLET,
COLOUR_BEIGE,
COLOUR_DARK_MODERATE_ORANGE,
COLOUR_BROWN,
COLOUR_DARK_BROWN))
GLOBAL_LIST_INIT(rbarrel_color_list, list(CL_COLOR_SILVER,
CL_COLOR_FLOORTILE_GRAY,
CL_COLOR_MAROON,
CL_COLOR_SOFT_RED,
CL_COLOR_LIGHT_GRAYISH_RED,
CL_COLOR_VERY_SOFT_YELLOW,
CL_COLOR_OLIVE,
CL_COLOR_DARK_MODERATE_LIME_GREEN,
CL_COLOR_TEAL,
CL_COLOR_MODERATE_BLUE,
CL_COLOR_PURPLE,
CL_COLOR_STRONG_VIOLET,
CL_COLOR_BEIGE,
CL_COLOR_DARK_MODERATE_ORANGE,
CL_COLOR_BROWN,
CL_COLOR_DARK_BROWN))

/proc/generate_barrel_states()
var/list/rbarrel_center_states = list()
Expand Down
Loading