From be320f8d8e11c1b71c226f4d3f792d1ff8de1666 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Mon, 19 Jan 2009 12:34:53 +0100 Subject: Fixed barber mixing up hair styles Long and curly and pigtails were mixed up. Reported on IRC by meway. --- npc/functions/barber.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- cgit v1.2.3-70-g09d2 From 603911e22d65bde062a6b8331616701fbc111d7d Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Mon, 19 Jan 2009 09:26:41 +0000 Subject: Add a battle_local conf file --- conf/battle_athena.conf | 3 +++ conf/battle_local.conf.example | 1 + 2 files changed, 4 insertions(+) create mode 100644 conf/battle_local.conf.example diff --git a/conf/battle_athena.conf b/conf/battle_athena.conf index 474fcfd3..79c9de58 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. -- cgit v1.2.3-70-g09d2