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

Conflicts:
	code/modules/mob/transform_procs.dm

code/modules/client/preferences.dm

@@ -16,7 +16,9 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
 	"blob" = /datum/game_mode/blob,					//9
 	"ninja",										//10
 	"monkey" = /datum/game_mode/monkey,				//11
-	"gangster" = /datum/game_mode/gang				//12
+	"gangster" = /datum/game_mode/gang,				//12
+	"shadowling" = /datum/game_mode/shadowling,		//13
+	"abductor" = /datum/game_mode/abduction			//14
 )
 
 
@@ -735,13 +737,10 @@ datum/preferences
 						if(result)
 							var/newtype = roundstart_species[result]
 							pref_species = new newtype()
-							if(!config.mutant_colors || mutant_color == "#000")
+							if(mutant_color == "#000")
 								mutant_color = pref_species.default_color
 
 					if("mutant_color")
-						if(!config.mutant_colors)
-							user << "<span class='danger'>Alien colors are disabled.</span>"
-							return
 						var/new_mutantcolor = input(user, "Choose your character's alien skin color:", "Character Preference") as color|null
 						if(new_mutantcolor)
 							var/temp_hsv = RGBtoHSV(new_mutantcolor)
@@ -947,4 +946,4 @@ datum/preferences
 		character.backbag = backbag
 
 		character.update_body()
-		character.update_hair()
+		character.update_hair()