summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-10-24 12:48:53 +0000
committerJesusaves <cpntb1@ymail.com>2020-10-24 12:48:53 +0000
commit1a3d323af19764546552b1d621c65303c1fb3005 (patch)
tree5e70a62dc756d5a10fe558fe6e3efefcf5ef1a97 /conf
parent8077efb70e0af1c54a84859f73c96de21c60107b (diff)
downloadserverdata-1a3d323af19764546552b1d621c65303c1fb3005.tar.gz
serverdata-1a3d323af19764546552b1d621c65303c1fb3005.tar.bz2
serverdata-1a3d323af19764546552b1d621c65303c1fb3005.tar.xz
serverdata-1a3d323af19764546552b1d621c65303c1fb3005.zip
CONTENT III SUPER MERGE REQUEST
Included: * Tulimshar Casino * Placeholder fixing/filling * Food Questline * Rossy Quest * Galimatia Quest (mostly by Livio) * Edourard bugs * Blood Donor Quest (from Moubootaur Legends) * Merchant Guild Quest * Mundane Bugfix * La Marine * Hurns Doctor easter eggs * Sailing to Argaes with Legion * Other things not relevant enough to be noted down, I guess
Diffstat (limited to 'conf')
-rw-r--r--conf/map/maps.conf5
1 files changed, 5 insertions, 0 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 1cdb2d88..0e0ab13c 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -160,12 +160,17 @@ map_list: (
"020-2-31",
"020-2-32",
"020-2-33",
+ "020-2-34",
"020-2-4",
"020-2-5",
"020-2-6",
"020-2-7",
"020-2-8",
"020-2-9",
+ "botcheck",
+ "fermi",
+ "marine-2",
+ "marine",
"sec_pri",
"test",
"testbg",