Merge branch 'master' of github.com:Baystation12/Baystation12

code/modules/mob/new_player/preferences.dm

@@ -514,8 +514,8 @@ datum/preferences
 				if(!selected) return
 
 				ZeroSkills(1)
-				skills = SKILL_PRE[selected]
-				ZeroSkills()
+				for(var/V in SKILL_PRE[selected])
+					skills[V] = SKILL_PRE[selected][V]
 				used_skillpoints = 0
 				for(var/V in skills) used_skillpoints += skills[V]
 

code/modules/mob/new_player/sprite_accessories.dm

@@ -107,6 +107,14 @@
 		name = "Bedhead 2"
 		icon_state = "hair_bedhead"
 
+	bedhead3
+		name = "Bedhead 3"
+		icon_state = "hair_bedheadv2"
+
+	bedhead4
+		name = "Bedhead 4"
+		icon_state = "hair_bedheadalt"
+
 	dreadlocks
 		name = "Dreadlocks"
 		icon_state = "hair_dreads"
@@ -124,6 +132,21 @@
 		icon_state = "bald"
 		choose_female = 0
 
+	longalt
+		name = "Long Hair Alt"
+		icon_state = "hair_longfringe"
+
+	longestalt
+		name = "Longest Hair Alt"
+		icon_state = "hair_vlongfringe"
+
+	himecut
+		name = "Hime Cut"
+		icon_state = "hair_himecut"
+
+	curls
+		name = "Curls"
+		icon_state = "hair_curls"
 
 
 /*