Update for completion of map and fixing some things

ButteredToast2.inform/Source/story.ni

@@ -32,7 +32,6 @@ Conversation is a kind of value.  The conversation is spoken and unspoken.
 
 A person has a significance.  A person has a seeability.  A person has a conversation.
 A thing has significance.
-A thing can be equipped or unequipped.  A thing is usually unequipped.
 
 Before speech when the noun is a person:
   now the conversation of the noun is spoken;
@@ -54,7 +53,7 @@ When play begins:
   now the right hand status line is "Score: [current score of the player] of 309".
 
 [
-  ROOMS
+  ROOMS AND DOORS
 ]
 
 [ San Francisco, 1895 ]
@@ -69,7 +68,7 @@ South Embarcadero is a room.  It is south of Central Embarcadero.  The descripti
 
 Lombard Street is a room.  Lombard Street is west of North Embarcadero.  The description of Lombard Street is "The twisty road is an iconic roadway that was the intention of the residents during the 1920s to prevent issues that arose with the steep hill.  It is not supposed to be here during your time.  The only way to go is east and west"
 
-Market Street is a room.  Market Street is west of Lombard Street.  The description of Market Street is "This is a busy street lined with many shops and businesses.  The street has the appearance of cleanliness.  It goes east and southwest."
+Market Street is a room.  Market Street is west of Lombard Street.  The description of Market Street is "This is a busy street lined with many shops and businesses.  The street has the appearance of cleanliness.  It goes east and southwest.  There are buildings to the west and south."
 
 North Market Street Entrance is a door.  It is north of Market Street.  It is south of Cafe du Nord.  The description of North Market Street Entrance is "The door is fancy looking and has the words 'Cafe du Nord' across the top."
 
@@ -93,19 +92,33 @@ Cat House Room 3 is a room.  It is northeast of Cat House Lobby.  It is west of
 
 Cat House Kitchen is a room.  The description of the Cat House Kitchen is "The kitchen has all the ameneties to prepare the most indulgent of foods.  There is a room to the west."
 
-Cat House Sun Room is a room.  It is east of Cat House Room 1  It is west of Cat House Room 3.  The description of Cat House Sun Room is "The sun room is bright and shiny thanks to well placed windows that let the light of our famous, shining star in.  There are exits to the east and the west.  There is an exit leading outside to the north."
+Cat House Sun Room is a room.  It is east of Cat House Room 1.  It is west of Cat House Room 3.  The description of Cat House Sun Room is "The sun room is bright and shiny thanks to well placed windows that let the light of our famous, shining star in.  There are exits to the east and the west.  There is an exit leading outside to the north."
 
 Cat House Room 1 is a room.  It is northwest of Cat House Lobby.  It is west of Cat House Sun Room.  The description of Cat House Room 1 is "The room has various erotic pictures hung on the wall.  You're too embarassed to view them any more than a passing glance.  THere are doorways to the south-east and east.  There are stairs leading up."
 
 [ Cat House, Upper Floor ]
 
-Cat Upper Hallway 1 is a room.  It is above Cat House Room 1.  The description of Cat House Upper Hallway 1 is "The hallway extends to the east.  It is lined with rooms of people making strange sounds inside."
+Cat House Upper Hallway 1 is a room.  It is above Cat House Room 1.  The description of Cat House Upper Hallway 1 is "The hallway extends to the east.  It is lined with rooms of people making strange sounds inside."
 
-Cat Upper Hallway 2 is a room.  It is east of Cat Upper Hallway 1.  The description of Cat House Upper Hallway 2 is "The hallway extends to the east.  It is lined with rooms of people making strange sounds inside."
+Cat House Upper Hallway 2 is a room.  It is east of Cat House Upper Hallway 1.  The description of Cat House Upper Hallway 2 is "The hallway extends to the east.  It is lined with rooms of people making strange sounds inside."
 
-Cat Upper Hallway 3 is a room.  It is east of Cat Upper Hallway 2.  The description of Cat House Upper Hallway 3 is "The hallway extends to the east.  It is lined with rooms of people making strange sounds inside."
+Cat House Upper Hallway 3 is a room.  It is east of Cat House Upper Hallway 2.  The description of Cat House Upper Hallway 3 is "The hallway extends to the east.  It is lined with rooms of people making strange sounds inside."
 
-Cat Upper Hallway 4 is a room.  It is east of Cat Upper Hallway 3.  The description of Cat House Upper Hallway 4 is "The hallway terminates here.  It is lined with rooms of people making strange sounds inside."
+Cat House Upper Hallway 4 is a room.  It is east of Cat House Upper Hallway 3.  The description of Cat House Upper Hallway 4 is "The hallway terminates here.  It is lined with rooms of people making strange sounds inside."
+
+[ Cat House Backyard ]
+
+Cat House Backyard is a room.  It is north of Cat House Sun Room.  The description of the Cat House Backyard is "The backyard is quite spacious.  In the middle of the yard is a open sewage lagoon with blue-green algae polluting it.  There is a small, cramped-looking tool shed, as well."
+
+Dilapidated Door is a door.  It is west of Cat House Backyard.  The description of the Dilapidated  Door is "This dilapidated door with a rusty door handle leads into the tool shed."
+
+Tool Shed is a room.  It is west of the Dilapidated Door.  The description of the Tool Shed is "The interior of the tool shed seems to be much larger than the outside would appear to convey.  There is enough room to accommodate at least three Hummers, but you wouldn't have an idea of what that vehicle as it's 1895!"
+
+[ Other Places ]
+
+Fairborn Residence is a room.  It is southwest of Market Street.  The description of Fairborn Residence is "A dilapidated house that houses the Fairborn clan.  There is a porch on the front with pillars buckling under the weight of holding the porch roof up."
+
+Morgan Alford's Law Office is a room.  It is south of Market Street.  The description of Morgan Alford's Law Office is "A fancy looking building that looks like it recently sprung up.  The single floor building has a white exterior, a solitary door, and a solitary window."
 
 [
   ACTORS
@@ -123,17 +136,27 @@ After speech when noun is Wallaby Fits:
 
 Amelia is a person in Cafe du Nord.  The description of Amelia is "Amelia is a slender woman wearing ruined aviator clothes.  She has sandy blonde hair.  She is totally drunk and appears to almost always be that way."
 
+Stanley Fairborn is a person in Fairborn Residence.  The significance of Stanley Fairborn is significant.  The seeability of Stanley Fairborn is unseen.  The conversation of Stanley Fairborn is unspoken.  The description of Stanley Fairborn is "A filthy, dirty man who wears coveralls that don't quite cover all."
+
+Lewis Fairborn is a person in Fairborn Residence.  The significance of Lewis Fairborn is significant.  The seeability of Lewis Fairborn is unseen.  The conversation of Lewis Fairborn is unspoken.  The description of Lewis Fairborn is "A filthy, dirty man who wears coveralls that don't quite cover all."
+
+Morgan Alford is a person in Morgan Alford's Law Office.  The significance of Morgan Alford is significant.  The seeability of Morgan Alford is unseen.  The conversation of Morgan Alford is unspoken.  The description of Morgan Alford is "A smartly dressed man who moves and speaks with passion and conviction."
+
 [
   THINGS
 ]
 
+[ Key Items ]
 The amulet of destiny is a thing.  It is wearable.  The significance of the amulet of destiny is significant.  The description of the amulet of destiny is "A bright and shiny amulet that weighs a bunch."
 
 The ring of awesomeness is a thing.  It is wearable.  The significance of the ring of awesomeness is significant.  The description of the ring of awesomeness is "An awesome-looking ring that fits your finger perfectly."
 
+
+
 [
   ACTIONS
 ]
+
 Understand "slap [something]" as slapping.  Slapping is an action applying to one visible thing.
 After slapping when the noun is a person:
   say "You viciously slap [the noun]!"