diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm
index def8f050baf..8d9d2899721 100644
--- a/code/modules/mob/new_player/preferences.dm
+++ b/code/modules/mob/new_player/preferences.dm
@@ -89,7 +89,8 @@ datum/preferences
UI = UI_OLD
//Mob preview
- icon/preview_icon = null
+ icon/preview_icon_front = null
+ icon/preview_icon_side = null
//Jobs, uses bitflags
job_civilian_high = 0
@@ -114,7 +115,8 @@ datum/preferences
proc/ShowChoices(mob/user)
update_preview_icon()
- user << browse_rsc(preview_icon, "previewicon.png")
+ user << browse_rsc(preview_icon_front, "previewicon.png")
+ user << browse_rsc(preview_icon_side, "previewicon2.png")
var/dat = ""
dat += "Name: "
@@ -146,7 +148,7 @@ datum/preferences
// if(!IsGuestKey(user.key))//Seeing as it doesn't do anything, it may as well not show up.
// dat += "Underwear: [underwear == 1 ? "Yes" : "No"]
"
- dat += "Preview
 | "
+ dat += "Preview
 | " //Carn: Now with profile!
dat += "
Hair
"
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index d144d8c8757..91897ea1c19 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -200,7 +200,9 @@ datum/preferences
b_eyes = blue
proc/update_preview_icon()
- del(preview_icon)
+ del(preview_icon_front)
+ del(preview_icon_side)
+ var/icon/preview_icon = null
var/g = "m"
if (gender == MALE)
@@ -238,7 +240,10 @@ datum/preferences
eyes_s.Blend(facial_s, ICON_OVERLAY)
preview_icon.Blend(eyes_s, ICON_OVERLAY)
-
+ preview_icon_front = new(preview_icon, dir = SOUTH)
+ preview_icon_side = new(preview_icon, dir = WEST)
+
+ del(preview_icon)
del(mouth_s)
del(facial_s)
del(hair_s)
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index 9f3d428c2c5..2f4ac03ba67 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -54,6 +54,14 @@
name = "Longer Hair"
icon_state = "hair_vlong"
+ longfringe
+ name = "Long Fringe"
+ icon_state = "hair_longfringe"
+
+ longestalt
+ name = "Longer Fringe"
+ icon_state = "hair_vlongfringe"
+
halfbang
name = "Half-banged Hair"
icon_state = "hair_halfbang"
@@ -92,6 +100,14 @@
name = "Bedhead"
icon_state = "hair_bedhead"
+ bedhead2
+ name = "Bedhead 2"
+ icon_state = "hair_bedheadv2"
+
+ bedhead3
+ name = "Bedhead 3"
+ icon_state = "hair_bedheadv3"
+
dreadlocks
name = "Dreadlocks"
icon_state = "hair_dreads"
@@ -110,7 +126,17 @@
icon_state = "bald"
choose_female = 0
+ himecut
+ name = "Hime Cut"
+ icon_state = "hair_himecut"
+ curls
+ name = "Curls"
+ icon_state = "hair_curls"
+
+ spikey
+ name = "Spikey"
+ icon_state = "hair_spikey"
/*
///////////////////////////////////
diff --git a/html/changelog.html b/html/changelog.html
index 89dc7fe5eb5..0d35ea5fd1f 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -92,6 +92,14 @@ should be listed in the changelog upon commit tho. Thanks. -->
+
+
14 March 2012
+
Carn updated:
+
+ - Added 6 female hairstyles -- credits go to Erthilo of Baystation. Added a male hairstyle -- credits go to WJohnston of TG. If you can sprite some unique and decent-looking hair sprites, feel free to PM me on the TG forums.
+
+
13 March 2012
Nodrak & Carn updated:
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index bec72ed2838..a3617bd1625 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ