Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

2019-08-10 23:48:47 -05:00
parent 98a279a6db 5dcd419d8a
commit dcd682bd59
175 changed files with 9004 additions and 1473 deletions
@@ -79,4 +79,4 @@
 	var/n_color = input(H, "Choose your [garment_type]'\s color.", "Character Preference", default_color) as color|null
 	if(!n_color || !H.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
 		return default_color
-	return sanitize_hexcolor(n_color, include_crunch= TRUE)
+	return sanitize_hexcolor(n_color)