New colors

- Removed Salmon, Robo-Hood, Caribbean, and Azure.
- Added Skunk, Robin, Blueberry, and Blossom.
- Updated Lime, Algae, Violet and Magenta.
- Renamed old Blueberry to Midnight.

src/dehacked.c

@@ -8283,6 +8283,7 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart.
 	"GREY",			// SKINCOLOR_GREY
 	"NICKEL",		// SKINCOLOR_NICKEL
 	"BLACK",		// SKINCOLOR_BLACK
+	"SKUNK",		// SKINCOLOR_SKUNK
 	"FAIRY",		// SKINCOLOR_FAIRY
 	"POPCORN",		// SKINCOLOR_POPCORN
 	"ARTICHOKE",	// SKINCOLOR_ARTICHOKE
@@ -8293,7 +8294,6 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart.
 	"PEACH",		// SKINCOLOR_PEACH
 	"BROWN",		// SKINCOLOR_BROWN
 	"LEATHER",		// SKINCOLOR_LEATHER
-	"SALMON",		// SKINCOLOR_SALMON
 	"PINK",			// SKINCOLOR_PINK
 	"ROSE",			// SKINCOLOR_ROSE
 	"CINNAMON",		// SKINCOLOR_CINNAMON
@@ -8331,7 +8331,6 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart.
 	"PISTACHIO",	// SKINCOLOR_PISTACHIO
 	"MOSS",			// SKINCOLOR_MOSS
 	"CAMOUFLAGE",	// SKINCOLOR_CAMOUFLAGE
-	"ROBOHOOD",		// SKINCOLOR_ROBOHOOD
 	"MINT",			// SKINCOLOR_MINT
 	"GREEN",		// SKINCOLOR_GREEN
 	"PINETREE",		// SKINCOLOR_PINETREE
@@ -8341,11 +8340,10 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart.
 	"PLAGUE",		// SKINCOLOR_PLAGUE
 	"EMERALD",		// SKINCOLOR_EMERALD
 	"ALGAE",		// SKINCOLOR_ALGAE
-	"CARIBBEAN",	// SKINCOLOR_CARIBBEAN
-	"AZURE",		// SKINCOLOR_AZURE
 	"AQUAMARINE",	// SKINCOLOR_AQUAMARINE
 	"TURQUOISE",	// SKINCOLOR_TURQUOISE
 	"TEAL",			// SKINCOLOR_TEAL
+	"ROBIN",		// SKINCOLOR_ROBIN
 	"CYAN",			// SKINCOLOR_CYAN
 	"JAWZ",			// SKINCOLOR_JAWZ
 	"CERULEAN",		// SKINCOLOR_CERULEAN
@@ -8362,6 +8360,7 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart.
 	"ULTRAMARINE",	// SKINCOLOR_ULTRAMARINE
 	"PERIWINKLE",	// SKINCOLOR_PERIWINKLE
 	"BLUE",			// SKINCOLOR_BLUE
+	"MIDNIGHT",		// SKINCOLOR_MIDNIGHT
 	"BLUEBERRY",	// SKINCOLOR_BLUEBERRY
 	"THISTLE",		// SKINCOLOR_THISTLE
 	"PURPLE",		// SKINCOLOR_PURPLE
@@ -8377,6 +8376,7 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart.
 	"BYZANTIUM",	// SKINCOLOR_BYZANTIUM
 	"POMEGRANATE",	// SKINCOLOR_POMEGRANATE
 	"LILAC",		// SKINCOLOR_LILAC
+	"BLOSSOM",		// SKINCOLOR_BLOSSOM
 	"TAFFY",		// SKINCOLOR_TAFFY
 
 	// Special super colors

src/doomdef.h

@@ -259,6 +259,7 @@ typedef enum
 	SKINCOLOR_GREY,
 	SKINCOLOR_NICKEL,
 	SKINCOLOR_BLACK,
+	SKINCOLOR_SKUNK,
 	SKINCOLOR_FAIRY,
 	SKINCOLOR_POPCORN,
 	SKINCOLOR_ARTICHOKE,
@@ -269,7 +270,6 @@ typedef enum
 	SKINCOLOR_PEACH,
 	SKINCOLOR_BROWN,
 	SKINCOLOR_LEATHER,
-	SKINCOLOR_SALMON,
 	SKINCOLOR_PINK,
 	SKINCOLOR_ROSE,
 	SKINCOLOR_CINNAMON,
@@ -307,7 +307,6 @@ typedef enum
 	SKINCOLOR_PISTACHIO,
 	SKINCOLOR_MOSS,
 	SKINCOLOR_CAMOUFLAGE,
-	SKINCOLOR_ROBOHOOD,
 	SKINCOLOR_MINT,
 	SKINCOLOR_GREEN,
 	SKINCOLOR_PINETREE,
@@ -317,11 +316,10 @@ typedef enum
 	SKINCOLOR_PLAGUE,
 	SKINCOLOR_EMERALD,
 	SKINCOLOR_ALGAE,
-	SKINCOLOR_CARIBBEAN,
-	SKINCOLOR_AZURE,
 	SKINCOLOR_AQUAMARINE,
 	SKINCOLOR_TURQUOISE,
 	SKINCOLOR_TEAL,
+	SKINCOLOR_ROBIN,
 	SKINCOLOR_CYAN,
 	SKINCOLOR_JAWZ, // Oni's torment
 	SKINCOLOR_CERULEAN,
@@ -338,6 +336,7 @@ typedef enum
 	SKINCOLOR_ULTRAMARINE,
 	SKINCOLOR_PERIWINKLE,
 	SKINCOLOR_BLUE,
+	SKINCOLOR_MIDNIGHT,
 	SKINCOLOR_BLUEBERRY,
 	SKINCOLOR_THISTLE,
 	SKINCOLOR_PURPLE,
@@ -353,6 +352,7 @@ typedef enum
 	SKINCOLOR_BYZANTIUM,
 	SKINCOLOR_POMEGRANATE,
 	SKINCOLOR_LILAC,
+	SKINCOLOR_BLOSSOM,
 	SKINCOLOR_TAFFY,
 
 	// "Careful! MAXSKINCOLORS cannot be greater than 0x40 -- Which it is now."

src/hu_stuff.c

@@ -796,6 +796,7 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
 				case SKINCOLOR_GREY:
 				case SKINCOLOR_NICKEL:
 				case SKINCOLOR_BLACK:
+				case SKINCOLOR_SKUNK:
 				case SKINCOLOR_PLATINUM:
 				case SKINCOLOR_JET:
 					cstart = "\x86"; // V_GRAYMAP
@@ -811,11 +812,11 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
 					cstart = "\x8e"; // V_BROWNMAP
 					break;
 				case SKINCOLOR_FAIRY:
-				case SKINCOLOR_SALMON:
 				case SKINCOLOR_PINK:
 				case SKINCOLOR_ROSE:
 				case SKINCOLOR_LEMONADE:
 				case SKINCOLOR_LILAC:
+				case SKINCOLOR_BLOSSOM:
 				case SKINCOLOR_TAFFY:
 					cstart = "\x8d"; // V_PINKMAP
 					break;
@@ -866,7 +867,6 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
 				case SKINCOLOR_PISTACHIO:
 				case SKINCOLOR_MOSS:
 				case SKINCOLOR_CAMOUFLAGE:
-				case SKINCOLOR_ROBOHOOD:
 				case SKINCOLOR_MINT:
 				case SKINCOLOR_GREEN:
 				case SKINCOLOR_PINETREE:
@@ -878,14 +878,13 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
 				case SKINCOLOR_ALGAE:
 					cstart = "\x83"; // V_GREENMAP
 					break;
-				case SKINCOLOR_CARIBBEAN:
-				case SKINCOLOR_AZURE:
 				case SKINCOLOR_AQUAMARINE:
 				case SKINCOLOR_TURQUOISE:
 				case SKINCOLOR_TEAL:
 					cstart = "\x8b"; // V_AQUAMAP
 					break;
 				case SKINCOLOR_PIGEON:
+				case SKINCOLOR_ROBIN:
 				case SKINCOLOR_CYAN:
 				case SKINCOLOR_JAWZ:
 				case SKINCOLOR_CERULEAN:
@@ -897,6 +896,7 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
 				case SKINCOLOR_ULTRAMARINE:
 				case SKINCOLOR_PERIWINKLE:
 				case SKINCOLOR_BLUE:
+				case SKINCOLOR_MIDNIGHT:
 				case SKINCOLOR_BLUEBERRY:
 				case SKINCOLOR_NOVA:
 					cstart = "\x84"; // V_BLUEMAP
@@ -2504,7 +2504,7 @@ Ping_gfx_num (int ping)
 void HU_drawPing(INT32 x, INT32 y, UINT32 ping, INT32 flags)
 {
 	INT32 gfxnum;	// gfx to draw
-	UINT8 const *colormap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_SALMON, GTC_CACHE);
+	UINT8 const *colormap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_RASPBERRY, GTC_CACHE);
 
 	gfxnum = Ping_gfx_num(ping);
 

src/info.c

@@ -6157,7 +6157,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		8,              // reactiontime
 		sfx_None,       // attacksound
 		S_NULL,         // painstate
-		SKINCOLOR_SALMON, // painchance
+		SKINCOLOR_RASPBERRY, // painchance
 		sfx_s3kb1,      // painsound
 		S_NULL,         // meleestate
 		S_NULL,         // missilestate
@@ -6265,7 +6265,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		8,              // reactiontime
 		sfx_None,       // attacksound
 		S_NULL,         // painstate
-		SKINCOLOR_SALMON, // painchance
+		SKINCOLOR_RASPBERRY, // painchance
 		sfx_s3kb1,      // painsound
 		S_NULL,         // meleestate
 		S_NULL,         // missilestate
@@ -6373,7 +6373,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		8,              // reactiontime
 		sfx_None,       // attacksound
 		S_NULL,         // painstate
-		SKINCOLOR_SALMON, // painchance
+		SKINCOLOR_RASPBERRY, // painchance
 		sfx_s3kb1,      // painsound
 		S_NULL,         // meleestate
 		S_NULL,         // missilestate

src/k_color.c

@@ -27,6 +27,7 @@ const char *KartColor_Names[MAXSKINCOLORS] =
 	"Grey",           // SKINCOLOR_GREY
 	"Nickel",         // SKINCOLOR_NICKEL
 	"Black",          // SKINCOLOR_BLACK
+	"Skunk",          // SKINCOLOR_SKUNK
 	"Fairy",          // SKINCOLOR_FAIRY
 	"Popcorn",        // SKINCOLOR_POPCORN
 	"Artichoke",      // SKINCOLOR_ARTICHOKE
@@ -37,7 +38,6 @@ const char *KartColor_Names[MAXSKINCOLORS] =
 	"Peach",          // SKINCOLOR_PEACH
 	"Brown",          // SKINCOLOR_BROWN
 	"Leather",        // SKINCOLOR_LEATHER
-	"Salmon",         // SKINCOLOR_SALMON
 	"Pink",           // SKINCOLOR_PINK
 	"Rose",           // SKINCOLOR_ROSE
 	"Cinnamon",       // SKINCOLOR_CINNAMON
@@ -75,7 +75,6 @@ const char *KartColor_Names[MAXSKINCOLORS] =
 	"Pistachio",      // SKINCOLOR_PISTACHIO
 	"Moss",           // SKINCOLOR_MOSS
 	"Camouflage",     // SKINCOLOR_CAMOUFLAGE
-	"Robo-Hood",      // SKINCOLOR_ROBOHOOD
 	"Mint",           // SKINCOLOR_MINT
 	"Green",          // SKINCOLOR_GREEN
 	"Pinetree",       // SKINCOLOR_PINETREE
@@ -85,11 +84,10 @@ const char *KartColor_Names[MAXSKINCOLORS] =
 	"Plague",         // SKINCOLOR_PLAGUE
 	"Emerald",        // SKINCOLOR_EMERALD
 	"Algae",          // SKINCOLOR_ALGAE
-	"Caribbean",      // SKINCOLOR_CARIBBEAN
-	"Azure",          // SKINCOLOR_AZURE
 	"Aquamarine",     // SKINCOLOR_AQUAMARINE
 	"Turquoise",      // SKINCOLOR_TURQUOISE
 	"Teal",           // SKINCOLOR_TEAL
+	"Robin",          // SKINCOLOR_ROBIN
 	"Cyan",           // SKINCOLOR_CYAN
 	"Jawz",           // SKINCOLOR_JAWZ
 	"Cerulean",       // SKINCOLOR_CERULEAN
@@ -106,6 +104,7 @@ const char *KartColor_Names[MAXSKINCOLORS] =
 	"Ultramarine",    // SKINCOLOR_ULTRAMARINE
 	"Periwinkle",     // SKINCOLOR_PERIWINKLE
 	"Blue",           // SKINCOLOR_BLUE
+	"Midnight",       // SKINCOLOR_MIDNIGHT
 	"Blueberry",      // SKINCOLOR_BLUEBERRY
 	"Thistle",        // SKINCOLOR_THISTLE
 	"Purple",         // SKINCOLOR_PURPLE
@@ -121,6 +120,7 @@ const char *KartColor_Names[MAXSKINCOLORS] =
 	"Byzantium",      // SKINCOLOR_BYZANTIUM
 	"Pomegranate",    // SKINCOLOR_POMEGRANATE
 	"Lilac",          // SKINCOLOR_LILAC
+	"Blossom",        // SKINCOLOR_BLOSSOM
 	"Taffy"           // SKINCOLOR_TAFFY
 };
 
@@ -133,6 +133,7 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] =
 	SKINCOLOR_GREY,8,         // SKINCOLOR_GREY
 	SKINCOLOR_SILVER,8,       // SKINCOLOR_NICKEL
 	SKINCOLOR_WHITE,8,        // SKINCOLOR_BLACK
+	SKINCOLOR_VOMIT,8,        // SKINCOLOR_SKUNK
 	SKINCOLOR_ARTICHOKE,12,   // SKINCOLOR_FAIRY
 	SKINCOLOR_PIGEON,12,      // SKINCOLOR_POPCORN
 	SKINCOLOR_FAIRY,12,       // SKINCOLOR_ARTICHOKE
@@ -143,7 +144,6 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] =
 	SKINCOLOR_CYAN,8,         // SKINCOLOR_PEACH
 	SKINCOLOR_BEIGE,8,        // SKINCOLOR_BROWN
 	SKINCOLOR_SEPIA,8,        // SKINCOLOR_LEATHER
-	SKINCOLOR_TEA,8,          // SKINCOLOR_SALMON
 	SKINCOLOR_PISTACHIO,8,    // SKINCOLOR_PINK
 	SKINCOLOR_MOSS,8,         // SKINCOLOR_ROSE
 	SKINCOLOR_WRISTWATCH,6,   // SKINCOLOR_CINNAMON
@@ -173,15 +173,14 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] =
 	SKINCOLOR_TEAL,8,         // SKINCOLOR_OLIVE
 	SKINCOLOR_VIOLET,8,       // SKINCOLOR_CROCODILE
 	SKINCOLOR_NAVY,6,         // SKINCOLOR_PERIDOT
-	SKINCOLOR_ROBOHOOD,8,     // SKINCOLOR_VOMIT
+	SKINCOLOR_SKUNK,8,        // SKINCOLOR_VOMIT
 	SKINCOLOR_LAVENDER,6,     // SKINCOLOR_GARDEN
 	SKINCOLOR_TANGERINE,8,    // SKINCOLOR_LIME
 	SKINCOLOR_ULTRAMARINE,8,  // SKINCOLOR_HANDHELD
-	SKINCOLOR_SALMON,8,       // SKINCOLOR_TEA
+	SKINCOLOR_BLOSSOM,8,      // SKINCOLOR_TEA
 	SKINCOLOR_PINK,6,         // SKINCOLOR_PISTACHIO
 	SKINCOLOR_ROSE,8,         // SKINCOLOR_MOSS
 	SKINCOLOR_CAMOUFLAGE,8,   // SKINCOLOR_CAMOUFLAGE
-	SKINCOLOR_VOMIT,8,        // SKINCOLOR_ROBOHOOD
 	SKINCOLOR_RASPBERRY,8,    // SKINCOLOR_MINT
 	SKINCOLOR_RED,8,          // SKINCOLOR_GREEN
 	SKINCOLOR_CRIMSON,8,      // SKINCOLOR_PINETREE
@@ -191,11 +190,10 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] =
 	SKINCOLOR_NOVA,8,         // SKINCOLOR_PLAGUE
 	SKINCOLOR_BANANA,8,       // SKINCOLOR_EMERALD
 	SKINCOLOR_SCARLET,10,     // SKINCOLOR_ALGAE
-	SKINCOLOR_PURPLE,8,       // SKINCOLOR_CARIBBEAN
-	SKINCOLOR_THISTLE,8,      // SKINCOLOR_AZURE
 	SKINCOLOR_YELLOW,8,       // SKINCOLOR_AQUAMARINE
 	SKINCOLOR_MAUVE,10,       // SKINCOLOR_TURQUOISE
 	SKINCOLOR_OLIVE,8,        // SKINCOLOR_TEAL
+	SKINCOLOR_THISTLE,8,      // SKINCOLOR_ROBIN
 	SKINCOLOR_PEACH,8,        // SKINCOLOR_CYAN
 	SKINCOLOR_LILAC,10,       // SKINCOLOR_JAWZ
 	SKINCOLOR_CARAMEL,8,      // SKINCOLOR_CERULEAN
@@ -212,9 +210,10 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] =
 	SKINCOLOR_HANDHELD,10,    // SKINCOLOR_ULTRAMARINE
 	SKINCOLOR_CREAMSICLE,8,   // SKINCOLOR_PERIWINKLE
 	SKINCOLOR_ORANGE,8,       // SKINCOLOR_BLUE
-	SKINCOLOR_ROSEWOOD,8,     // SKINCOLOR_BLUEBERRY
+	SKINCOLOR_ROSEWOOD,8,     // SKINCOLOR_MIDNIGHT
-	SKINCOLOR_AZURE,8,        // SKINCOLOR_THISTLE
+	SKINCOLOR_PURPLE,8,       // SKINCOLOR_BLUEBERRY
-	SKINCOLOR_CARIBBEAN,10,   // SKINCOLOR_PURPLE
+	SKINCOLOR_ROBIN,8,        // SKINCOLOR_THISTLE
+	SKINCOLOR_MIDNIGHT,10,    // SKINCOLOR_PURPLE
 	SKINCOLOR_FUCHSIA,11,     // SKINCOLOR_PASTEL
 	SKINCOLOR_SUNSLAM,10,     // SKINCOLOR_MOONSET
 	SKINCOLOR_DAWN,6,         // SKINCOLOR_DUSK
@@ -227,6 +226,7 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] =
 	SKINCOLOR_SWAMP,8,        // SKINCOLOR_BYZANTIUM
 	SKINCOLOR_DREAM,8,        // SKINCOLOR_POMEGRANATE
 	SKINCOLOR_JAWZ,6,         // SKINCOLOR_LILAC
+	SKINCOLOR_TEA,8,          // SKINCOLOR_BLOSSOM
 	SKINCOLOR_JET,8           // SKINCOLOR_TAFFY
 };
 
@@ -237,6 +237,7 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = {
 	{  1,   3,   5,   7,   9,  11,  13,  15,  17,  19,  21,  23,  25,  27,  29,  31}, // SKINCOLOR_GREY
 	{  3,   5,   8,  11,  15,  17,  19,  21,  23,  24,  25,  26,  27,  29,  30,  31}, // SKINCOLOR_NICKEL
 	{  4,   7,  11,  15,  20,  22,  24,  27,  28,  28,  28,  29,  29,  30,  30,  31}, // SKINCOLOR_BLACK
+	{  0,   1,   2,   3,   4,  10,  16,  21,  23,  24,  25,  26,  27,  28,  29,  31}, // SKINCOLOR_SKUNK
 	{  0,   0, 252, 252, 200, 201, 211,  14,  16,  18,  20,  22,  24,  26,  28,  31}, // SKINCOLOR_FAIRY
 	{  0,  80,  80,  81,  82, 218, 240,  11,  13,  16,  18,  21,  23,  26,  28,  31}, // SKINCOLOR_POPCORN
 	{ 80,  88,  89,  98,  99,  91,  12,  14,  16,  18,  20,  22,  24,  26,  28,  31}, // SKINCOLOR_ARTICHOKE
@@ -247,7 +248,6 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = {
 	{  0, 208,  48, 216, 218, 221, 212, 213, 214, 215, 206, 207, 197, 198, 199, 254}, // SKINCOLOR_PEACH
 	{216, 217, 219, 221, 224, 225, 227, 229, 230, 232, 234, 235, 237, 239,  29,  30}, // SKINCOLOR_BROWN
 	{218, 221, 224, 227, 229, 231, 233, 235, 237, 239,  28,  28,  29,  29,  30,  31}, // SKINCOLOR_LEATHER
-	{  0,   0,   0, 208, 208, 209, 210,  32,  34,  35,  36,  38,  40,  42,  44,  46}, // SKINCOLOR_SALMON
 	{  0, 208, 208, 209, 209, 210, 211, 211, 212, 213, 214, 215,  41,  43,  45,  46}, // SKINCOLOR_PINK
 	{209, 210, 211, 211, 212, 213, 214, 215,  41,  42,  43,  44,  45,  71,  46,  47}, // SKINCOLOR_ROSE
 	{216, 221, 224, 226, 228,  60,  61,  43,  44,  45,  71,  46,  47,  29,  30,  31}, // SKINCOLOR_CINNAMON
@@ -279,13 +279,12 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = {
 	{  0,  80,  81,  88, 188, 189, 190, 191,  94,  94,  95,  95, 109, 110, 111,  31}, // SKINCOLOR_PERIDOT
 	{  0, 208, 216, 209, 218,  51,  65,  76, 191, 191, 126, 143, 138, 175, 169, 254}, // SKINCOLOR_VOMIT
 	{ 81,  82,  83,  73,  64,  65,  66,  92,  92,  93,  93,  94,  95, 109, 110, 111}, // SKINCOLOR_GARDEN
-	{  0,  80,  81,  82,  83,  88,  89,  99, 100, 102, 104, 126, 143, 138, 139,  31}, // SKINCOLOR_LIME
+	{  0,  80,  81,  88, 188, 189, 114, 114, 115, 115, 116, 116, 117, 118, 119, 111}, // SKINCOLOR_LIME
 	{ 83,  72,  73,  74,  75,  76, 102, 104, 105, 106, 107, 108, 109, 110, 111,  31}, // SKINCOLOR_HANDHELD
 	{  0,  80,  80,  81,  88,  89,  90,  91,  92,  93,  94,  95, 109, 110, 111,  31}, // SKINCOLOR_TEA
 	{  0,  80,  88,  88,  89,  90,  91, 102, 103, 104, 105, 106, 107, 108, 109, 110}, // SKINCOLOR_PISTACHIO
 	{ 88,  89,  90,  91,  91,  92,  93,  94, 107, 107, 108, 108, 109, 109, 110, 111}, // SKINCOLOR_MOSS
 	{208,  84,  85, 240, 241, 243, 245,  94, 107, 108, 108, 109, 109, 110, 110, 111}, // SKINCOLOR_CAMOUFLAGE
-	{  0,  88,  98, 101, 103, 104, 105,  94,  94, 107,  95, 109, 110, 111,  30,  31}, // SKINCOLOR_ROBOHOOD
 	{  0,  88,  88,  89,  89, 100, 101, 102, 125, 126, 143, 143, 138, 175, 169, 254}, // SKINCOLOR_MINT
 	{ 96,  97,  98,  99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111}, // SKINCOLOR_GREEN
 	{ 97,  99, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,  30,  30,  31}, // SKINCOLOR_PINETREE
@@ -294,12 +293,11 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = {
 	{  0,   0, 208, 208,  48,  89,  98, 100, 148, 148, 172, 172, 173, 173, 174, 175}, // SKINCOLOR_DREAM
 	{ 80,  88,  96, 112, 113, 124, 142, 149, 149, 173, 174, 175, 169, 253, 254,  31}, // SKINCOLOR_PLAGUE
 	{  0, 120, 121, 112, 113, 114, 115, 125, 125, 126, 126, 127, 138, 175, 253, 254}, // SKINCOLOR_EMERALD
-	{128, 128, 129, 129, 130, 140, 124, 103, 104, 116, 116, 117, 118, 119, 111,  31}, // SKINCOLOR_ALGAE
+	{128, 129, 130, 131, 132, 133, 134, 115, 115, 116, 116, 117, 118, 119, 110, 111}, // SKINCOLOR_ALGAE
-	{  0,  88,  89,  97, 113, 141, 135, 136, 136, 173, 173, 174, 174, 175, 199,  31}, // SKINCOLOR_CARIBBEAN
-	{  0,  80,  81,  82,  89, 140, 134, 135, 136, 172, 196, 197, 198, 199,  30,  31}, // SKINCOLOR_AZURE
 	{  0, 128, 120, 121, 122, 123, 124, 125, 126, 126, 127, 127, 118, 118, 119, 111}, // SKINCOLOR_AQUAMARINE
 	{128, 120, 121, 122, 123, 141, 141, 142, 142, 143, 143, 138, 138, 139, 139,  31}, // SKINCOLOR_TURQUOISE
 	{  0, 120, 120, 121, 140, 141, 142, 143, 143, 138, 138, 139, 139, 254, 254,  31}, // SKINCOLOR_TEAL
+	{  0,  80,  81,  82,  83,  88, 121, 140, 133, 133, 134, 135, 136, 137, 138, 139}, // SKINCOLOR_ROBIN
 	{  0,   0, 128, 128, 255, 131, 132, 134, 142, 142, 143, 127, 118, 119, 110, 111}, // SKINCOLOR_CYAN
 	{  0,   0, 128, 128, 129, 146, 133, 134, 135, 149, 149, 173, 173, 174, 175,  31}, // SKINCOLOR_JAWZ
 	{  0, 128, 129, 130, 131, 132, 133, 135, 136, 136, 137, 137, 138, 138, 139,  31}, // SKINCOLOR_CERULEAN
@@ -316,14 +314,15 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = {
 	{  0,   0, 120, 120, 121, 133, 135, 149, 149, 166, 166, 167, 168, 169, 254,  31}, // SKINCOLOR_ULTRAMARINE
 	{  0,   0, 144, 144, 145, 146, 147, 149, 150, 152, 154, 155, 157, 159, 253, 254}, // SKINCOLOR_PERIWINKLE
 	{144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 155, 156, 158, 253, 254,  31}, // SKINCOLOR_BLUE
-	{146, 148, 149, 150, 152, 153, 155, 157, 159, 253, 253, 254, 254,  31,  31,  31}, // SKINCOLOR_BLUEBERRY
+	{146, 148, 149, 150, 152, 153, 155, 157, 159, 253, 253, 254, 254,  31,  31,  31}, // SKINCOLOR_MIDNIGHT
+	{  0, 144, 145, 146, 147, 171, 172, 166, 166, 167, 167, 168, 168, 175, 169, 253}, // SKINCOLOR_BLUEBERRY
 	{  0,   0,   0, 252, 252, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 254}, // SKINCOLOR_THISTLE
 	{  0, 252, 160, 161, 162, 163, 164, 165, 166, 167, 168, 168, 169, 169, 253, 254}, // SKINCOLOR_PURPLE
 	{  0, 128, 128, 129, 129, 146, 170, 162, 163, 164, 165, 166, 167, 168, 169, 254}, // SKINCOLOR_PASTEL
 	{  0, 144, 145, 146, 170, 162, 163, 184, 184, 207, 207,  44,  45,  46,  47,  31}, // SKINCOLOR_MOONSET
 	{252, 200, 201, 192, 193, 194, 172, 172, 173, 173, 174, 174, 175, 169, 253, 254}, // SKINCOLOR_DUSK
-	{176, 177, 178, 179, 180, 181, 182, 183, 184, 164, 165, 166, 167, 168, 169, 254}, // SKINCOLOR_VIOLET
+	{176, 177, 178, 179, 180, 181, 182, 183, 184, 165, 165, 166, 167, 168, 169, 254}, // SKINCOLOR_VIOLET
-	{176, 177, 178, 179, 180, 181, 182, 183, 184, 184, 185, 185, 186, 187,  30,  31}, // SKINCOLOR_MAGENTA
+	{252, 200, 177, 177, 178, 179, 180, 181, 182, 183, 183, 184, 185, 186, 187,  31}, // SKINCOLOR_MAGENTA
 	{208, 209, 209,  32,  33, 182, 183, 184, 185, 185, 186, 186, 187, 253, 254,  31}, // SKINCOLOR_FUCHSIA
 	{  0,   0,  88,  88,  89,   6,   8,  10, 193, 194, 195, 184, 185, 186, 187,  31}, // SKINCOLOR_TOXIC
 	{ 80,  81,  82,  83,  64,  50, 201, 192, 193, 194, 195, 173, 174, 175, 253, 254}, // SKINCOLOR_MAUVE
@@ -331,6 +330,7 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = {
 	{145, 192, 193, 194, 195, 196, 197, 198, 199, 199,  29,  29,  30,  30,  31,  31}, // SKINCOLOR_BYZANTIUM
 	{208, 209, 210, 211, 212, 213, 214, 195, 195, 196, 196, 197, 198, 199,  29,  30}, // SKINCOLOR_POMEGRANATE
 	{  0,   0,   0, 252, 252, 176, 200, 201, 179, 192, 193, 194, 195, 196, 197, 198}, // SKINCOLOR_LILAC
+	{  0, 252, 252, 176, 200, 177, 201, 202, 202,  34,  36,  38,  40,  42,  45,  46}, // SKINCOLOR_BLOSSOM
 	{  0, 252, 252, 200, 200, 201, 202, 203, 204, 204, 205, 206, 207,  43,  45,  47}, // SKINCOLOR_TAFFY
 
 	// THESE STILL NEED CONVERTED!!!

src/screen.c

@@ -418,7 +418,7 @@ void SCR_DisplayTicRate(void)
 		if (fpsgraph[i])
 			++totaltics;
 
-	if (totaltics <= TICRATE/2) ticcntcolor = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_SALMON, GTC_CACHE);
+	if (totaltics <= TICRATE/2) ticcntcolor = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_RASPBERRY, GTC_CACHE);
 	else if (totaltics == TICRATE) ticcntcolor = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_MINT, GTC_CACHE);
 
 	/*V_DrawString(vid.width-(24*vid.dupx), vid.height-(16*vid.dupy),