Merge pull request #6135 from Citadel-Station-13/upstream-merge-36426

[MIRROR] Adds the Family Heirloom, Nyctophobia, and Monochromacy traits, and rebalances Social Anxiety

code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm

@@ -184,6 +184,7 @@
 	important = TRUE
 	quickbind = TRUE
 	quickbind_desc = "Returns you to Reebe."
+	var/client_color
 
 /datum/clockwork_scripture/abscond/check_special_requirements()
 	if(is_reebe(invoker.z))
@@ -192,6 +193,7 @@
 	return TRUE
 
 /datum/clockwork_scripture/abscond/recital()
+	client_color = invoker.client.color
 	animate(invoker.client, color = "#AF0AAF", time = 50)
 	. = ..()
 
@@ -214,11 +216,11 @@
 		invoker.pulling.forceMove(T)
 	invoker.forceMove(T)
 	if(invoker.client)
-		animate(invoker.client, color = initial(invoker.client.color), time = 25)
+		animate(invoker.client, color = client_color, time = 25)
 
 /datum/clockwork_scripture/abscond/scripture_fail()
 	if(invoker && invoker.client)
-		animate(invoker.client, color = initial(invoker.client.color), time = 10)
+		animate(invoker.client, color = client_color, time = 10)
 
 
 //Replicant: Creates a new clockwork slab.

code/modules/client/client_colour.dm

@@ -105,4 +105,9 @@
 	colour = "#ff99ff"
 
 /datum/client_colour/glass_colour/gray
-	colour = "#cccccc"
+	colour = "#cccccc"
+
+
+/datum/client_colour/monochrome
+	colour = list(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0))
+	priority = INFINITY //we can't see colors anyway!