Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682

code/modules/mob/dead/new_player/preferences_setup.dm

@@ -11,6 +11,7 @@
 	shirt_color = random_short_color()
 	socks = random_socks()
 	socks_color = random_short_color()
+	use_custom_skin_tone = FALSE
 	skin_tone = random_skin_tone()
 	hair_style = random_hair_style(gender)
 	facial_hair_style = random_facial_hair_style(gender)

code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm

@@ -79,22 +79,6 @@
 	//For soft-restricting markings to species IDs
 	var/list/recommended_species
 
-/datum/sprite_accessory/New()
-	if(alpha_mask_state)
-		alpha_mask_state = "[icon]-[alpha_mask_state]" //foolproofing against states with same name but different files.
-		if(!GLOB.worn_alpha_masks[alpha_mask_state])
-			var/image/I = icon(icon, alpha_mask_state)
-			var/x_offset = 0
-			var/y_offset = 0
-			if(center)
-				x_offset = -((dimension_x/world.icon_size)-1)*(world.icon_size*0.5)
-				y_offset = -((dimension_y/world.icon_size)-1)*(world.icon_size*0.5)
-				if(dimension_x < world.icon_size)
-					x_offset *= -1
-				if(dimension_y < world.icon_size)
-					y_offset *= -1
-			GLOB.worn_alpha_masks[alpha_mask_state] = list(x_offset, y_offset, I)
-
 /datum/sprite_accessory/underwear
 	icon = 'icons/mob/clothing/underwear.dmi'
 	var/has_color = FALSE

code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm

@@ -285,7 +285,7 @@
 	name = "Flat Top (Big)"
 	icon_state = "hair_bigflattop"
 
-/datum/sprite_accessory/hair/fag	//grimacing emoji
+/datum/sprite_accessory/hair/flow
 	name = "Flow Hair"
 	icon_state = "hair_f"
 
@@ -777,4 +777,4 @@
 
 /datum/sprite_accessory/hair/ziegler
 	name = "Ziegler"
-	icon_state = "hair_ziegler"
+	icon_state = "hair_ziegler"