From 784b3d88389da01dfa964b7eff68a9603781f78f Mon Sep 17 00:00:00 2001 From: "elly1989@rocketmail.com" Date: Wed, 14 Mar 2012 11:47:24 +0000 Subject: [PATCH] Committing Hair-styles from Baystation and WJohnston's detective hair. There's now also a profile preview of your character in the character setup screen. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3288 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/mob/new_player/preferences.dm | 8 ++++-- .../mob/new_player/preferences_setup.dm | 9 ++++-- .../mob/new_player/sprite_accessories.dm | 26 ++++++++++++++++++ html/changelog.html | 8 ++++++ icons/mob/human_face.dmi | Bin 9200 -> 14483 bytes 5 files changed, 46 insertions(+), 5 deletions(-) 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:

+ +
+

13 March 2012

Nodrak & Carn updated:

diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index bec72ed2838276eaf6dbe130ad8c3ab570a1258a..a3617bd16257434b536499d68cc7188ff7ad0d0e 100644 GIT binary patch literal 14483 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

D206LRaQ6UTfxp7 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 literal 9200 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 fU;7__HouQ<&U1JX`yfmd0AIRV`kI9rj{^S#