summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-04-25 11:42:03 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2011-04-25 11:42:03 +0200
commitfbf689a3501bf52b6533ce1ff7ef5d311a677734 (patch)
treeb408c1f2bde6ed74786f3a07dca3e61da33d064e
parent32db36e32b3cb1dbb3505703b4e6d2a74b286751 (diff)
parentdb8a1806adf7142d6cd9a719ed0f7ae1e8937716 (diff)
downloadserverdata-fbf689a3501bf52b6533ce1ff7ef5d311a677734.tar.gz
serverdata-fbf689a3501bf52b6533ce1ff7ef5d311a677734.tar.bz2
serverdata-fbf689a3501bf52b6533ce1ff7ef5d311a677734.tar.xz
serverdata-fbf689a3501bf52b6533ce1ff7ef5d311a677734.zip
Merge remote-tracking branch 'mainline/master'
-rw-r--r--npc/functions/barber.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/npc/functions/barber.txt b/npc/functions/barber.txt
index 28f17ec5..8d0a32e3 100644
--- a/npc/functions/barber.txt
+++ b/npc/functions/barber.txt
@@ -28,12 +28,13 @@ L_Style:
"Mane", -,
"Bun", -,
"Shoulder Length Flick", -,
+ "Fizzy", -,
"Surprise me", -,
"Nah, I'm fine", L_Done;
L_Process_Style:
set @style, @menu - 1;
- if (@style == 18) set @style, rand(18);
+ if (@style == 19) set @style, rand(19);
setlook 1, @style;
return;