First commit of manual port of BS12

#13042
and
#13086
This commit is contained in:
Jon
2016-05-29 00:56:11 +01:00
parent 9fba5882d7
commit 21f898e047
20 changed files with 215 additions and 639 deletions
+12 -6
View File
@@ -63,8 +63,6 @@ datum/preferences
//Mob preview
var/icon/preview_icon = null
var/icon/preview_icon_front = null
var/icon/preview_icon_side = null
//Jobs, uses bitflags
var/job_civilian_high = 0
@@ -122,7 +120,7 @@ datum/preferences
player_setup = new(src)
set_biological_gender(pick(MALE, FEMALE))
real_name = random_name(identifying_gender,species)
b_type = pick(4;"O-", 36;"O+", 3;"A-", 28;"A+", 1;"B-", 20;"B+", 1;"AB-", 5;"AB+")
b_type = RANDOM_BLOOD_TYPE
gear = list()
@@ -213,7 +211,7 @@ datum/preferences
dat += "</html></body>"
//user << browse(dat, "window=preferences;size=635x736")
var/datum/browser/popup = new(user, "Character Setup","Character Setup", 635, 736, src)
var/datum/browser/popup = new(user, "Character Setup","Character Setup", 800, 800, src)
popup.set_content(dat)
popup.open()
@@ -254,9 +252,10 @@ datum/preferences
ShowChoices(usr)
return 1
/datum/preferences/proc/copy_to(mob/living/carbon/human/character, safety = 0)
/datum/preferences/proc/copy_to(mob/living/carbon/human/character, icon_updates = 1)
// Sanitizing rather than saving as someone might still be editing when copy_to occurs.
player_setup.sanitize_setup()
character.set_species(species)
if(be_random_name)
real_name = random_name(identifying_gender,species)
@@ -297,10 +296,12 @@ datum/preferences
character.g_eyes = g_eyes
character.b_eyes = b_eyes
character.h_style = h_style
character.r_hair = r_hair
character.g_hair = g_hair
character.b_hair = b_hair
character.f_style = f_style
character.r_facial = r_facial
character.g_facial = g_facial
character.b_facial = b_facial
@@ -359,7 +360,12 @@ datum/preferences
pdachoice = 1
character.pdachoice = pdachoice
character.update_body()
if(icon_updates)
character.force_update_limbs()
character.update_mutations(0)
character.update_body(0)
character.update_hair(0)
character.update_icons()
/datum/preferences/proc/open_load_dialog(mob/user)
var/dat = "<body>"