cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Committing Hair-styles from Baystation and WJohnston's detective hair.

Browse Source 
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
This commit is contained in:
elly1989@rocketmail.com
2012-03-14 11:47:24 +00:00
parent 6e74828a83
commit 784b3d8838
5 changed files with 46 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/new_player/preferences.dm
+5 -3
View File
@@ -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 = "<html><body>"
dat += "<b>Name:</b> "
@@ -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: <a href =\"byond://?src=\ref[user];preferences=1;underwear=1\"><b>[underwear == 1 ? "Yes" : "No"]</b></a><br>"
dat += "</td><td><b>Preview</b><br><img src=previewicon.png height=64 width=64></td></tr></table>"
dat += "</td><td><b>Preview</b><br><img src=previewicon.png height=64 width=64><img src=previewicon2.png height=64 width=64></td></tr></table>" //Carn: Now with profile!
dat += "<hr><b>Hair</b><br>"
code/modules/mob/new_player/preferences_setup.dm
+7 -2
View File
@@ -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)
code/modules/mob/new_player/sprite_accessories.dm
+26
View File
@@ -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"
/*
///////////////////////////////////