diff --git a/scorn/misc/jail_upper b/scorn/misc/jail_upper
index 0b31aaaf3..31af2ac28 100644
--- a/scorn/misc/jail_upper
+++ b/scorn/misc/jail_upper
@@ -208,24 +208,48 @@ arch flagstone
 x 1
 y 8
 end
-arch flagstone
+arch dungeon_magic
 x 1
 y 9
 end
 arch flagstone
 x 1
+y 9
+end
+arch swall_1_4
+x 1
+y 9
+end
+arch dungeon_magic
+x 1
 y 10
 end
 arch flagstone
 x 1
+y 10
+end
+arch dungeon_magic
+x 1
 y 11
 end
 arch flagstone
 x 1
+y 11
+end
+arch dungeon_magic
+x 1
 y 12
 end
 arch flagstone
 x 1
+y 12
+end
+arch dungeon_magic
+x 1
+y 13
+end
+arch flagstone
+x 1
 y 13
 end
 arch dungeon_magic
@@ -281,12 +305,14 @@ arch flagstone
 x 2
 y 4
 end
-arch check_inv
-slaying prisoner
-last_sp 0
-no_pass 1
+arch magic_mouth
+msg
+You were summoned here because you have been
+naughty.
+Say "I understand" and the door will open.
+endmsg
 x 2
-y 5
+y 4
 end
 arch dungeon_magic
 x 2
@@ -296,10 +322,30 @@ arch flagstone
 x 2
 y 5
 end
-arch swall_2_1_2
+arch grate_closed_1
+connected 10
 x 2
 y 5
 end
+arch magic_ear
+msg
+@match I understand
+The door opens.
+endmsg
+connected 12
+x 2
+y 5
+end
+arch dungeon_magic
+x 2
+y 6
+end
+arch check_inv
+slaying jailkey
+connected 12
+x 2
+y 6
+end
 arch flagstone
 x 2
 y 6
@@ -308,28 +354,72 @@ arch flagstone
 x 2
 y 7
 end
-arch flagstone
+arch dungeon_magic
+x 2
+y 8
+end
+arch check_inv
+slaying jailkey
+connected 42
 x 2
 y 8
 end
 arch flagstone
 x 2
+y 8
+end
+arch dungeon_magic
+x 2
 y 9
 end
 arch flagstone
 x 2
+y 9
+end
+arch grate_closed_1
+connected 40
+x 2
+y 9
+end
+arch magic_ear
+msg
+@match I understand
+The door opens.
+endmsg
+connected 42
+x 2
+y 9
+end
+arch dungeon_magic
+x 2
 y 10
 end
 arch flagstone
 x 2
+y 10
+end
+arch dungeon_magic
+x 2
 y 11
 end
 arch flagstone
 x 2
+y 11
+end
+arch dungeon_magic
+x 2
 y 12
 end
 arch flagstone
 x 2
+y 12
+end
+arch dungeon_magic
+x 2
+y 13
+end
+arch flagstone
+x 2
 y 13
 end
 arch dungeon_magic
@@ -416,24 +506,48 @@ arch flagstone
 x 3
 y 8
 end
-arch flagstone
+arch dungeon_magic
 x 3
 y 9
 end
 arch flagstone
 x 3
+y 9
+end
+arch swall_2_1_2
+x 3
+y 9
+end
+arch dungeon_magic
+x 3
 y 10
 end
 arch flagstone
 x 3
+y 10
+end
+arch dungeon_magic
+x 3
 y 11
 end
 arch flagstone
 x 3
+y 11
+end
+arch dungeon_magic
+x 3
 y 12
 end
 arch flagstone
 x 3
+y 12
+end
+arch dungeon_magic
+x 3
+y 13
+end
+arch flagstone
+x 3
 y 13
 end
 arch dungeon_magic
@@ -465,6 +579,10 @@ arch flagstone
 x 4
 y 1
 end
+arch swall_2_1_1
+x 4
+y 1
+end
 arch dungeon_magic
 x 4
 y 2
@@ -473,6 +591,10 @@ arch flagstone
 x 4
 y 2
 end
+arch swall_2_1_1
+x 4
+y 2
+end
 arch dungeon_magic
 x 4
 y 3
@@ -481,6 +603,10 @@ arch flagstone
 x 4
 y 3
 end
+arch swall_2_1_1
+x 4
+y 3
+end
 arch dungeon_magic
 x 4
 y 4
@@ -489,6 +615,10 @@ arch flagstone
 x 4
 y 4
 end
+arch swall_2_1_1
+x 4
+y 4
+end
 arch dungeon_magic
 x 4
 y 5
@@ -497,7 +627,7 @@ arch flagstone
 x 4
 y 5
 end
-arch swall_2_1_2
+arch swall_3_1
 x 4
 y 5
 end
@@ -505,6 +635,11 @@ arch flagstone
 x 4
 y 6
 end
+arch light_guard
+name Waiting Cell Guard
+x 4
+y 6
+end
 arch flagstone
 x 4
 y 7
@@ -513,24 +648,69 @@ arch flagstone
 x 4
 y 8
 end
-arch flagstone
+arch light_guard
+name Waiting Cell Guard
+x 4
+y 8
+end
+arch dungeon_magic
 x 4
 y 9
 end
 arch flagstone
 x 4
+y 9
+end
+arch swall_3_3
+x 4
+y 9
+end
+arch dungeon_magic
+x 4
 y 10
 end
 arch flagstone
 x 4
+y 10
+end
+arch swall_2_1_1
+x 4
+y 10
+end
+arch dungeon_magic
+x 4
 y 11
 end
 arch flagstone
 x 4
+y 11
+end
+arch swall_2_1_1
+x 4
+y 11
+end
+arch dungeon_magic
+x 4
 y 12
 end
 arch flagstone
 x 4
+y 12
+end
+arch swall_2_1_1
+x 4
+y 12
+end
+arch dungeon_magic
+x 4
+y 13
+end
+arch flagstone
+x 4
+y 13
+end
+arch swall_2_1_1
+x 4
 y 13
 end
 arch dungeon_magic
@@ -598,23 +778,10 @@ arch swall_1_3
 x 5
 y 5
 end
-arch dungeon_magic
-x 5
-y 6
-end
 arch flagstone
 x 5
 y 6
 end
-arch guard
-name Waiting room Guard
-msg
-@match food|meal|starve|starving|hungry
-The Guard says: Only prisoners who show remorse may eat.
-endmsg
-x 5
-y 6
-end
 arch flagstone
 x 5
 y 7
@@ -623,24 +790,48 @@ arch flagstone
 x 5
 y 8
 end
-arch flagstone
+arch dungeon_magic
 x 5
 y 9
 end
 arch flagstone
 x 5
+y 9
+end
+arch swall_1_3
+x 5
+y 9
+end
+arch dungeon_magic
+x 5
 y 10
 end
 arch flagstone
 x 5
+y 10
+end
+arch dungeon_magic
+x 5
 y 11
 end
 arch flagstone
 x 5
+y 11
+end
+arch dungeon_magic
+x 5
 y 12
 end
 arch flagstone
 x 5
+y 12
+end
+arch dungeon_magic
+x 5
+y 13
+end
+arch flagstone
+x 5
 y 13
 end
 arch dungeon_magic
@@ -684,15 +875,6 @@ arch dungeon_magic
 x 6
 y 3
 end
-arch magic_ear
-msg
-@match sorry
-Since you have repented, you may eat today.
-endmsg
-connected 4
-x 6
-y 3
-end
 arch flagstone
 x 6
 y 3
@@ -709,7 +891,6 @@ arch magic_mouth
 msg
 You were summoned here because you have been
 naughty.
-
 Say "I understand" and the door will open.
 endmsg
 x 6
@@ -724,7 +905,7 @@ x 6
 y 5
 end
 arch grate_closed_1
-connected 10
+connected 20
 x 6
 y 5
 end
@@ -733,10 +914,20 @@ msg
 @match I understand
 The door opens.
 endmsg
-connected 12
+connected 22
 x 6
 y 5
 end
+arch dungeon_magic
+x 6
+y 6
+end
+arch check_inv
+slaying jailkey
+connected 22
+x 6
+y 6
+end
 arch flagstone
 x 6
 y 6
@@ -745,28 +936,72 @@ arch flagstone
 x 6
 y 7
 end
-arch flagstone
+arch dungeon_magic
+x 6
+y 8
+end
+arch check_inv
+slaying jailkey
+connected 52
 x 6
 y 8
 end
 arch flagstone
 x 6
+y 8
+end
+arch dungeon_magic
+x 6
 y 9
 end
 arch flagstone
 x 6
+y 9
+end
+arch grate_closed_1
+connected 50
+x 6
+y 9
+end
+arch magic_ear
+msg
+@match I understand
+The door opens.
+endmsg
+connected 52
+x 6
+y 9
+end
+arch dungeon_magic
+x 6
 y 10
 end
 arch flagstone
 x 6
+y 10
+end
+arch dungeon_magic
+x 6
 y 11
 end
 arch flagstone
 x 6
+y 11
+end
+arch dungeon_magic
+x 6
 y 12
 end
 arch flagstone
 x 6
+y 12
+end
+arch dungeon_magic
+x 6
+y 13
+end
+arch flagstone
+x 6
 y 13
 end
 arch dungeon_magic
@@ -834,316 +1069,439 @@ arch swall_1_4
 x 7
 y 5
 end
-arch dungeon_magic
+arch flagstone
 x 7
 y 6
 end
 arch flagstone
 x 7
+y 7
+end
+arch flagstone
+x 7
+y 8
+end
+arch dungeon_magic
+x 7
+y 9
+end
+arch flagstone
+x 7
+y 9
+end
+arch swall_1_4
+x 7
+y 9
+end
+arch dungeon_magic
+x 7
+y 10
+end
+arch flagstone
+x 7
+y 10
+end
+arch dungeon_magic
+x 7
+y 11
+end
+arch flagstone
+x 7
+y 11
+end
+arch dungeon_magic
+x 7
+y 12
+end
+arch flagstone
+x 7
+y 12
+end
+arch dungeon_magic
+x 7
+y 13
+end
+arch flagstone
+x 7
+y 13
+end
+arch dungeon_magic
+x 7
+y 14
+end
+arch flagstone
+x 7
+y 14
+end
+arch stwall_2_1_2
+x 7
+y 14
+end
+arch dungeon_magic
+x 8
+end
+arch flagstone
+x 8
+end
+arch stwall_2_1_2
+x 8
+end
+arch dungeon_magic
+x 8
+y 1
+end
+arch flagstone
+x 8
+y 1
+end
+arch swall_2_1_1
+x 8
+y 1
+end
+arch dungeon_magic
+x 8
+y 2
+end
+arch flagstone
+x 8
+y 2
+end
+arch swall_2_1_1
+x 8
+y 2
+end
+arch dungeon_magic
+x 8
+y 3
+end
+arch flagstone
+x 8
+y 3
+end
+arch swall_2_1_1
+x 8
+y 3
+end
+arch dungeon_magic
+x 8
+y 4
+end
+arch flagstone
+x 8
+y 4
+end
+arch swall_2_1_1
+x 8
+y 4
+end
+arch dungeon_magic
+x 8
+y 5
+end
+arch flagstone
+x 8
+y 5
+end
+arch swall_3_1
+x 8
+y 5
+end
+arch flagstone
+x 8
 y 6
 end
-arch guard
-name Waiting room Guard
+arch light_guard
+name Waiting Cell Guard
+x 8
+y 6
+end
+arch flagstone
+x 8
+y 7
+end
+arch flagstone
+x 8
+y 8
+end
+arch light_guard
+name Waiting Cell Guard
+x 8
+y 8
+end
+arch dungeon_magic
+x 8
+y 9
+end
+arch flagstone
+x 8
+y 9
+end
+arch swall_3_3
+x 8
+y 9
+end
+arch dungeon_magic
+x 8
+y 10
+end
+arch flagstone
+x 8
+y 10
+end
+arch swall_2_1_1
+x 8
+y 10
+end
+arch dungeon_magic
+x 8
+y 11
+end
+arch flagstone
+x 8
+y 11
+end
+arch swall_2_1_1
+x 8
+y 11
+end
+arch dungeon_magic
+x 8
+y 12
+end
+arch flagstone
+x 8
+y 12
+end
+arch swall_2_1_1
+x 8
+y 12
+end
+arch dungeon_magic
+x 8
+y 13
+end
+arch flagstone
+x 8
+y 13
+end
+arch swall_2_1_1
+x 8
+y 13
+end
+arch dungeon_magic
+x 8
+y 14
+end
+arch flagstone
+x 8
+y 14
+end
+arch stwall_2_1_2
+x 8
+y 14
+end
+arch dungeon_magic
+x 9
+end
+arch flagstone
+x 9
+end
+arch stwall_2_1_2
+x 9
+end
+arch dungeon_magic
+x 9
+y 1
+end
+arch flagstone
+x 9
+y 1
+end
+arch dungeon_magic
+x 9
+y 2
+end
+arch flagstone
+x 9
+y 2
+end
+arch dungeon_magic
+x 9
+y 3
+end
+arch flagstone
+x 9
+y 3
+end
+arch dungeon_magic
+x 9
+y 4
+end
+arch flagstone
+x 9
+y 4
+end
+arch dungeon_magic
+x 9
+y 5
+end
+arch flagstone
+x 9
+y 5
+end
+arch swall_2_1_2
+x 9
+y 5
+end
+arch flagstone
+x 9
+y 6
+end
+arch flagstone
+x 9
+y 7
+end
+arch flagstone
+x 9
+y 8
+end
+arch dungeon_magic
+x 9
+y 9
+end
+arch flagstone
+x 9
+y 9
+end
+arch swall_2_1_2
+x 9
+y 9
+end
+arch dungeon_magic
+x 9
+y 10
+end
+arch flagstone
+x 9
+y 10
+end
+arch dungeon_magic
+x 9
+y 11
+end
+arch flagstone
+x 9
+y 11
+end
+arch dungeon_magic
+x 9
+y 12
+end
+arch flagstone
+x 9
+y 12
+end
+arch dungeon_magic
+x 9
+y 13
+end
+arch flagstone
+x 9
+y 13
+end
+arch dungeon_magic
+x 9
+y 14
+end
+arch flagstone
+x 9
+y 14
+end
+arch stwall_2_1_2
+x 9
+y 14
+end
+arch dungeon_magic
+x 10
+end
+arch flagstone
+x 10
+end
+arch stwall_2_1_2
+x 10
+end
+arch dungeon_magic
+x 10
+y 1
+end
+arch flagstone
+x 10
+y 1
+end
+arch dungeon_magic
+x 10
+y 2
+end
+arch flagstone
+x 10
+y 2
+end
+arch dungeon_magic
+x 10
+y 3
+end
+arch flagstone
+x 10
+y 3
+end
+arch dungeon_magic
+x 10
+y 4
+end
+arch flagstone
+x 10
+y 4
+end
+arch magic_mouth
 msg
-@match food|meal|starve|starving|hungry
-The Guard says: Only prisoners who show remorse may eat.
+You were summoned here because you have been
+naughty.
+Say "I understand" and the door will open.
 endmsg
-x 7
+x 10
+y 4
+end
+arch dungeon_magic
+x 10
+y 5
+end
+arch flagstone
+x 10
+y 5
+end
+arch grate_closed_1
+connected 30
+x 10
+y 5
+end
+arch magic_ear
+msg
+@match I understand
+The door opens.
+endmsg
+connected 32
+x 10
+y 5
+end
+arch dungeon_magic
+x 10
 y 6
 end
-arch flagstone
-x 7
-y 7
-end
-arch flagstone
-x 7
-y 8
-end
-arch flagstone
-x 7
-y 9
-end
-arch flagstone
-x 7
-y 10
-end
-arch flagstone
-x 7
-y 11
-end
-arch flagstone
-x 7
-y 12
-end
-arch flagstone
-x 7
-y 13
-end
-arch dungeon_magic
-x 7
-y 14
-end
-arch flagstone
-x 7
-y 14
-end
-arch stwall_2_1_2
-x 7
-y 14
-end
-arch dungeon_magic
-x 8
-end
-arch flagstone
-x 8
-end
-arch stwall_2_1_2
-x 8
-end
-arch dungeon_magic
-x 8
-y 1
-end
-arch flagstone
-x 8
-y 1
-end
-arch dungeon_magic
-x 8
-y 2
-end
-arch flagstone
-x 8
-y 2
-end
-arch dungeon_magic
-x 8
-y 3
-end
-arch flagstone
-x 8
-y 3
-end
-arch dungeon_magic
-x 8
-y 4
-end
-arch flagstone
-x 8
-y 4
-end
-arch dungeon_magic
-x 8
-y 5
-end
-arch flagstone
-x 8
-y 5
-end
-arch swall_2_1_2
-x 8
-y 5
-end
-arch flagstone
-x 8
-y 6
-end
-arch flagstone
-x 8
-y 7
-end
-arch flagstone
-x 8
-y 8
-end
-arch flagstone
-x 8
-y 9
-end
-arch flagstone
-x 8
-y 10
-end
-arch flagstone
-x 8
-y 11
-end
-arch flagstone
-x 8
-y 12
-end
-arch flagstone
-x 8
-y 13
-end
-arch dungeon_magic
-x 8
-y 14
-end
-arch flagstone
-x 8
-y 14
-end
-arch stwall_2_1_2
-x 8
-y 14
-end
-arch dungeon_magic
-x 9
-end
-arch flagstone
-x 9
-end
-arch stwall_2_1_2
-x 9
-end
-arch dungeon_magic
-x 9
-y 1
-end
-arch flagstone
-x 9
-y 1
-end
-arch dungeon_magic
-x 9
-y 2
-end
-arch flagstone
-x 9
-y 2
-end
-arch dungeon_magic
-x 9
-y 3
-end
-arch flagstone
-x 9
-y 3
-end
-arch dungeon_magic
-x 9
-y 4
-end
-arch flagstone
-x 9
-y 4
-end
-arch dungeon_magic
-x 9
-y 5
-end
-arch flagstone
-x 9
-y 5
-end
-arch swall_2_1_2
-x 9
-y 5
-end
-arch flagstone
-x 9
-y 6
-end
-arch flagstone
-x 9
-y 7
-end
-arch flagstone
-x 9
-y 8
-end
-arch flagstone
-x 9
-y 9
-end
-arch flagstone
-x 9
-y 10
-end
-arch flagstone
-x 9
-y 11
-end
-arch flagstone
-x 9
-y 12
-end
-arch flagstone
-x 9
-y 13
-end
-arch dungeon_magic
-x 9
-y 14
-end
-arch flagstone
-x 9
-y 14
-end
-arch stwall_2_1_2
-x 9
-y 14
-end
-arch dungeon_magic
-x 10
-end
-arch flagstone
-x 10
-end
-arch stwall_2_1_2
-x 10
-end
-arch dungeon_magic
-x 10
-y 1
-end
-arch flagstone
-x 10
-y 1
-end
-arch dungeon_magic
-x 10
-y 2
-end
-arch flagstone
-x 10
-y 2
-end
-arch dungeon_magic
-x 10
-y 3
-end
-arch flagstone
-x 10
-y 3
-end
-arch dungeon_magic
-x 10
-y 4
-end
-arch flagstone
-x 10
-y 4
-end
 arch check_inv
-slaying prisoner
-last_sp 0
-no_pass 1
+slaying jailkey
+connected 32
 x 10
-y 5
-end
-arch dungeon_magic
-x 10
-y 5
-end
-arch flagstone
-x 10
-y 5
-end
-arch swall_2_1_2
-x 10
-y 5
+y 6
 end
 arch flagstone
 x 10
@@ -1153,28 +1511,72 @@ arch flagstone
 x 10
 y 7
 end
-arch flagstone
+arch dungeon_magic
+x 10
+y 8
+end
+arch check_inv
+slaying jailkey
+connected 62
 x 10
 y 8
 end
 arch flagstone
 x 10
+y 8
+end
+arch dungeon_magic
+x 10
 y 9
 end
 arch flagstone
 x 10
+y 9
+end
+arch grate_closed_1
+connected 60
+x 10
+y 9
+end
+arch magic_ear
+msg
+@match I understand
+The door opens.
+endmsg
+connected 62
+x 10
+y 9
+end
+arch dungeon_magic
+x 10
 y 10
 end
 arch flagstone
 x 10
+y 10
+end
+arch dungeon_magic
+x 10
 y 11
 end
 arch flagstone
 x 10
+y 11
+end
+arch dungeon_magic
+x 10
 y 12
 end
 arch flagstone
 x 10
+y 12
+end
+arch dungeon_magic
+x 10
+y 13
+end
+arch flagstone
+x 10
 y 13
 end
 arch dungeon_magic
@@ -1254,24 +1656,48 @@ arch flagstone
 x 11
 y 8
 end
-arch flagstone
+arch dungeon_magic
 x 11
 y 9
 end
 arch flagstone
 x 11
+y 9
+end
+arch swall_2_1_2
+x 11
+y 9
+end
+arch dungeon_magic
+x 11
 y 10
 end
 arch flagstone
 x 11
+y 10
+end
+arch dungeon_magic
+x 11
 y 11
 end
 arch flagstone
 x 11
+y 11
+end
+arch dungeon_magic
+x 11
 y 12
 end
 arch flagstone
 x 11
+y 12
+end
+arch dungeon_magic
+x 11
+y 13
+end
+arch flagstone
+x 11
 y 13
 end
 arch dungeon_magic
@@ -1303,6 +1729,10 @@ arch flagstone
 x 12
 y 1
 end
+arch swall_2_1_1
+x 12
+y 1
+end
 arch dungeon_magic
 x 12
 y 2
@@ -1311,6 +1741,10 @@ arch flagstone
 x 12
 y 2
 end
+arch swall_2_1_1
+x 12
+y 2
+end
 arch dungeon_magic
 x 12
 y 3
@@ -1319,6 +1753,10 @@ arch flagstone
 x 12
 y 3
 end
+arch swall_2_1_1
+x 12
+y 3
+end
 arch dungeon_magic
 x 12
 y 4
@@ -1327,11 +1765,19 @@ arch flagstone
 x 12
 y 4
 end
+arch swall_2_1_1
+x 12
+y 4
+end
+arch dungeon_magic
+x 12
+y 5
+end
 arch flagstone
 x 12
 y 5
 end
-arch swall_1_3
+arch swall_2_2_4
 x 12
 y 5
 end
@@ -1347,24 +1793,64 @@ arch flagstone
 x 12
 y 8
 end
-arch flagstone
+arch dungeon_magic
 x 12
 y 9
 end
 arch flagstone
 x 12
+y 9
+end
+arch swall_2_2_3
+x 12
+y 9
+end
+arch dungeon_magic
+x 12
 y 10
 end
 arch flagstone
 x 12
+y 10
+end
+arch swall_2_1_1
+x 12
+y 10
+end
+arch dungeon_magic
+x 12
 y 11
 end
 arch flagstone
 x 12
+y 11
+end
+arch swall_2_1_1
+x 12
+y 11
+end
+arch dungeon_magic
+x 12
 y 12
 end
 arch flagstone
 x 12
+y 12
+end
+arch swall_2_1_1
+x 12
+y 12
+end
+arch dungeon_magic
+x 12
+y 13
+end
+arch flagstone
+x 12
+y 13
+end
+arch swall_2_1_1
+x 12
 y 13
 end
 arch dungeon_magic
@@ -1456,7 +1942,7 @@ arch flagstone
 x 13
 y 6
 end
-arch stwall_2_1_1
+arch stwall_3_2
 x 13
 y 6
 end
@@ -1480,7 +1966,7 @@ arch flagstone
 x 13
 y 8
 end
-arch stwall_2_1_1
+arch stwall_3_2
 x 13
 y 8
 end
@@ -1566,7 +2052,20 @@ arch stwall_2_1_2
 x 14
 end
 arch flagstone
-no_pass 1
+x 14
+y 1
+end
+arch dungeon_magic
+x 14
+y 1
+end
+arch button_small
+connected 10
+x 14
+y 1
+end
+arch gateTrg1
+connected 12
 x 14
 y 1
 end
@@ -1576,11 +2075,25 @@ x 14
 y 2
 end
 arch flagstone
-no_pass 1
+x 14
+y 3
+end
+arch dungeon_magic
+x 14
+y 3
+end
+arch button_small
+connected 20
+x 14
+y 3
+end
+arch gateTrg1
+connected 22
 x 14
 y 3
 end
 arch flagstone
+no_pass 1
 x 14
 y 4
 end
@@ -1588,15 +2101,63 @@ arch flagstone
 x 14
 y 5
 end
+arch dungeon_magic
+x 14
+y 5
+end
+arch button_small
+connected 30
+x 14
+y 5
+end
+arch gateTrg1
+connected 32
+x 14
+y 5
+end
 arch flagstone
+no_pass 1
 x 14
 y 6
 end
-arch flagstone
+arch dungeon_magic
+x 14
+y 6
+end
+arch stwall_2_1_2
+x 14
+y 6
+end
+arch dungeon_magic
 x 14
 y 7
 end
 arch flagstone
+no_pass 1
+x 14
+y 7
+end
+arch sign
+name Instructions
+msg
+Step into a waiting cell. Summon a character there.
+Saying 'I understand' near a waiting cell door will open it.
+The Warden's key will allow you to open waiting cell doors when you are not flying (dm).
+When the door is open the character will be able to leave.
+endmsg
+x 14
+y 7
+end
+arch flagstone
+no_pass 1
+x 14
+y 8
+end
+arch dungeon_magic
+x 14
+y 8
+end
+arch stwall_2_1_2
 x 14
 y 8
 end
@@ -1604,7 +2165,22 @@ arch flagstone
 x 14
 y 9
 end
+arch dungeon_magic
+x 14
+y 9
+end
+arch button_small
+connected 40
+x 14
+y 9
+end
+arch gateTrg1
+connected 42
+x 14
+y 9
+end
 arch flagstone
+no_pass 1
 x 14
 y 10
 end
@@ -1612,7 +2188,22 @@ arch flagstone
 x 14
 y 11
 end
+arch dungeon_magic
+x 14
+y 11
+end
+arch button_small
+connected 50
+x 14
+y 11
+end
+arch gateTrg1
+connected 52
+x 14
+y 11
+end
 arch flagstone
+no_pass 1
 x 14
 y 12
 end
@@ -1622,6 +2213,20 @@ y 13
 end
 arch dungeon_magic
 x 14
+y 13
+end
+arch button_small
+connected 60
+x 14
+y 13
+end
+arch gateTrg1
+connected 62
+x 14
+y 13
+end
+arch dungeon_magic
+x 14
 y 14
 end
 arch flagstone
@@ -1645,59 +2250,59 @@ arch flagstone
 x 15
 y 1
 end
-arch flagstone
-x 15
-y 1
-end
 arch dungeon_magic
 x 15
 y 1
 end
 arch button_small
-connected 10
-x 15
-y 1
-end
-arch gateTrg1
-connected 12
-x 15
-y 1
-end
-arch flagstone
-x 15
-y 2
-end
-arch flagstone
-x 15
-y 2
-end
-arch dungeon_magic
-x 15
-y 2
-end
-arch button_small
 face button_sma.112
 value 1
-connected 20
+connected 15
 x 15
-y 2
+y 1
 end
 arch spikes_open
 speed 0.500000
-connected 20
+connected 15
 x 15
-y 2
+y 1
 end
 arch boulder
 x 15
-y 2
+y 1
 end
 arch flagstone
 no_pass 1
 x 15
+y 2
+end
+arch flagstone
+x 15
+y 3
+end
+arch dungeon_magic
+x 15
+y 3
+end
+arch button_small
+face button_sma.112
+value 1
+connected 25
+x 15
+y 3
+end
+arch spikes_open
+speed 0.500000
+connected 25
+x 15
+y 3
+end
+arch boulder
+x 15
 y 3
 end
 arch flagstone
+no_pass 1
 x 15
 y 4
 end
@@ -1705,15 +2310,65 @@ arch flagstone
 x 15
 y 5
 end
+arch dungeon_magic
+x 15
+y 5
+end
+arch button_small
+face button_sma.112
+value 1
+connected 35
+x 15
+y 5
+end
+arch spikes_open
+speed 0.500000
+connected 35
+x 15
+y 5
+end
+arch boulder
+x 15
+y 5
+end
 arch flagstone
+no_pass 1
 x 15
 y 6
 end
-arch flagstone
+arch dungeon_magic
+x 15
+y 6
+end
+arch stwall_2_1_2
+x 15
+y 6
+end
+arch dungeon_magic
 x 15
 y 7
 end
 arch flagstone
+no_pass 1
+x 15
+y 7
+end
+arch key2
+name Warden's Key
+slaying jailkey
+x 15
+y 7
+end
+arch flagstone
+no_pass 1
+x 15
+y 8
+end
+arch dungeon_magic
+x 15
+y 8
+end
+arch stwall_2_1_2
 x 15
 y 8
 end
@@ -1721,7 +2376,29 @@ arch flagstone
 x 15
 y 9
 end
+arch dungeon_magic
+x 15
+y 9
+end
+arch button_small
+face button_sma.112
+value 1
+connected 45
+x 15
+y 9
+end
+arch spikes_open
+speed 0.500000
+connected 45
+x 15
+y 9
+end
+arch boulder
+x 15
+y 9
+end
 arch flagstone
+no_pass 1
 x 15
 y 10
 end
@@ -1729,7 +2406,29 @@ arch flagstone
 x 15
 y 11
 end
+arch dungeon_magic
+x 15
+y 11
+end
+arch button_small
+face button_sma.112
+value 1
+connected 55
+x 15
+y 11
+end
+arch spikes_open
+speed 0.500000
+connected 55
+x 15
+y 11
+end
+arch boulder
+x 15
+y 11
+end
 arch flagstone
+no_pass 1
 x 15
 y 12
 end
@@ -1739,6 +2438,27 @@ y 13
 end
 arch dungeon_magic
 x 15
+y 13
+end
+arch button_small
+face button_sma.112
+value 1
+connected 65
+x 15
+y 13
+end
+arch spikes_open
+speed 0.500000
+connected 65
+x 15
+y 13
+end
+arch boulder
+x 15
+y 13
+end
+arch dungeon_magic
+x 15
 y 14
 end
 arch flagstone