Merge branch 'master' of https://github.com/tgstation/-tg-station into why_did_this_take_months

# Conflicts:
#	code/modules/client/preferences_savefile.dm

code/modules/client/client_colour.dm

@@ -27,7 +27,7 @@
 	colour_type - a typepath (subtyped from /datum/client_colour)
 */
 /mob/proc/add_client_colour(colour_type)
-	if(!ispath(/datum/client_colour))
+	if(!ispath(colour_type, /datum/client_colour))
 		return
 
 	var/datum/client_colour/CC = new colour_type()
@@ -41,7 +41,7 @@
 	colour_type - a typepath (subtyped from /datum/client_colour)
 */
 /mob/proc/remove_client_colour(colour_type)
-	if(!ispath(/datum/client_colour))
+	if(!ispath(colour_type, /datum/client_colour))
 		return
 
 	for(var/cc in client_colours)
@@ -70,3 +70,39 @@
 
 
 
+/datum/client_colour/glass_colour
+	priority = 0
+	colour = "red"
+
+/datum/client_colour/glass_colour/green
+	colour = "#aaffaa"
+
+/datum/client_colour/glass_colour/lightgreen
+	colour = "#ccffcc"
+
+/datum/client_colour/glass_colour/blue
+	colour = "#aaaaff"
+
+/datum/client_colour/glass_colour/lightblue
+	colour = "#ccccff"
+
+/datum/client_colour/glass_colour/yellow
+	colour = "#ffff66"
+
+/datum/client_colour/glass_colour/red
+	colour = "#ffaaaa"
+
+/datum/client_colour/glass_colour/darkred
+	colour = "#bb5555"
+
+/datum/client_colour/glass_colour/orange
+	colour = "#ffbb99"
+
+/datum/client_colour/glass_colour/lightorange
+	colour = "#ffddaa"
+
+/datum/client_colour/glass_colour/purple
+	colour = "#ff99ff"
+
+/datum/client_colour/glass_colour/gray
+	colour = "#cccccc"

code/modules/client/preferences.dm

@@ -41,6 +41,8 @@ var/list/preferences_datums = list()
 	var/allow_midround_antag = 1
 	var/preferred_map = null
 
+	var/uses_glasses_colour = 0
+
 	//character preferences
 	var/real_name						//our character's name
 	var/be_random_name = 0				//whether we'll have a random name every round

code/modules/client/preferences_savefile.dm

@@ -97,7 +97,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 		ignoring = list()
 	if(current_version < 15)
 		toggles |= SOUND_ANNOUNCEMENTS
-	
+
 
 //should this proc get fairly long (say 3 versions long),
 //just increase SAVEFILE_VERSION_MIN so it's not as far behind
@@ -173,6 +173,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["ignoring"]			>> ignoring
 	S["ghost_hud"]			>> ghost_hud
 	S["inquisitive_ghost"]	>> inquisitive_ghost
+	S["uses_glasses_colour"]>> uses_glasses_colour
 
 	//try to fix any outdated data if necessary
 	if(needs_update >= 0)
@@ -224,6 +225,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["ignoring"]			<< ignoring
 	S["ghost_hud"]			<< ghost_hud
 	S["inquisitive_ghost"]	<< inquisitive_ghost
+	S["uses_glasses_colour"]<< uses_glasses_colour
 
 	return 1