Skip to content

Commit

Permalink
Baywalls Color-Correction Pass (#5688)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

This is a Code/Spriting PR. Some Map changes may follow in the future to
address remaining issues,
The goal of the PR is to refine and consolidate color design choices of
the new Baywalls. I've done what I can not to stray too far from theme
where it's been voted on, though changes have been made to most
departments. Rather, the aim is to execute the presentation more
consistently.
Several colors previously at 100% saturation have been toned down, most
department's palettes (except for Civ and Sci) have had tweaks and
corrections made in some way. Atmospheric's chaotic color scheme in
particular has been overhauled into a single proprietary department
color.
Some new color defines have been added to avoid altering sprites which
previously shared colors with certain departments.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

Much as Baywalls already look quite good, their current implementation
has extremely clashing and oversaturated colors which look completely
out of place as well as many inconsistencies.
These changes have been designed to retain the core principles behind
those color choices while addressing their issues.

Seen as this PR is all about color, below is a(n outdated) visual
summary of changes:


![PR_Hallway](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/33434925/4233e6de-59a4-4f59-b41a-05d123d269c2)

![PR_Command](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/33434925/f1dd07dd-658c-471e-b6ad-5ac2fbd3a58b)

![PR_Exploration](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/33434925/e4eed610-9849-4f5e-a3c2-cd0f018c7258)

![PR_Cargo](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/33434925/ec692e5d-a17f-4768-b528-58c1df98d02d)

![PR_Atmos](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/33434925/6cee5d05-7d73-44c7-8d68-36ee620c86c4)

![PR_Engineering](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/33434925/c98b2b2b-0a16-4894-82ce-a488073485a5)

![PR_Medical](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/33434925/ee487297-2547-4438-9cfd-691c2ad9cca4)

![PR_Security](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/33434925/4c7e6369-c462-4157-96d7-a762e6e6400a)

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Defined three new colors: COLOR_SECURITY_RED,
COLOR_ATMOSPHERICS_CYAN and COLOR_CARGO_BROWN;
add: Added "Maroon" mapping paint (Old Security color);
tweak: Altered COLOR_EXPLO_VIOLET, COLOR_SUN, COLOR_BABY_BLUE and
COLOR_WALL_GUNMETAL;
tweak: Added stripes to Engineering airlocks;
tweak: Recolored stripes on Medical airlocks;
fix: Wall and door stripe sprites now match Airlock sprites in color.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
AlphaM01 authored Jul 13, 2023
1 parent 66d4d1f commit d492cbe
Show file tree
Hide file tree
Showing 11 changed files with 43 additions and 36 deletions.
11 changes: 7 additions & 4 deletions code/__DEFINES/color/color.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#define COLOR_NAVY_BLUE "#000080"
#define COLOR_DARK_GRAY "#404040"
#define COLOR_VIOLET "#9933ff"
#define COLOR_EXPLO_VIOLET "#410083"
#define COLOR_EXPLO_VIOLET "#604080"
#define COLOR_BROWN_ORANGE "#824b28"
#define COLOR_GRAY40 "#666666"
#define COLOR_GRAY20 "#333333"
Expand All @@ -51,9 +51,9 @@
#define COLOR_DARK_GREEN_GRAY "#54654c"
#define COLOR_DARK_BLUE_GRAY "#3e4855"
#define COLOR_SURGERY_BLUE "#e0f2f6"
#define COLOR_SUN "#ec8b2f"
#define COLOR_SUN "#ed973b"
#define COLOR_BLUE_LIGHT "#33ccff"
#define COLOR_BABY_BLUE "#89cff0"
#define COLOR_BABY_BLUE "#a3d6f0"
#define COLOR_ACID_CYAN "#00ffc8"
#define COLOR_GRAY80 "#cccccc"
#define COLOR_OFF_WHITE "#eeeeee"
Expand All @@ -63,7 +63,7 @@
#define COLOR_BOTTLE_GREEN "#1f6b4f"
#define COLOR_PALE_BTL_GREEN "#57967f"
#define COLOR_GUNMETAL "#545c68"
#define COLOR_WALL_GUNMETAL "#353a42"
#define COLOR_WALL_GUNMETAL "#404447"
#define COLOR_STEEL "#a8b0b2"
#define COLOR_MUZZLE_FLASH "#ffffb2"
#define COLOR_CHESTNUT "#996633"
Expand All @@ -90,6 +90,9 @@
#define COLOR_ALUMINIUM "#bbbbbb"
#define COLOR_CRYSTAL "#00c8a5"
#define COLOR_DIAMOND "#d8d4ea"
#define COLOR_SECURITY_RED "#b3363c"
#define COLOR_ATMOSPHERICS_CYAN "#73a6bf"
#define COLOR_CARGO_BROWN "#805f40"

#define WOOD_COLOR_GENERIC "#d5a66e"
#define WOOD_COLOR_RICH "#792f27"
Expand Down
28 changes: 15 additions & 13 deletions code/game/machinery/doors/airlock_subtypes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
assembly_type = /obj/structure/door_assembly/door_assembly_sec
open_sound_powered = 'sound/machines/door/sec1o.ogg'
close_sound_powered = 'sound/machines/door/sec1c.ogg'
door_color = COLOR_MAROON
door_color = COLOR_SECURITY_RED

/obj/machinery/door/airlock/engineering
name = "Engineering Airlock"
Expand All @@ -27,6 +27,7 @@
open_sound_powered = 'sound/machines/door/eng1o.ogg'
close_sound_powered = 'sound/machines/door/eng1c.ogg'
door_color = COLOR_AMBER
stripe_color = COLOR_SUN

/obj/machinery/door/airlock/engineeringatmos
name = "Atmospherics Airlock"
Expand All @@ -36,7 +37,7 @@
open_sound_powered = 'sound/machines/door/eng1o.ogg'
close_sound_powered = 'sound/machines/door/eng1c.ogg'
door_color = COLOR_AMBER
stripe_color = COLOR_CYAN
stripe_color = COLOR_ATMOSPHERICS_CYAN

/obj/machinery/door/airlock/medical
name = "Medical Airlock"
Expand All @@ -46,7 +47,7 @@
open_sound_powered = 'sound/machines/door/med1o.ogg'
close_sound_powered = 'sound/machines/door/med1c.ogg'
door_color = COLOR_WHITE
stripe_color = COLOR_DEEP_SKY_BLUE
stripe_color = COLOR_BABY_BLUE

/obj/machinery/door/airlock/maintenance
name = "Maintenance Access"
Expand Down Expand Up @@ -260,6 +261,7 @@
open_sound_powered = 'sound/machines/door/eng1o.ogg'
close_sound_powered = 'sound/machines/door/eng1c.ogg'
door_color = COLOR_AMBER
stripe_color = COLOR_SUN
window_color = GLASS_COLOR

/obj/machinery/door/airlock/glass/engineeringatmos
Expand All @@ -274,7 +276,7 @@
open_sound_powered = 'sound/machines/door/eng1o.ogg'
close_sound_powered = 'sound/machines/door/eng1c.ogg'
door_color = COLOR_AMBER
stripe_color = COLOR_CYAN
stripe_color = COLOR_ATMOSPHERICS_CYAN
window_color = GLASS_COLOR

/obj/machinery/door/airlock/glass/security
Expand All @@ -288,7 +290,7 @@
req_one_access = list(ACCESS_SECURITY_EQUIPMENT)
open_sound_powered = 'sound/machines/door/sec1o.ogg'
close_sound_powered = 'sound/machines/door/sec1c.ogg'
door_color = COLOR_MAROON
door_color = COLOR_SECURITY_RED
window_color = GLASS_COLOR

/obj/machinery/door/airlock/glass/medical
Expand All @@ -303,7 +305,7 @@
open_sound_powered = 'sound/machines/door/med1o.ogg'
close_sound_powered = 'sound/machines/door/med1c.ogg'
door_color = COLOR_WHITE
stripe_color = COLOR_DEEP_SKY_BLUE
stripe_color = COLOR_BABY_BLUE
window_color = GLASS_COLOR

/obj/machinery/door/airlock/mining
Expand All @@ -313,7 +315,7 @@
open_sound_powered = 'sound/machines/door/eng1o.ogg'
close_sound_powered = 'sound/machines/door/eng1c.ogg'
door_color = COLOR_PALE_ORANGE
stripe_color = COLOR_BEASTY_BROWN
stripe_color = COLOR_CARGO_BROWN

/obj/machinery/door/airlock/atmos
name = "Atmospherics Airlock"
Expand All @@ -322,7 +324,7 @@
open_sound_powered = 'sound/machines/door/eng1o.ogg'
close_sound_powered = 'sound/machines/door/eng1c.ogg'
door_color = COLOR_AMBER
stripe_color = COLOR_CYAN
stripe_color = COLOR_ATMOSPHERICS_CYAN

/obj/machinery/door/airlock/research
name = "Research Airlock"
Expand Down Expand Up @@ -359,7 +361,7 @@
open_sound_powered = 'sound/machines/door/cgo1o.ogg'
close_sound_powered = 'sound/machines/door/cgo1c.ogg'
door_color = COLOR_PALE_ORANGE
stripe_color = COLOR_BEASTY_BROWN
stripe_color = COLOR_CARGO_BROWN
window_color = GLASS_COLOR

/obj/machinery/door/airlock/glass/atmos
Expand All @@ -374,7 +376,7 @@
open_sound_powered = 'sound/machines/door/eng1o.ogg'
close_sound_powered = 'sound/machines/door/eng1c.ogg'
door_color = COLOR_AMBER
stripe_color = COLOR_CYAN
stripe_color = COLOR_ATMOSPHERICS_CYAN
window_color = GLASS_COLOR


Expand Down Expand Up @@ -522,7 +524,7 @@

/obj/machinery/door/airlock/multi_tile/medical
door_color = COLOR_WHITE
stripe_color = COLOR_DEEP_SKY_BLUE
stripe_color = COLOR_BABY_BLUE

/obj/machinery/door/airlock/glass/civilian
glass = TRUE
Expand Down Expand Up @@ -553,11 +555,11 @@

/obj/machinery/door/airlock/multi_tile/glass/medical
door_color = COLOR_WHITE
stripe_color = COLOR_DEEP_SKY_BLUE
stripe_color = COLOR_BABY_BLUE

/obj/machinery/door/airlock/glass/medical
door_color = COLOR_WHITE
stripe_color = COLOR_DEEP_SKY_BLUE
stripe_color = COLOR_BABY_BLUE

/obj/machinery/door/airlock/glass/exploration
door_color = COLOR_GRAY20
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@
)

/singleton/closet_appearance/secure_closet/security
color = COLOR_MAROON
color = COLOR_SECURITY_RED
decals = list(
"lower_holes"
)
Expand Down
24 changes: 12 additions & 12 deletions code/game/turfs/simulated/wall_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,8 @@
color = COLOR_COMMAND_BLUE

/turf/simulated/wall/r_wall/prepainted/security
stripe_color = COLOR_MAROON
color = COLOR_MAROON
stripe_color = COLOR_SECURITY_RED
color = COLOR_SECURITY_RED

/turf/simulated/wall/r_wall/prepainted/medical
paint_color = COLOR_GRAY80
Expand All @@ -458,8 +458,8 @@
color = COLOR_SUN

/turf/simulated/wall/r_wall/prepainted/engineering/atmos
stripe_color = COLOR_CYAN_DARK
color = COLOR_CYAN_DARK
stripe_color = COLOR_ATMOSPHERICS_CYAN
color = COLOR_ATMOSPHERICS_CYAN

/turf/simulated/wall/r_wall/prepainted/civilian
stripe_color = COLOR_PALE_BTL_GREEN
Expand All @@ -475,8 +475,8 @@
color = COLOR_PURPLE_GRAY

/turf/simulated/wall/r_wall/prepainted/cargo
stripe_color = COLOR_BEASTY_BROWN
color = COLOR_BEASTY_BROWN
stripe_color = COLOR_CARGO_BROWN
color = COLOR_CARGO_BROWN

/turf/simulated/wall/prepainted
paint_color = COLOR_WALL_GUNMETAL
Expand All @@ -493,8 +493,8 @@
color = COLOR_GOLD

/turf/simulated/wall/prepainted/security
stripe_color = COLOR_MAROON
color = COLOR_MAROON
stripe_color = COLOR_SECURITY_RED
color = COLOR_SECURITY_RED

/turf/simulated/wall/prepainted/medical
paint_color = COLOR_GRAY80
Expand All @@ -506,8 +506,8 @@
color = COLOR_SUN

/turf/simulated/wall/prepainted/engineering/atmos
stripe_color = COLOR_CYAN_DARK
color = COLOR_CYAN_DARK
stripe_color = COLOR_ATMOSPHERICS_CYAN
color = COLOR_ATMOSPHERICS_CYAN

/turf/simulated/wall/prepainted/civilian
stripe_color = COLOR_PALE_BTL_GREEN
Expand All @@ -523,5 +523,5 @@
color = COLOR_PURPLE_GRAY

/turf/simulated/wall/prepainted/cargo
stripe_color = COLOR_BEASTY_BROWN
color = COLOR_BEASTY_BROWN
stripe_color = COLOR_CARGO_BROWN
color = COLOR_CARGO_BROWN
14 changes: 8 additions & 6 deletions code/modules/mapping/paint.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@

//paint defines

CREATE_PAINT(beastybrown, COLOR_BEASTY_BROWN)
CREATE_PAINT(pipecyan, COLOR_CYAN_DARK)
CREATE_PAINT(beastybrown, COLOR_CARGO_BROWN)
CREATE_PAINT(pipecyan, COLOR_ATMOSPHERICS_CYAN)
CREATE_PAINT(sun, COLOR_SUN)
CREATE_PAINT(red, COLOR_RED)
CREATE_PAINT(silver, COLOR_SILVER)
Expand All @@ -60,7 +60,8 @@ CREATE_PAINT(green, COLOR_GREEN)
CREATE_PAINT(navy, COLOR_NAVY)
CREATE_PAINT(eggshell, COLOR_EGGSHELL)
CREATE_PAINT(beige, COLOR_BEIGE)
CREATE_PAINT(darkred, COLOR_MAROON)
CREATE_PAINT(darkred, COLOR_SECURITY_RED)
CREATE_PAINT(maroon, COLOR_MAROON)
CREATE_PAINT(cyanblue, COLOR_CYAN_BLUE)
CREATE_PAINT(copper, COLOR_COPPER)
CREATE_PAINT(amber, COLOR_AMBER)
Expand All @@ -77,7 +78,7 @@ CREATE_PAINT(purple, COLOR_PURPLE)
CREATE_PAINT(purplegray, COLOR_PURPLE_GRAY)
CREATE_PAINT(babyblue, COLOR_BABY_BLUE)

CREATE_PAINT_STRIPE(beastybrown, COLOR_BEASTY_BROWN)
CREATE_PAINT_STRIPE(beastybrown, COLOR_CARGO_BROWN)
CREATE_PAINT_STRIPE(sun, COLOR_SUN)
CREATE_PAINT_STRIPE(red, COLOR_RED)
CREATE_PAINT_STRIPE(silver, COLOR_SILVER)
Expand All @@ -86,7 +87,8 @@ CREATE_PAINT_STRIPE(green, COLOR_GREEN)
CREATE_PAINT_STRIPE(navy, COLOR_NAVY)
CREATE_PAINT_STRIPE(eggshell, COLOR_EGGSHELL)
CREATE_PAINT_STRIPE(beige, COLOR_BEIGE)
CREATE_PAINT_STRIPE(darkred, COLOR_MAROON)
CREATE_PAINT_STRIPE(darkred, COLOR_SECURITY_RED)
CREATE_PAINT_STRIPE(maroon, COLOR_MAROON)
CREATE_PAINT_STRIPE(cyanblue, COLOR_CYAN_BLUE)
CREATE_PAINT_STRIPE(copper, COLOR_COPPER)
CREATE_PAINT_STRIPE(amber, COLOR_AMBER)
Expand All @@ -102,4 +104,4 @@ CREATE_PAINT_STRIPE(commandblue, COLOR_COMMAND_BLUE)
CREATE_PAINT_STRIPE(purple, COLOR_PURPLE)
CREATE_PAINT_STRIPE(purplegray, COLOR_PURPLE_GRAY)
CREATE_PAINT_STRIPE(babyblue, COLOR_BABY_BLUE)
CREATE_PAINT_STRIPE(pipecyan, COLOR_CYAN_DARK)
CREATE_PAINT_STRIPE(pipecyan, COLOR_ATMOSPHERICS_CYAN)
Binary file modified icons/obj/doors/double/fill_stripe.dmi
Binary file not shown.
Binary file modified icons/obj/doors/double/stripe.dmi
Binary file not shown.
Binary file modified icons/obj/doors/station/fill_stripe.dmi
Binary file not shown.
Binary file modified icons/obj/doors/station/stripe.dmi
Binary file not shown.
Binary file modified icons/turf/walls/neighbor_stripe.dmi
Binary file not shown.
Binary file modified icons/turf/walls/wall_stripe.dmi
Binary file not shown.

0 comments on commit d492cbe

Please sign in to comment.