diff --git a/scorn/misc/castle b/scorn/misc/castle
index bd1326379..58a2572aa 100644
--- a/scorn/misc/castle
+++ b/scorn/misc/castle
@@ -1624,6 +1624,14 @@ y 5
 end
 arch guildmaster
 name Magistrate
+msg
+@match farnass
+Ha, the cook? You can find him in the kitchen, near the castle.
+
+The kitchen password is 'clickety'.
+@match *
+I'm too busy to help you.
+endmsg
 x 11
 y 5
 end
diff --git a/scorn/misc/castle_kitchen b/scorn/misc/castle_kitchen
new file mode 100644
index 000000000..69ec98844
--- /dev/null
+++ b/scorn/misc/castle_kitchen
@@ -0,0 +1,777 @@
+arch map
+name Castle kitchen
+region scorn
+width 10
+height 10
+msg
+Creator: Nicolas Weeger
+Date:    2007-05-26
+endmsg
+end
+arch cobblestones2
+end
+arch stwall_2_2_2
+end
+arch cobblestones2
+y 1
+end
+arch stwall_2_1_1
+y 1
+end
+arch cobblestones2
+y 2
+end
+arch stwall_2_1_1
+y 2
+end
+arch cobblestones2
+y 3
+end
+arch stwall_2_1_1
+y 3
+end
+arch cobblestones2
+y 4
+end
+arch stwall_2_1_1
+y 4
+end
+arch cobblestones2
+y 5
+end
+arch stwall_2_1_1
+y 5
+end
+arch cobblestones2
+y 6
+end
+arch stwall_2_1_1
+y 6
+end
+arch cobblestones2
+y 7
+end
+arch stwall_2_1_1
+y 7
+end
+arch cobblestones2
+y 8
+end
+arch stwall_2_1_1
+y 8
+end
+arch cobblestones2
+y 9
+end
+arch stwall_2_2_1
+y 9
+end
+arch cobblestones2
+x 1
+end
+arch stwall_2_1_2
+x 1
+end
+arch marble
+x 1
+y 1
+end
+arch table_1x2
+x 1
+y 1
+end
+arch apple
+x 1
+y 1
+no_pick 1
+end
+arch marble
+x 1
+y 2
+end
+arch blackroot
+x 1
+y 2
+no_pick 1
+end
+arch marble
+x 1
+y 3
+end
+arch table_1x2
+x 1
+y 3
+end
+arch cabbage
+x 1
+y 3
+no_pick 1
+end
+arch marble
+x 1
+y 4
+end
+arch mandrake_root
+x 1
+y 4
+no_pick 1
+end
+arch marble
+x 1
+y 5
+end
+arch table_1x2
+x 1
+y 5
+end
+arch tomato
+x 1
+y 5
+no_pick 1
+end
+arch marble
+x 1
+y 6
+end
+arch potato
+x 1
+y 6
+no_pick 1
+end
+arch marble
+x 1
+y 7
+end
+arch table_1x2
+x 1
+y 7
+end
+arch onion
+x 1
+y 7
+no_pick 1
+end
+arch marble
+x 1
+y 8
+end
+arch orange
+x 1
+y 8
+no_pick 1
+end
+arch cobblestones2
+x 1
+y 9
+end
+arch stwall_2_1_2
+x 1
+y 9
+end
+arch cobblestones2
+x 2
+end
+arch stwall_2_1_2
+x 2
+end
+arch marble
+x 2
+y 1
+end
+arch marble
+x 2
+y 2
+end
+arch light4
+x 2
+y 2
+end
+arch marble
+x 2
+y 3
+end
+arch marble
+x 2
+y 4
+end
+arch marble
+x 2
+y 5
+end
+arch marble
+x 2
+y 6
+end
+arch marble
+x 2
+y 7
+end
+arch light4
+x 2
+y 7
+end
+arch marble
+x 2
+y 8
+end
+arch table_2x1
+x 2
+y 8
+end
+arch clover
+x 2
+y 8
+no_pick 1
+end
+arch cobblestones2
+x 2
+y 9
+end
+arch stwall_2_1_2
+x 2
+y 9
+end
+arch cobblestones2
+x 3
+end
+arch stwall_2_2_3
+x 3
+end
+arch cobblestones2
+x 3
+y 1
+end
+arch stwall_2_1_1
+x 3
+y 1
+end
+arch cobblestones2
+x 3
+y 2
+end
+arch stwall_2_1_1
+x 3
+y 2
+end
+arch magic_ear
+msg
+@match clickety
+Click.
+endmsg
+x 3
+y 3
+connected 1
+end
+arch cobblestones2
+x 3
+y 3
+end
+arch stwall_1_2
+x 3
+y 3
+end
+arch marble
+x 3
+y 4
+end
+arch marble
+x 3
+y 5
+end
+arch marble
+x 3
+y 6
+end
+arch marble
+x 3
+y 7
+end
+arch marble
+x 3
+y 8
+end
+arch chocolate
+x 3
+y 8
+no_pick 1
+end
+arch cobblestones2
+x 3
+y 9
+end
+arch stwall_2_1_2
+x 3
+y 9
+end
+arch exit
+slaying /world/world_104_115
+hp 43
+sp 48
+x 4
+end
+arch cobblestones2
+x 4
+end
+arch light4
+x 4
+end
+arch cobblestones2
+x 4
+y 1
+end
+arch magic_mouth
+msg
+Castle kitchen - authorized personnel only.
+endmsg
+x 4
+y 2
+end
+arch cobblestones2
+x 4
+y 2
+end
+arch cobblestones2
+x 4
+y 3
+end
+arch mdoor_closed_1
+x 4
+y 3
+connected 1
+end
+arch marble
+x 4
+y 4
+end
+arch marble
+x 4
+y 5
+end
+arch fatwoman
+name Farnass
+msg
+@match sentrio|egg|eggs
+My friend Sentrio lives somewhere in Lake Country, but I don't remember where exactly, sorry...
+
+I do know eggs from his chicken are the only ones worth my cooking skill!
+
+@match mushroom
+Yes, it's a blue one, I think it grows in a marsh in the west. I've heard it can be used for medicine, too.
+@match ingredients
+You need the following:
+- 4 eggs from my friend Sentrio's chicken
+- a special mushroom
+@match omelet
+So you want an omelet, he?
+
+Then you'll have to bring me the ingredients.
+@match lursendis
+Ha, this old friend of me. I haven't seen him in years, I wonder how he's doing...
+@match *
+Please don't disturb me, I'm trying a really hard recipe.
+endmsg
+x 4
+y 5
+end
+arch marble
+x 4
+y 6
+end
+arch marble
+x 4
+y 7
+end
+arch marble
+x 4
+y 8
+end
+arch stove
+name Royal stove
+x 4
+y 8
+is_cauldron 0
+end
+arch cobblestones2
+x 4
+y 9
+end
+arch stwall_2_1_2
+x 4
+y 9
+end
+arch exit
+slaying /world/world_104_115
+hp 43
+sp 48
+x 5
+end
+arch cobblestones2
+x 5
+end
+arch light4
+x 5
+end
+arch cobblestones2
+x 5
+y 1
+end
+arch magic_mouth
+msg
+Castle kitchen - authorized personnel only.
+endmsg
+x 5
+y 2
+end
+arch cobblestones2
+x 5
+y 2
+end
+arch cobblestones2
+x 5
+y 3
+end
+arch mdoor_closed_1
+x 5
+y 3
+connected 1
+end
+arch marble
+x 5
+y 4
+end
+arch marble
+x 5
+y 5
+end
+arch marble
+x 5
+y 6
+end
+arch marble
+x 5
+y 7
+end
+arch marble
+x 5
+y 8
+end
+arch stove
+name Royal stove
+x 5
+y 8
+is_cauldron 0
+end
+arch cobblestones2
+x 5
+y 9
+end
+arch stwall_2_1_2
+x 5
+y 9
+end
+arch cobblestones2
+x 6
+end
+arch stwall_2_2_2
+x 6
+end
+arch cobblestones2
+x 6
+y 1
+end
+arch stwall_2_1_1
+x 6
+y 1
+end
+arch cobblestones2
+x 6
+y 2
+end
+arch stwall_2_1_1
+x 6
+y 2
+end
+arch cobblestones2
+x 6
+y 3
+end
+arch stwall_1_2
+x 6
+y 3
+end
+arch marble
+x 6
+y 4
+end
+arch marble
+x 6
+y 5
+end
+arch marble
+x 6
+y 6
+end
+arch marble
+x 6
+y 7
+end
+arch marble
+x 6
+y 8
+end
+arch table_2x1
+x 6
+y 8
+end
+arch mint
+x 6
+y 8
+no_pick 1
+end
+arch cobblestones2
+x 6
+y 9
+end
+arch stwall_2_1_2
+x 6
+y 9
+end
+arch cobblestones2
+x 7
+end
+arch stwall_2_1_2
+x 7
+end
+arch marble
+x 7
+y 1
+end
+arch marble
+x 7
+y 2
+end
+arch light4
+x 7
+y 2
+end
+arch marble
+x 7
+y 3
+end
+arch marble
+x 7
+y 4
+end
+arch marble
+x 7
+y 5
+end
+arch marble
+x 7
+y 6
+end
+arch marble
+x 7
+y 7
+end
+arch light4
+x 7
+y 7
+end
+arch marble
+x 7
+y 8
+end
+arch pear
+x 7
+y 8
+no_pick 1
+end
+arch cobblestones2
+x 7
+y 9
+end
+arch stwall_2_1_2
+x 7
+y 9
+end
+arch cobblestones2
+x 8
+end
+arch stwall_2_1_2
+x 8
+end
+arch marble
+x 8
+y 1
+end
+arch table_1x2
+x 8
+y 1
+end
+arch cheeseburger
+x 8
+y 1
+no_pick 1
+end
+arch marble
+x 8
+y 2
+end
+arch leg_mutton
+x 8
+y 2
+no_pick 1
+end
+arch marble
+x 8
+y 3
+end
+arch table_1x2
+x 8
+y 3
+end
+arch mushroom_1
+x 8
+y 3
+no_pick 1
+end
+arch marble
+x 8
+y 4
+end
+arch mushroom_2
+x 8
+y 4
+no_pick 1
+end
+arch marble
+x 8
+y 5
+end
+arch table_1x2
+x 8
+y 5
+end
+arch mushroom_3
+x 8
+y 5
+no_pick 1
+end
+arch marble
+x 8
+y 6
+end
+arch pipeweed
+x 8
+y 6
+no_pick 1
+end
+arch marble
+x 8
+y 7
+end
+arch table_1x2
+x 8
+y 7
+end
+arch roast_bird
+x 8
+y 7
+no_pick 1
+end
+arch marble
+x 8
+y 8
+end
+arch s_weasel
+x 8
+y 8
+no_pick 1
+end
+arch cobblestones2
+x 8
+y 9
+end
+arch stwall_2_1_2
+x 8
+y 9
+end
+arch cobblestones2
+x 9
+end
+arch stwall_2_2_3
+x 9
+end
+arch cobblestones2
+x 9
+y 1
+end
+arch stwall_2_1_1
+x 9
+y 1
+end
+arch cobblestones2
+x 9
+y 2
+end
+arch stwall_2_1_1
+x 9
+y 2
+end
+arch cobblestones2
+x 9
+y 3
+end
+arch stwall_2_1_1
+x 9
+y 3
+end
+arch cobblestones2
+x 9
+y 4
+end
+arch stwall_2_1_1
+x 9
+y 4
+end
+arch cobblestones2
+x 9
+y 5
+end
+arch stwall_2_1_1
+x 9
+y 5
+end
+arch cobblestones2
+x 9
+y 6
+end
+arch stwall_2_1_1
+x 9
+y 6
+end
+arch cobblestones2
+x 9
+y 7
+end
+arch stwall_2_1_1
+x 9
+y 7
+end
+arch cobblestones2
+x 9
+y 8
+end
+arch stwall_2_1_1
+x 9
+y 8
+end
+arch cobblestones2
+x 9
+y 9
+end
+arch stwall_2_2_4
+x 9
+y 9
+end
diff --git a/world/world_104_115 b/world/world_104_115
index 5e20383f4..7727f1526 100644
--- a/world/world_104_115
+++ b/world/world_104_115
@@ -10988,6 +10988,12 @@ arch cobblestones2
 x 41
 y 28
 end
+arch barn
+name dragon hangar
+name_pl dragon hangar
+x 41
+y 28
+end
 arch dungeon_magic
 x 41
 y 29
@@ -11016,6 +11022,15 @@ arch brush
 x 41
 y 31
 end
+arch store_magic
+name Magic Shop
+name_pl Magic Shop
+slaying /scorn/shops/magicshop
+hp 14
+sp 14
+x 41
+y 31
+end
 arch dungeon_magic
 x 41
 y 32
@@ -11040,6 +11055,13 @@ arch cobblestones2
 x 41
 y 34
 end
+arch city_tower
+name Friendly Giant's Tower
+slaying /scorn/kar/somehouse
+hp 14
+x 41
+y 34
+end
 arch dungeon_magic
 x 41
 y 35
@@ -11150,6 +11172,13 @@ arch grass
 x 41
 y 44
 end
+arch stronghold
+slaying /scorn/misc/castle
+hp 11
+sp 20
+x 41
+y 44
+end
 arch dungeon_magic
 x 41
 y 45
@@ -11328,6 +11357,15 @@ arch cobblestones2
 x 42
 y 23
 end
+arch dragon_exit
+name to Pupland Terminal
+name_pl to Pupland Terminal
+slaying /pup_land/terminal
+hp 10
+sp 2
+x 42
+y 23
+end
 arch dungeon_magic
 x 42
 y 24
@@ -11687,6 +11725,10 @@ arch sea1
 x 43
 y 19
 end
+arch longship
+x 43
+y 19
+end
 arch dungeon_magic
 x 43
 y 20
@@ -11763,6 +11805,12 @@ arch cobblestones2
 x 43
 y 28
 end
+arch barn
+name dragon hangar
+name_pl dragon hangar
+x 43
+y 28
+end
 arch dungeon_magic
 x 43
 y 29
@@ -11819,6 +11867,15 @@ arch grass
 x 43
 y 34
 end
+arch guild
+name West Scorn Trademarket
+name_pl West Scorn Trademarket
+slaying /mlab/mlabscrntrd1
+hp 1
+sp 10
+x 43
+y 34
+end
 arch dungeon_magic
 x 43
 y 35
@@ -11867,6 +11924,15 @@ arch brush
 x 43
 y 39
 end
+arch church
+name Church of Valriel
+name_pl Church of Valriel
+slaying /scorn/temples/valriel
+hp 9
+sp 28
+x 43
+y 39
+end
 arch dungeon_magic
 x 43
 y 40
@@ -11943,6 +12009,14 @@ arch grass
 x 43
 y 48
 end
+arch tavern
+name Castle kitchen
+slaying /scorn/misc/castle_kitchen
+hp 4
+sp 1
+x 43
+y 48
+end
 arch dungeon_magic
 x 43
 y 49
@@ -12161,6 +12235,15 @@ arch brush
 x 44
 y 31
 end
+arch store_weapons
+name Weapon Shop
+name_pl Weapon shop
+slaying /scorn/shops/weaponshop
+hp 1
+sp 14
+x 44
+y 31
+end
 arch dungeon_magic
 x 44
 y 32
@@ -12201,6 +12284,15 @@ arch grass
 x 44
 y 36
 end
+arch store_alchemy
+name Alchemy Shop
+name_pl Alchemy Shop
+slaying /scorn/shops/potionshop
+hp 14
+sp 14
+x 44
+y 36
+end
 arch dungeon_magic
 x 44
 y 37
@@ -12625,6 +12717,15 @@ arch brush
 x 45
 y 39
 end
+arch t_house2
+name Temple of Gaea
+name_pl Temple of Gaea
+slaying /scorn/temples/gaea
+hp 12
+sp 18
+x 45
+y 39
+end
 arch dungeon_magic
 x 45
 y 40
@@ -12997,6 +13098,15 @@ arch grass
 x 46
 y 34
 end
+arch barrack_long
+name Barracks
+name_pl Barracks
+slaying /scorn/houses/barracks
+hp 24
+sp 4
+x 46
+y 34
+end
 arch dungeon_magic
 x 46
 y 35
@@ -13005,6 +13115,15 @@ arch grass
 x 46
 y 35
 end
+arch barrack_long
+name Mess Hall
+name_pl Mess Hall
+slaying /scorn/houses/messhall
+hp 24
+sp 4
+x 46
+y 35
+end
 arch dungeon_magic
 x 46
 y 36
@@ -13013,6 +13132,14 @@ arch grass
 x 46
 y 36
 end
+arch barrack_up
+name Mercenaries Agency
+slaying /scorn/misc/mercenaries
+hp 6
+sp 15
+x 46
+y 36
+end
 arch dungeon_magic
 x 46
 y 37
@@ -13231,6 +13358,10 @@ arch sea
 x 47
 y 19
 end
+arch s_ship
+x 47
+y 19
+end
 arch dungeon_magic
 x 47
 y 20
@@ -13335,6 +13466,15 @@ arch brush
 x 47
 y 31
 end
+arch store_armour
+name Armour Shop
+name_pl Armour Shop
+slaying /scorn/shops/armourshop
+hp 14
+sp 1
+x 47
+y 31
+end
 arch dungeon_magic
 x 47
 y 32
@@ -13375,6 +13515,14 @@ arch grass
 x 47
 y 36
 end
+arch store_weapons
+name Scorn's Best Bows
+slaying /scorn/shops/bowshop
+hp 14
+sp 14
+x 47
+y 36
+end
 arch dungeon_magic
 x 47
 y 37
@@ -13640,6 +13788,15 @@ arch cobblestones2
 x 48
 y 24
 end
+arch barn
+name Training Center
+name_pl Training Center
+slaying /scorn/crow/train/train
+hp 4
+sp 17
+x 48
+y 24
+end
 arch dungeon_magic
 x 48
 y 25
@@ -13672,6 +13829,12 @@ arch cobblestones2
 x 48
 y 28
 end
+arch barn
+name unused warehouse
+x 48
+y 28
+elevation 73
+end
 arch dungeon_magic
 x 48
 y 29
@@ -13772,6 +13935,15 @@ arch brush
 x 48
 y 39
 end
+arch temple1
+name Temple of Sorig
+name_pl Temple of Sorig
+slaying /scorn/temples/sorig
+hp 8
+sp 15
+x 48
+y 39
+end
 arch dungeon_magic
 x 48
 y 40
@@ -14074,6 +14246,15 @@ arch brush
 x 49
 y 31
 end
+arch barrack_up
+name Food Shop Warehouse
+name_pl Food Shop
+slaying /scorn/shops/foodshop
+hp 2
+sp 14
+x 49
+y 31
+end
 arch dungeon_magic
 x 49
 y 32
@@ -14256,176 +14437,3 @@ arch cwall_2_1_2
 x 49
 y 49
 end
-arch barn
-name dragon hangar
-name_pl dragon hangar
-x 41
-y 28
-end
-arch store_magic
-name Magic Shop
-name_pl Magic Shop
-slaying /scorn/shops/magicshop
-hp 14
-sp 14
-x 41
-y 31
-end
-arch city_tower
-name Friendly Giant's Tower
-slaying /scorn/kar/somehouse
-hp 14
-x 41
-y 34
-end
-arch stronghold
-slaying /scorn/misc/castle
-hp 11
-sp 20
-x 41
-y 44
-end
-arch dragon_exit
-name to Pupland Terminal
-name_pl to Pupland Terminal
-slaying /pup_land/terminal
-hp 10
-sp 2
-x 42
-y 23
-end
-arch longship
-x 43
-y 19
-end
-arch barn
-name dragon hangar
-name_pl dragon hangar
-x 43
-y 28
-end
-arch guild
-name West Scorn Trademarket
-name_pl West Scorn Trademarket
-slaying /mlab/mlabscrntrd1
-hp 1
-sp 10
-x 43
-y 34
-end
-arch church
-name Church of Valriel
-name_pl Church of Valriel
-slaying /scorn/temples/valriel
-hp 9
-sp 28
-x 43
-y 39
-end
-arch store_weapons
-name Weapon Shop
-name_pl Weapon shop
-slaying /scorn/shops/weaponshop
-hp 1
-sp 14
-x 44
-y 31
-end
-arch store_alchemy
-name Alchemy Shop
-name_pl Alchemy Shop
-slaying /scorn/shops/potionshop
-hp 14
-sp 14
-x 44
-y 36
-end
-arch t_house2
-name Temple of Gaea
-name_pl Temple of Gaea
-slaying /scorn/temples/gaea
-hp 12
-sp 18
-x 45
-y 39
-end
-arch barrack_long
-name Barracks
-name_pl Barracks
-slaying /scorn/houses/barracks
-hp 24
-sp 4
-x 46
-y 34
-end
-arch barrack_long
-name Mess Hall
-name_pl Mess Hall
-slaying /scorn/houses/messhall
-hp 24
-sp 4
-x 46
-y 35
-end
-arch barrack_up
-name Mercenaries Agency
-slaying /scorn/misc/mercenaries
-hp 6
-sp 15
-x 46
-y 36
-end
-arch s_ship
-x 47
-y 19
-end
-arch store_armour
-name Armour Shop
-name_pl Armour Shop
-slaying /scorn/shops/armourshop
-hp 14
-sp 1
-x 47
-y 31
-end
-arch store_weapons
-name Scorn's Best Bows
-slaying /scorn/shops/bowshop
-hp 14
-sp 14
-x 47
-y 36
-end
-arch barn
-name Training Center
-name_pl Training Center
-slaying /scorn/crow/train/train
-hp 4
-sp 17
-x 48
-y 24
-end
-arch barn
-name unused warehouse
-x 48
-y 28
-elevation 73
-end
-arch temple1
-name Temple of Sorig
-name_pl Temple of Sorig
-slaying /scorn/temples/sorig
-hp 8
-sp 15
-x 48
-y 39
-end
-arch barrack_up
-name Food Shop Warehouse
-name_pl Food Shop
-slaying /scorn/shops/foodshop
-hp 2
-sp 14
-x 49
-y 31
-end