diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-01-19 09:36:24 +0000 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-01-19 09:36:24 +0000 |
| commit | 91627698793a7f310501024cd1d195555a2a08ca (patch) | |
| tree | f994f9587d3e827b703bf9e43ecdf561f902b58f | |
| parent | 6a92fbc8e20a211d85e0656cc86bb3569389b85b (diff) | |
| parent | 603911e22d65bde062a6b8331616701fbc111d7d (diff) | |
| download | serverdata-91627698793a7f310501024cd1d195555a2a08ca.tar.gz serverdata-91627698793a7f310501024cd1d195555a2a08ca.tar.bz2 serverdata-91627698793a7f310501024cd1d195555a2a08ca.tar.xz serverdata-91627698793a7f310501024cd1d195555a2a08ca.zip | |
Merge commit 'mainline/master'
| -rw-r--r-- | conf/battle_athena.conf | 3 | ||||
| -rw-r--r-- | conf/battle_local.conf.example | 1 | ||||
| -rw-r--r-- | npc/functions/barber.txt | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/conf/battle_athena.conf b/conf/battle_athena.conf index 2b5a208a..f85e880f 100644 --- a/conf/battle_athena.conf +++ b/conf/battle_athena.conf @@ -723,3 +723,6 @@ spam_threshold: 10 // Maximum line lengt, if a message is above chat_maxline, its dropped [1-512]. Default 255. chat_maxline: 512 + +// local settings for this server in this file +import: conf/battle_local.conf diff --git a/conf/battle_local.conf.example b/conf/battle_local.conf.example new file mode 100644 index 00000000..c9ba222c --- /dev/null +++ b/conf/battle_local.conf.example @@ -0,0 +1 @@ +// Nothing needs to be done here. diff --git a/npc/functions/barber.txt b/npc/functions/barber.txt index 57c3c598..ceba8fd8 100644 --- a/npc/functions/barber.txt +++ b/npc/functions/barber.txt @@ -20,8 +20,8 @@ L_Style: "Center parting/Short and slick", -, "Long and slick", -, "Short and curly", -, - "Long and curly", -, "Pigtails", -, + "Long and curly", -, "Parted", -, "Supprise me", -, "Nah, I'm fine", L_Done; |