Baywalls Color-Correction Pass

code/__DEFINES/color/color.dm

@@ -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"
@@ -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"
@@ -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"
@@ -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			"#6b9bb3"
+#define COLOR_CARGO_BROWN				"#664c33"
 
 #define WOOD_COLOR_GENERIC     "#d5a66e"
 #define WOOD_COLOR_RICH        "#792f27"

code/game/machinery/doors/airlock_subtypes.dm

@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
@@ -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"
@@ -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
@@ -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
 
 
@@ -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
@@ -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

code/game/objects/structures/crates_lockers/_closet_appearance_definitions.dm

@@ -432,7 +432,7 @@
 	)
 
 /singleton/closet_appearance/secure_closet/security
-	color = COLOR_MAROON
+	color = COLOR_SECURITY_RED
 	decals = list(
 		"lower_holes"
 	)

code/game/turfs/simulated/wall_types.dm

@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

code/modules/mapping/paint.dm

@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)