diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index d8f2658006..10d4182b28 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -1,12 +1,12 @@ -// This is eventualy for wjohn to add more color standardization stuff like I keep asking him >:( +// This is eventually for wjohn to add more color standardization stuff like I keep asking him >:( #define COLOR_INPUT_DISABLED "#F0F0F0" #define COLOR_INPUT_ENABLED "#D3B5B5" -#define COLOR_WHITE "#FFFFFF" +#define COLOR_WHITE "#EEEEEE" #define COLOR_SILVER "#C0C0C0" #define COLOR_GRAY "#808080" -#define COLOR_FLOORTILE_GRAY "#8D8C8C" +#define COLOR_FLOORTILE_GRAY "#8D8B8B" #define COLOR_ALMOST_BLACK "#333333" #define COLOR_BLACK "#000000" #define COLOR_RED "#FF0000" @@ -14,25 +14,26 @@ #define COLOR_MAROON "#800000" #define COLOR_YELLOW "#FFFF00" #define COLOR_OLIVE "#808000" -#define COLOR_LIME "#00FF00" +#define COLOR_LIME "#32CD32" #define COLOR_GREEN "#008000" #define COLOR_CYAN "#00FFFF" #define COLOR_TEAL "#008080" #define COLOR_BLUE "#0000FF" #define COLOR_BLUE_LIGHT "#33CCFF" #define COLOR_NAVY "#000080" -#define COLOR_PINK "#FF00FF" +#define COLOR_PINK "#FFC0CB" +#define COLOR_MAGENTA "#FF00FF" #define COLOR_PURPLE "#800080" #define COLOR_ORANGE "#FF9900" #define COLOR_BEIGE "#CEB689" -#define COLOR_BLUE_GRAY "#6A97B0" -#define COLOR_BROWN "#B19664" -#define COLOR_DARK_BROWN "#917448" -#define COLOR_DARK_ORANGE "#B95A00" -#define COLOR_GREEN_GRAY "#8DAF6A" -#define COLOR_RED_GRAY "#AA5F61" -#define COLOR_PALE_BLUE_GRAY "#8BBBD5" -#define COLOR_PALE_GREEN_GRAY "#AED18B" -#define COLOR_PALE_RED_GRAY "#CC9090" -#define COLOR_PALE_PURPLE_GRAY "#BDA2BA" -#define COLOR_PURPLE_GRAY "#A2819E" +#define COLOR_BLUE_GRAY "#75A2BB" +#define COLOR_BROWN "#BA9F6D" +#define COLOR_DARK_BROWN "#997C4F" +#define COLOR_DARK_ORANGE "#C3630C" +#define COLOR_GREEN_GRAY "#99BB76" +#define COLOR_RED_GRAY "#B4696A" +#define COLOR_PALE_BLUE_GRAY "#98C5DF" +#define COLOR_PALE_GREEN_GRAY "#B7D993" +#define COLOR_PALE_RED_GRAY "#D59998" +#define COLOR_PALE_PURPLE_GRAY "#CBB1CA" +#define COLOR_PURPLE_GRAY "#AE8CA8" diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 411abf5701..d9449aeb93 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -13,6 +13,7 @@ //#define TURF_LAYER 2 //For easy recordkeeping; this is a byond define #define MID_TURF_LAYER 2.02 #define HIGH_TURF_LAYER 2.03 +#define TURF_PLATING_DECAL_LAYER 2.031 #define TURF_DECAL_LAYER 2.039 //Makes turf decals appear in DM how they will look inworld. #define ABOVE_OPEN_TURF_LAYER 2.04 #define CLOSED_TURF_LAYER 2.05 diff --git a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm index 49af7a7ed7..554f0fa32b 100644 --- a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm +++ b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm @@ -1,6 +1,8 @@ /obj/effect/turf_decal/tile name = "tile decal" icon_state = "corner_white_full" + layer = TURF_PLATING_DECAL_LAYER + /obj/effect/turf_decal/tile/black name = "black tile decal" @@ -15,6 +17,7 @@ /obj/effect/turf_decal/tile/black/corner icon_state = "corner_white" + /obj/effect/turf_decal/tile/blue name = "blue tile decal" color = COLOR_BLUE_GRAY @@ -28,6 +31,7 @@ /obj/effect/turf_decal/tile/blue/corner icon_state = "corner_white" + /obj/effect/turf_decal/tile/paleblue name = "pale blue tile decal" color = COLOR_PALE_BLUE_GRAY @@ -41,6 +45,7 @@ /obj/effect/turf_decal/tile/paleblue/corner icon_state = "corner_white" + /obj/effect/turf_decal/tile/green name = "green tile decal" color = COLOR_GREEN_GRAY @@ -54,6 +59,7 @@ /obj/effect/turf_decal/tile/green/corner icon_state = "corner_white" + /obj/effect/turf_decal/tile/lime name = "lime tile decal" color = COLOR_PALE_GREEN_GRAY @@ -67,6 +73,7 @@ /obj/effect/turf_decal/tile/lime/corner icon_state = "corner_white" + /obj/effect/turf_decal/tile/yellow name = "yellow tile decal" color = COLOR_BROWN @@ -80,6 +87,7 @@ /obj/effect/turf_decal/tile/yellow/corner icon_state = "corner_white" + /obj/effect/turf_decal/tile/beige name = "beige tile decal" color = COLOR_BEIGE @@ -93,6 +101,7 @@ /obj/effect/turf_decal/tile/beige/corner icon_state = "corner_white" + /obj/effect/turf_decal/tile/red name = "red tile decal" color = COLOR_RED_GRAY @@ -106,6 +115,7 @@ /obj/effect/turf_decal/tile/red/corner icon_state = "corner_white" + /obj/effect/turf_decal/tile/pink name = "pink tile decal" color = COLOR_PALE_RED_GRAY @@ -119,6 +129,7 @@ /obj/effect/turf_decal/tile/pink/corner icon_state = "corner_white" + /obj/effect/turf_decal/tile/purple name = "purple tile decal" color = COLOR_PURPLE_GRAY @@ -132,6 +143,7 @@ /obj/effect/turf_decal/tile/purple/corner icon_state = "corner_white" + /obj/effect/turf_decal/tile/mauve name = "mauve tile decal" color = COLOR_PALE_PURPLE_GRAY @@ -145,6 +157,7 @@ /obj/effect/turf_decal/tile/mauve/corner icon_state = "corner_white" + /obj/effect/turf_decal/tile/orange name = "orange tile decal" color = COLOR_DARK_ORANGE @@ -158,6 +171,7 @@ /obj/effect/turf_decal/tile/orange/corner icon_state = "corner_white" + /obj/effect/turf_decal/tile/brown name = "brown tile decal" color = COLOR_DARK_BROWN @@ -173,7 +187,6 @@ /obj/effect/turf_decal/tile/white name = "white tile decal" - icon_state = "corner_white" /obj/effect/turf_decal/tile/white/diagonal icon_state = "corner_white_diagonal" @@ -184,6 +197,7 @@ /obj/effect/turf_decal/tile/white/corner icon_state = "corner_white" + /obj/effect/turf_decal/tile/gray name = "gray tile decal" color = COLOR_FLOORTILE_GRAY