diff --git a/pup_land/lone_town/mshop b/pup_land/lone_town/mshop
index fb47bddf0..572bba89e 100644
--- a/pup_land/lone_town/mshop
+++ b/pup_land/lone_town/mshop
@@ -9,7 +9,7 @@ enter_x 4
 enter_y 1
 msg
 Created:  1996-01-29
-Modified: 2012-03-01 Rick Tanner
+Modified: 2021-02-27 Daniel Hawkins
 endmsg
 end
 arch grass
@@ -412,10 +412,6 @@ arch wwall_win2
 x 2
 y 23
 end
-arch shop_empty
-x 2
-y 24
-end
 arch shop_gems
 x 2
 y 24
@@ -424,10 +420,6 @@ arch shop_empty
 x 2
 y 25
 end
-arch shop_empty
-x 2
-y 26
-end
 arch shop_gems
 x 2
 y 26
@@ -495,10 +487,6 @@ x 3
 y 6
 level 20
 end
-arch shop_empty
-x 3
-y 7
-end
 arch shop_scrolls
 x 3
 y 7
@@ -511,10 +499,6 @@ arch swall_1_4
 x 3
 y 8
 end
-arch shop_empty
-x 3
-y 9
-end
 arch shop_scrolls
 x 3
 y 9
@@ -740,10 +724,6 @@ arch wwall_win2
 x 4
 y 23
 end
-arch shop_empty
-x 4
-y 24
-end
 arch shop_gems
 x 4
 y 24
@@ -752,10 +732,6 @@ arch shop_empty
 x 4
 y 25
 end
-arch shop_empty
-x 4
-y 26
-end
 arch shop_gems
 x 4
 y 26
@@ -802,10 +778,6 @@ arch shop_empty
 x 5
 y 6
 end
-arch shop_empty
-x 5
-y 7
-end
 arch shop_scrolls
 x 5
 y 7
@@ -818,10 +790,6 @@ arch swall_2_1_2
 x 5
 y 8
 end
-arch shop_empty
-x 5
-y 9
-end
 arch shop_scrolls
 x 5
 y 9
@@ -830,10 +798,6 @@ arch shop_empty
 x 5
 y 10
 end
-arch shop_empty
-x 5
-y 11
-end
 arch shop_scrolls
 x 5
 y 11
@@ -1048,10 +1012,6 @@ arch wwall_win2
 x 6
 y 23
 end
-arch shop_empty
-x 6
-y 24
-end
 arch shop_gems
 x 6
 y 24
@@ -1060,10 +1020,6 @@ arch shop_empty
 x 6
 y 25
 end
-arch shop_empty
-x 6
-y 26
-end
 arch shop_gems
 x 6
 y 26
@@ -1114,10 +1070,6 @@ arch shop_empty
 x 7
 y 6
 end
-arch shop_empty
-x 7
-y 7
-end
 arch shop_scrolls
 x 7
 y 7
@@ -1130,10 +1082,6 @@ arch swall_2_1_2
 x 7
 y 8
 end
-arch shop_empty
-x 7
-y 9
-end
 arch shop_scrolls
 x 7
 y 9
@@ -1142,10 +1090,6 @@ arch shop_empty
 x 7
 y 10
 end
-arch shop_empty
-x 7
-y 11
-end
 arch shop_scrolls
 x 7
 y 11
@@ -1363,10 +1307,6 @@ arch wwall_win2
 x 8
 y 23
 end
-arch shop_empty
-x 8
-y 24
-end
 arch shop_gems
 x 8
 y 24
@@ -1375,10 +1315,6 @@ arch shop_empty
 x 8
 y 25
 end
-arch shop_empty
-x 8
-y 26
-end
 arch shop_gems
 x 8
 y 26
@@ -1421,10 +1357,6 @@ arch shop_empty
 x 9
 y 6
 end
-arch shop_empty
-x 9
-y 7
-end
 arch shop_scrolls
 x 9
 y 7
@@ -1437,10 +1369,6 @@ arch swall_2_1_2
 x 9
 y 8
 end
-arch shop_empty
-x 9
-y 9
-end
 arch shop_scrolls
 x 9
 y 9
@@ -1449,10 +1377,6 @@ arch shop_empty
 x 9
 y 10
 end
-arch shop_empty
-x 9
-y 11
-end
 arch shop_scrolls
 x 9
 y 11
@@ -1559,10 +1483,6 @@ arch shop_empty
 x 10
 y 1
 end
-arch shop_empty
-x 10
-y 2
-end
 arch shop_scrolls
 x 10
 y 2
@@ -1571,10 +1491,6 @@ arch shop_empty
 x 10
 y 3
 end
-arch shop_empty
-x 10
-y 4
-end
 arch shop_scrolls
 x 10
 y 4
@@ -1583,10 +1499,6 @@ arch shop_empty
 x 10
 y 5
 end
-arch shop_empty
-x 10
-y 6
-end
 arch shop_scrolls
 x 10
 y 6
@@ -1671,10 +1583,6 @@ arch wwall_win2
 x 10
 y 21
 end
-arch shop_empty
-x 10
-y 22
-end
 arch shop_gems
 x 10
 y 22
@@ -1683,10 +1591,6 @@ arch shop_empty
 x 10
 y 23
 end
-arch shop_empty
-x 10
-y 24
-end
 arch shop_gems
 x 10
 y 24
@@ -1695,10 +1599,6 @@ arch shop_empty
 x 10
 y 25
 end
-arch shop_empty
-x 10
-y 26
-end
 arch shop_gems
 x 10
 y 26
@@ -1773,10 +1673,6 @@ arch swall_2_2_4
 x 11
 y 8
 end
-arch shop_empty
-x 11
-y 9
-end
 arch shop_scrolls
 x 11
 y 9
@@ -1785,10 +1681,6 @@ arch shop_empty
 x 11
 y 10
 end
-arch shop_empty
-x 11
-y 11
-end
 arch shop_scrolls
 x 11
 y 11
@@ -1891,10 +1783,6 @@ arch shop_empty
 x 12
 y 1
 end
-arch shop_empty
-x 12
-y 2
-end
 arch shop_scrolls
 x 12
 y 2
@@ -1903,10 +1791,6 @@ arch shop_empty
 x 12
 y 3
 end
-arch shop_empty
-x 12
-y 4
-end
 arch shop_scrolls
 x 12
 y 4
@@ -1915,10 +1799,6 @@ arch shop_empty
 x 12
 y 5
 end
-arch shop_empty
-x 12
-y 6
-end
 arch shop_scrolls
 x 12
 y 6
@@ -1927,10 +1807,6 @@ arch shop_empty
 x 12
 y 7
 end
-arch shop_empty
-x 12
-y 8
-end
 arch shop_scrolls
 x 12
 y 8
@@ -1947,10 +1823,6 @@ arch shop_empty
 x 12
 y 11
 end
-arch shop_empty
-x 12
-y 12
-end
 arch shop_scrolls
 x 12
 y 12
@@ -2027,10 +1899,6 @@ arch wwall_2_2_4
 x 12
 y 21
 end
-arch shop_empty
-x 12
-y 22
-end
 arch shop_gems
 x 12
 y 22
@@ -2047,10 +1915,6 @@ arch shop_empty
 x 12
 y 25
 end
-arch shop_empty
-x 12
-y 26
-end
 arch shop_gems
 x 12
 y 26
@@ -2191,10 +2055,6 @@ arch shop_empty
 x 14
 y 1
 end
-arch shop_empty
-x 14
-y 2
-end
 arch shop_amulets
 x 14
 y 2
@@ -2203,10 +2063,6 @@ arch shop_empty
 x 14
 y 3
 end
-arch shop_empty
-x 14
-y 4
-end
 arch shop_amulets
 x 14
 y 4
@@ -2215,10 +2071,6 @@ arch shop_empty
 x 14
 y 5
 end
-arch shop_empty
-x 14
-y 6
-end
 arch shop_amulets
 x 14
 y 6
@@ -2227,10 +2079,6 @@ arch shop_empty
 x 14
 y 7
 end
-arch shop_empty
-x 14
-y 8
-end
 arch shop_amulets
 x 14
 y 8
@@ -2251,10 +2099,6 @@ arch shop_empty
 x 14
 y 12
 end
-arch shop_empty
-x 14
-y 13
-end
 arch shop_books
 x 14
 y 13
@@ -2263,10 +2107,6 @@ arch shop_empty
 x 14
 y 14
 end
-arch shop_empty
-x 14
-y 15
-end
 arch shop_books
 x 14
 y 15
@@ -2275,10 +2115,6 @@ arch shop_empty
 x 14
 y 16
 end
-arch shop_empty
-x 14
-y 17
-end
 arch shop_books
 x 14
 y 17
@@ -2287,10 +2123,6 @@ arch shop_empty
 x 14
 y 18
 end
-arch shop_empty
-x 14
-y 19
-end
 arch shop_books
 x 14
 y 19
@@ -2299,10 +2131,6 @@ arch shop_empty
 x 14
 y 20
 end
-arch shop_empty
-x 14
-y 21
-end
 arch shop_books
 x 14
 y 21
@@ -2311,10 +2139,6 @@ arch shop_empty
 x 14
 y 22
 end
-arch shop_empty
-x 14
-y 23
-end
 arch shop_books
 x 14
 y 23
@@ -2323,10 +2147,6 @@ arch shop_empty
 x 14
 y 24
 end
-arch shop_empty
-x 14
-y 25
-end
 arch shop_books
 x 14
 y 25
@@ -2551,10 +2371,6 @@ arch shop_empty
 x 16
 y 1
 end
-arch shop_empty
-x 16
-y 2
-end
 arch shop_amulets
 x 16
 y 2
@@ -2563,10 +2379,6 @@ arch shop_empty
 x 16
 y 3
 end
-arch shop_empty
-x 16
-y 4
-end
 arch shop_amulets
 x 16
 y 4
@@ -2575,10 +2387,6 @@ arch shop_empty
 x 16
 y 5
 end
-arch shop_empty
-x 16
-y 6
-end
 arch shop_amulets
 x 16
 y 6
@@ -2587,10 +2395,6 @@ arch shop_empty
 x 16
 y 7
 end
-arch shop_empty
-x 16
-y 8
-end
 arch shop_amulets
 x 16
 y 8
@@ -2611,10 +2415,6 @@ arch shop_empty
 x 16
 y 12
 end
-arch shop_empty
-x 16
-y 13
-end
 arch shop_books
 x 16
 y 13
@@ -2623,10 +2423,6 @@ arch shop_empty
 x 16
 y 14
 end
-arch shop_empty
-x 16
-y 15
-end
 arch shop_books
 x 16
 y 15
@@ -2635,10 +2431,6 @@ arch shop_empty
 x 16
 y 16
 end
-arch shop_empty
-x 16
-y 17
-end
 arch shop_books
 x 16
 y 17
@@ -2647,10 +2439,6 @@ arch shop_empty
 x 16
 y 18
 end
-arch shop_empty
-x 16
-y 19
-end
 arch shop_books
 x 16
 y 19
@@ -2659,10 +2447,6 @@ arch shop_empty
 x 16
 y 20
 end
-arch shop_empty
-x 16
-y 21
-end
 arch shop_books
 x 16
 y 21
@@ -2671,10 +2455,6 @@ arch shop_empty
 x 16
 y 22
 end
-arch shop_empty
-x 16
-y 23
-end
 arch shop_books
 x 16
 y 23
@@ -2683,10 +2463,6 @@ arch shop_empty
 x 16
 y 24
 end
-arch shop_empty
-x 16
-y 25
-end
 arch shop_books
 x 16
 y 25
@@ -2835,10 +2611,6 @@ arch shop_empty
 x 18
 y 2
 end
-arch shop_empty
-x 18
-y 3
-end
 arch shop_wands
 x 18
 y 3
@@ -2847,10 +2619,6 @@ arch shop_empty
 x 18
 y 4
 end
-arch shop_empty
-x 18
-y 5
-end
 arch shop_wands
 x 18
 y 5
@@ -2859,10 +2627,6 @@ arch shop_empty
 x 18
 y 6
 end
-arch shop_empty
-x 18
-y 7
-end
 arch shop_wands
 x 18
 y 7
@@ -2871,10 +2635,6 @@ arch shop_empty
 x 18
 y 8
 end
-arch shop_empty
-x 18
-y 9
-end
 arch shop_wands
 x 18
 y 9
@@ -2887,10 +2647,6 @@ arch shop_empty
 x 18
 y 11
 end
-arch shop_empty
-x 18
-y 12
-end
 arch shop_books
 x 18
 y 12
@@ -2899,10 +2655,6 @@ arch shop_empty
 x 18
 y 13
 end
-arch shop_empty
-x 18
-y 14
-end
 arch shop_books
 x 18
 y 14
@@ -2911,10 +2663,6 @@ arch shop_empty
 x 18
 y 15
 end
-arch shop_empty
-x 18
-y 16
-end
 arch shop_books
 x 18
 y 16
@@ -2923,10 +2671,6 @@ arch shop_empty
 x 18
 y 17
 end
-arch shop_empty
-x 18
-y 18
-end
 arch shop_books
 x 18
 y 18
@@ -2935,10 +2679,6 @@ arch shop_empty
 x 18
 y 19
 end
-arch shop_empty
-x 18
-y 20
-end
 arch shop_books
 x 18
 y 20
@@ -2947,10 +2687,6 @@ arch shop_empty
 x 18
 y 21
 end
-arch shop_empty
-x 18
-y 22
-end
 arch shop_books
 x 18
 y 22
@@ -2959,10 +2695,6 @@ arch shop_empty
 x 18
 y 23
 end
-arch shop_empty
-x 18
-y 24
-end
 arch shop_books
 x 18
 y 24
@@ -2993,10 +2725,6 @@ arch shop_empty
 x 19
 y 1
 end
-arch shop_empty
-x 19
-y 2
-end
 arch shop_wands
 x 19
 y 2
@@ -3169,10 +2897,6 @@ arch swall_1_2
 x 19
 y 24
 end
-arch shop_empty
-x 19
-y 25
-end
 arch shop_books
 x 19
 y 25
@@ -3203,10 +2927,6 @@ arch shop_empty
 x 20
 y 2
 end
-arch shop_empty
-x 20
-y 3
-end
 arch shop_wands
 x 20
 y 3
@@ -3215,10 +2935,6 @@ arch shop_empty
 x 20
 y 4
 end
-arch shop_empty
-x 20
-y 5
-end
 arch shop_wands
 x 20
 y 5
@@ -3227,10 +2943,6 @@ arch shop_empty
 x 20
 y 6
 end
-arch shop_empty
-x 20
-y 7
-end
 arch shop_wands
 x 20
 y 7
@@ -3239,10 +2951,6 @@ arch shop_empty
 x 20
 y 8
 end
-arch shop_empty
-x 20
-y 9
-end
 arch shop_wands
 x 20
 y 9
@@ -3255,10 +2963,6 @@ arch shop_empty
 x 20
 y 11
 end
-arch shop_empty
-x 20
-y 12
-end
 arch shop_books
 x 20
 y 12
@@ -3267,10 +2971,6 @@ arch shop_empty
 x 20
 y 13
 end
-arch shop_empty
-x 20
-y 14
-end
 arch shop_books
 x 20
 y 14
@@ -3279,10 +2979,6 @@ arch shop_empty
 x 20
 y 15
 end
-arch shop_empty
-x 20
-y 16
-end
 arch shop_books
 x 20
 y 16
@@ -3291,10 +2987,6 @@ arch shop_empty
 x 20
 y 17
 end
-arch shop_empty
-x 20
-y 18
-end
 arch shop_books
 x 20
 y 18
@@ -3303,10 +2995,6 @@ arch shop_empty
 x 20
 y 19
 end
-arch shop_empty
-x 20
-y 20
-end
 arch shop_books
 x 20
 y 20
@@ -3315,10 +3003,6 @@ arch shop_empty
 x 20
 y 21
 end
-arch shop_empty
-x 20
-y 22
-end
 arch shop_books
 x 20
 y 22
@@ -3327,10 +3011,6 @@ arch shop_empty
 x 20
 y 23
 end
-arch shop_empty
-x 20
-y 24
-end
 arch shop_books
 x 20
 y 24
@@ -3491,10 +3171,6 @@ arch shop_empty
 x 22
 y 4
 end
-arch shop_empty
-x 22
-y 5
-end
 arch shop_scrolls
 x 22
 y 5
@@ -3503,10 +3179,6 @@ arch shop_empty
 x 22
 y 6
 end
-arch shop_empty
-x 22
-y 7
-end
 arch shop_scrolls
 x 22
 y 7
@@ -3515,10 +3187,6 @@ arch shop_empty
 x 22
 y 8
 end
-arch shop_empty
-x 22
-y 9
-end
 arch shop_scrolls
 x 22
 y 9
@@ -3535,10 +3203,6 @@ arch shop_empty
 x 22
 y 12
 end
-arch shop_empty
-x 22
-y 13
-end
 arch shop_books
 x 22
 y 13
@@ -3547,10 +3211,6 @@ arch shop_empty
 x 22
 y 14
 end
-arch shop_empty
-x 22
-y 15
-end
 arch shop_books
 x 22
 y 15
@@ -3559,10 +3219,6 @@ arch shop_empty
 x 22
 y 16
 end
-arch shop_empty
-x 22
-y 17
-end
 arch shop_books
 x 22
 y 17
@@ -3571,10 +3227,6 @@ arch shop_empty
 x 22
 y 18
 end
-arch shop_empty
-x 22
-y 19
-end
 arch shop_books
 x 22
 y 19
@@ -3583,10 +3235,6 @@ arch shop_empty
 x 22
 y 20
 end
-arch shop_empty
-x 22
-y 21
-end
 arch shop_books
 x 22
 y 21
@@ -3595,10 +3243,6 @@ arch shop_empty
 x 22
 y 22
 end
-arch shop_empty
-x 22
-y 23
-end
 arch shop_books
 x 22
 y 23
@@ -3607,10 +3251,6 @@ arch shop_empty
 x 22
 y 24
 end
-arch shop_empty
-x 22
-y 25
-end
 arch shop_books
 x 22
 y 25
@@ -3850,10 +3490,6 @@ arch shop_empty
 x 24
 y 4
 end
-arch shop_empty
-x 24
-y 5
-end
 arch shop_scrolls
 x 24
 y 5
@@ -3862,10 +3498,6 @@ arch shop_empty
 x 24
 y 6
 end
-arch shop_empty
-x 24
-y 7
-end
 arch shop_scrolls
 x 24
 y 7
@@ -3874,10 +3506,6 @@ arch shop_empty
 x 24
 y 8
 end
-arch shop_empty
-x 24
-y 9
-end
 arch shop_scrolls
 x 24
 y 9
@@ -3894,10 +3522,6 @@ arch shop_empty
 x 24
 y 12
 end
-arch shop_empty
-x 24
-y 13
-end
 arch shop_books
 x 24
 y 13
@@ -3906,10 +3530,6 @@ arch shop_empty
 x 24
 y 14
 end
-arch shop_empty
-x 24
-y 15
-end
 arch shop_books
 x 24
 y 15
@@ -3918,10 +3538,6 @@ arch shop_empty
 x 24
 y 16
 end
-arch shop_empty
-x 24
-y 17
-end
 arch shop_books
 x 24
 y 17
@@ -3930,10 +3546,6 @@ arch shop_empty
 x 24
 y 18
 end
-arch shop_empty
-x 24
-y 19
-end
 arch shop_books
 x 24
 y 19
@@ -3942,10 +3554,6 @@ arch shop_empty
 x 24
 y 20
 end
-arch shop_empty
-x 24
-y 21
-end
 arch shop_books
 x 24
 y 21
@@ -3954,10 +3562,6 @@ arch shop_empty
 x 24
 y 22
 end
-arch shop_empty
-x 24
-y 23
-end
 arch shop_books
 x 24
 y 23
@@ -3966,10 +3570,6 @@ arch shop_empty
 x 24
 y 24
 end
-arch shop_empty
-x 24
-y 25
-end
 arch shop_books
 x 24
 y 25
@@ -4133,10 +3733,6 @@ arch wwall_2_1_2
 x 26
 y 2
 end
-arch shop_empty
-x 26
-y 3
-end
 arch shop_potions
 x 26
 y 3
@@ -4145,10 +3741,6 @@ arch shop_empty
 x 26
 y 4
 end
-arch shop_empty
-x 26
-y 5
-end
 arch shop_potions
 x 26
 y 5
@@ -4157,10 +3749,6 @@ arch shop_empty
 x 26
 y 6
 end
-arch shop_empty
-x 26
-y 7
-end
 arch shop_potions
 x 26
 y 7
@@ -4169,10 +3757,6 @@ arch shop_empty
 x 26
 y 8
 end
-arch shop_empty
-x 26
-y 9
-end
 arch shop_potions
 x 26
 y 9
@@ -4181,10 +3765,6 @@ arch shop_empty
 x 26
 y 10
 end
-arch shop_empty
-x 26
-y 11
-end
 arch shop_potions
 x 26
 y 11
@@ -4193,10 +3773,6 @@ arch shop_empty
 x 26
 y 12
 end
-arch shop_empty
-x 26
-y 13
-end
 arch shop_potions
 x 26
 y 13
@@ -4205,10 +3781,6 @@ arch shop_empty
 x 26
 y 14
 end
-arch shop_empty
-x 26
-y 15
-end
 arch shop_potions
 x 26
 y 15
@@ -4217,10 +3789,6 @@ arch shop_empty
 x 26
 y 16
 end
-arch shop_empty
-x 26
-y 17
-end
 arch shop_potions
 x 26
 y 17