cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 15:45:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #548 from Tastyfish/master

Browse Source 
adding being able to rotate the character creation preview
This commit is contained in:
CIB
2012-02-28 14:16:52 -08:00
parent 3a45c065aa ca9f25a1e4
commit fc938d81b2
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/new_player/new_player.dm
+1 -3
View File
@@ -383,9 +383,7 @@
proc/ViewManifest()
var/dat = "<html><body>"
dat += "<h4>Crew Manifest</h4>"
for(var/datum/data/record/t in data_core.general)
dat += "[t.fields["name"]] - [t.fields["rank"]]<br>"
dat += "<br>"
dat += data_core.get_manifest()
src << browse(dat, "window=manifest;size=300x420;can_close=1")
code/modules/mob/new_player/preferences.dm
+10 -1
View File
@@ -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: <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 style='text-align:center;padding-left:2em'><b>Preview</b><br>"
dat += "<a href='?src=\ref[user];preferences=1;preview_dir=[turn(preview_dir,-90)]'>&lt;</a>"
dat += "<img src=previewicon.png height=64 width=64 style='vertical-align:middle'>"
dat += "<a href='?src=\ref[user];preferences=1;preview_dir=[turn(preview_dir,90)]'>&gt;</a>"
dat += "</td></tr></table>"
dat += "<hr><b>Hair</b><br>"
@@ -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")
code/modules/mob/new_player/preferences_setup.dm
+6 -6
View File
@@ -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)