Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

This commit is contained in:
Ren Erthilo
2012-05-02 00:37:35 +01:00
13 changed files with 62 additions and 12 deletions

View File

@@ -644,11 +644,11 @@ datum/preferences
if(link_tags["age"])
switch(link_tags["age"])
if("input")
var/new_age = input(user, "Please select type in age: 15-45", "Character Generation") as num
var/new_age = input(user, "Please enter an age ([minimum_age]-[maximum_age])", "Character Generation") as num
if(new_age)
age = max(min(round(text2num(new_age)), 65), 20)
age = max(min(round(text2num(new_age)), maximum_age), minimum_age)
if("random")
age = rand (20, 45)
age = rand (minimum_age, maximum_age)
if(link_tags["OOC"])
var/tempnote = ""
@@ -1044,4 +1044,4 @@ datum/preferences
character.disabilities = disabilities
#undef UI_OLD
#undef UI_NEW
#undef UI_NEW

View File

@@ -15,7 +15,7 @@ datum/preferences
underwear = 1
backbag = 2
b_type = pick("A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-")
age = rand(20,65)
age = rand(minimum_age, maximum_age)
copy_to(H,1)
proc/randomize_name()
@@ -263,4 +263,4 @@ datum/preferences
if(H.name == f_style)
facial_hair_style = H
else
del(H)
del(H)