From 5d1d1f41a5eb95b4caff14a224e32d9cb425fd38 Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Tue, 28 Feb 2012 15:42:59 -0500 Subject: [PATCH 1/2] adding rotating the char creation preview --- code/modules/mob/new_player/preferences.dm | 11 ++++++++++- code/modules/mob/new_player/preferences_setup.dm | 12 ++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm index 98e5b073822..594050b0a18 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/code/modules/mob/new_player/preferences.dm @@ -91,6 +91,7 @@ datum/preferences //Mob preview icon/preview_icon = null + preview_dir = SOUTH //Jobs, uses bitflags job_civilian_high = 0 @@ -227,7 +228,12 @@ datum/preferences if(!IsGuestKey(user.key)) dat += "Underwear: [underwear == 1 ? "Yes" : "No"]
" - dat += "Preview
" + + dat += "Preview
" + dat += "<" + dat += "" + dat += ">" + dat += "" dat += "
Hair
" @@ -493,6 +499,9 @@ datum/preferences return 1 + if(link_tags["preview_dir"]) + preview_dir = text2num(link_tags["preview_dir"]) + if(link_tags["skills"]) if(link_tags["cancel"]) user << browse(null, "window=show_skills") diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index d144d8c8757..793acfc5f74 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -208,7 +208,7 @@ datum/preferences else if (gender == FEMALE) g = "f" - preview_icon = new /icon('human.dmi', "body_[g]_s") + preview_icon = new /icon('human.dmi', "body_[g]_s", "dir" = preview_dir) // Skin tone if (s_tone >= 0) @@ -217,21 +217,21 @@ datum/preferences preview_icon.Blend(rgb(-s_tone, -s_tone, -s_tone), ICON_SUBTRACT) if (underwear > 0) - preview_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY) + preview_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_s", "dir" = preview_dir), ICON_OVERLAY) - var/icon/eyes_s = new/icon("icon" = 'human_face.dmi', "icon_state" = "eyes_s") + var/icon/eyes_s = new/icon("icon" = 'human_face.dmi', "icon_state" = "eyes_s", "dir" = preview_dir) eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD) // Hair and facial hair, improved by Doohl - var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s") + var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s", "dir" = preview_dir) hair_s.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD) - var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s") + var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s", "dir" = preview_dir) facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD) - var/icon/mouth_s = new/icon("icon" = 'human_face.dmi', "icon_state" = "mouth_[g]_s") + var/icon/mouth_s = new/icon("icon" = 'human_face.dmi', "icon_state" = "mouth_[g]_s", "dir" = preview_dir) eyes_s.Blend(hair_s, ICON_OVERLAY) eyes_s.Blend(mouth_s, ICON_OVERLAY) From 4e0787a5504597a3719f797f05f70c238f7f622f Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Tue, 28 Feb 2012 15:43:22 -0500 Subject: [PATCH 2/2] new manifest at mid-game new player screen --- code/modules/mob/new_player/new_player.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 65086efef59..9704354974d 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -383,9 +383,7 @@ proc/ViewManifest() var/dat = "" dat += "

Crew Manifest

" - for(var/datum/data/record/t in data_core.general) - dat += "[t.fields["name"]] - [t.fields["rank"]]
" - dat += "
" + dat += data_core.get_manifest() src << browse(dat, "window=manifest;size=300x420;can_close=1")