diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-02-14 20:13:09 +0000 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-02-14 20:13:09 +0000 |
| commit | 481d1eca66e38154063b078b84fe76a830e5ac0d (patch) | |
| tree | 936e79882218d32d4075f46ad85aff7cec199d2a /npc/functions/barber.txt | |
| parent | fe02011f477c57c7461b2bc25456bd9426e98cd7 (diff) | |
| parent | ef7a69afc170e8c60af91583d7c1488a7590fcab (diff) | |
| download | serverdata-481d1eca66e38154063b078b84fe76a830e5ac0d.tar.gz serverdata-481d1eca66e38154063b078b84fe76a830e5ac0d.tar.bz2 serverdata-481d1eca66e38154063b078b84fe76a830e5ac0d.tar.xz serverdata-481d1eca66e38154063b078b84fe76a830e5ac0d.zip | |
Merge commit 'mainline/master'
Conflicts:
db/item_db.txt
Diffstat (limited to 'npc/functions/barber.txt')
| -rw-r--r-- | npc/functions/barber.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/npc/functions/barber.txt b/npc/functions/barber.txt index ceba8fd8..03ce9a53 100644 --- a/npc/functions/barber.txt +++ b/npc/functions/barber.txt @@ -11,7 +11,7 @@ function script Barber { L_Style: menu "Bald", -, - "Ponytail", -, + "Flat ponytail", -, "Bowl cut", -, "Combed back", -, "Emo", -, @@ -23,12 +23,15 @@ L_Style: "Pigtails", -, "Long and curly", -, "Parted", -, - "Supprise me", -, + "Perky ponytail", -, + "Wave", -, + "Mane", -, + "Bun", -, "Nah, I'm fine", L_Done; L_Process_Style: set @style, @menu - 1; - if (@style == 13) set @style, rand(13); + if (@style == 17) set @style, rand(17); setlook 1, @style; return; @@ -44,10 +47,11 @@ L_Color: "Light red", -, "Blue", -, "Dark purple", -, + "Black", -, "Supprise me", -, "Nah, I'm fine", L_Done; set @color, @menu - 1; - if (@color == 10) set @color, rand(10); + if (@color == 11) set @color, rand(11); setlook 6, @color; return; |