diff --git a/gr-sim/tfv/tfv_backgrounds.c b/gr-sim/tfv/tfv_backgrounds.c
index b12eb80b..50aa98ba 100644
--- a/gr-sim/tfv/tfv_backgrounds.c
+++ b/gr-sim/tfv/tfv_backgrounds.c
@@ -735,41 +735,39 @@ unsigned char ap_calculus_rle[]={
 	0x05,0xA0,0x14,0x00,0x05,0xA0,0x82,0x00,0xA1,	};
 unsigned char patriot_room_rle[]={
 	0x28, /* ysize=40 */
-	0xA0,0x20,0x00,0x77,0xA6,0x57,0x77,0xA0,0x20,0x00,0x77,0x55,0x55,
-	0x15,0xA3,0x55,0x77,0xA0,0x20,0x00,0x77,0x55,0x51,
-	0x11,0xA3,0x55,0x77,0xA0,0x20,0x00,0x77,0x55,0x55,0x11,
-	0xA3,0x55,0x77,0xA0,0x13,0x00,0x50,0x55,0x55,0x50,0xA9,0x00,
-	0x77,0x55,0xA3,0x51,0x55,0x55,0x77,0xA3,0x00,0xA6,0x70,
-	0xA3,0x00,0xDD,0xBD,0xA5,0x00,0xB0,0xBB,0x88,
-	0xA4,0x00,0x80,0x80,0xA4,0x00,0x77,0x7C,0xA6,0x77,0x00,0x00,
-	0x70,0xA4,0x77,0x87,0x88,0xA3,0x00,0xDD,0xBB,
-	0x0B,0xA5,0x00,0xBB,0x08,0xA3,0x00,0xB0,0xBB,
-	0x88,0xA9,0x00,0x05,0x50,0x00,0x00,0x74,0x47,
-	0x44,0x77,0x77,0x87,0x00,0x88,0xA3,0x00,0xDD,
-	0xFF,0xA6,0x00,0x22,0x22,0xA4,0x00,0xBB,0x08,0xAB,0x00,
-	0x05,0x77,0x99,0x99,0x74,0x77,0x87,0x00,0x00,
-	0x88,0xA3,0x00,0xDD,0xFF,0x0F,0x0B,0x00,0x00,
-	0xB0,0x20,0x22,0x22,0xA4,0x00,0x11,0xAD,0x00,0x77,
-	0x79,0x79,0x77,0x87,0x00,0xE0,0xE0,0x88,0xA3,0x00,
-	0x0D,0x8F,0xA6,0x00,0x52,0x52,0x00,0x00,0x0B,0x01,
-	0x11,0xAD,0x00,0xA3,0x77,0x87,0x00,0xD0,0xDE,
-	0xEE,0x88,0xA4,0x07,0x88,0xA6,0x07,0x55,0x55,0xA4,0x07,
-	0x44,0xAD,0x07,0x77,0x77,0x87,0x00,0x30,0x3D,
-	0xDD,0x8E,0x08,0xA3,0x00,0x08,0xB8,0x08,
-	0xA5,0x00,0x55,0x55,0xA4,0x00,0x44,0xA9,0x00,0xB6,0xB6,0xE0,
-	0x00,0x77,0x08,0x00,0x22,0x22,0x33,0x8D,
-	0x08,0xA5,0x00,0xBB,0xA6,0x00,0x55,0x55,0xA4,0x00,0x44,
-	0xA8,0x00,0x0B,0xBB,0xBB,0xEE,0x00,0x08,0x00,
-	0x10,0x12,0x22,0x83,0x08,0xA6,0x00,0x08,0x08,
-	0xA4,0x00,0xA3,0x08,0xA3,0x00,0x08,0x08,0xA9,0x00,0x60,0x6B,
-	0x0E,0x00,0x00,0x40,0x41,0x11,0x82,0x08,
-	0xA0,0x19,0x00,0x78,0xA3,0x88,0x80,0xA3,0x66,0x00,0x19,
-	0x99,0x44,0x11,0x88,0xA0,0x1A,0x00,0x88,0x87,
-	0x78,0xA3,0x88,0x86,0x66,0x00,0x11,0x99,
-	0x44,0x88,0xA0,0x1B,0x00,0xA3,0x88,0x87,0x78,0x8B,
-	0x86,0x88,0x80,0x11,0x99,0x88,0xA0,0x1C,0x00,
-	0xA5,0x88,0x77,0xA3,0x87,0x11,0x88,0xA0,0x1D,0x00,0xA5,0x88,
-	0x77,0xA4,0x88,0xA0,0x1F,0x00,0x08,0xA3,0x88,0x77,0xA3,0x88,0xA1,	};
+	0xA0,0x30,0x88,0xDD,0x8D,0xD8,0x88,0xD8,0x8D,
+	0xD8,0x88,0x8D,0xDD,0x8D,0x88,0xDD,
+	0x8D,0xD8,0x88,0x8D,0xDD,0x8D,0x88,
+	0xD8,0x8D,0xD8,0x88,0x8D,0xDD,0x8D,
+	0xAD,0x88,0xDD,0xD8,0x8D,0x88,0xDD,0xD8,
+	0xDD,0x88,0x88,0xDD,0x88,0x88,0xDD,0xD8,0x8D,
+	0x88,0x88,0xDD,0x88,0x88,0xDD,0x88,0xDD,0x88,0x88,
+	0xDD,0xA9,0x88,0xF8,0xA4,0x88,0xDD,0xA3,0x88,0xDD,
+	0x88,0xDD,0x88,0x88,0xDD,0x88,0x88,0xDD,0x88,
+	0xDD,0x88,0xD8,0xDD,0xD8,0x88,0x8D,
+	0xD8,0x8D,0x88,0x88,0xDD,0xA6,0x88,0x7F,0x7F,0xFF,0xFF,
+	0xA0,0x24,0x88,0xF7,0xFF,0x00,0xFF,0xAE,0x88,0x08,0x08,
+	0xA0,0x14,0x88,0x77,0xFF,0x00,0xFF,0xA6,0x88,0x08,0x08,
+	0xA5,0x88,0xB8,0xBB,0x00,0xA6,0x88,0xBD,0xBD,0xAC,0x88,
+	0x77,0xFF,0x00,0xFF,0xA4,0x55,0x88,0x88,0x00,
+	0xBB,0xB8,0xA5,0x88,0xBB,0x80,0xA6,0x88,0xBB,0xBB,
+	0xA4,0x88,0xA8,0x55,0x77,0xFF,0xFF,0x5F,0x55,0x5F,
+	0x55,0xDD,0x88,0x88,0x80,0xBB,0xA6,0x88,0x22,
+	0xA6,0x88,0x18,0x3B,0x3B,0x18,0xA3,0x88,0xDD,0x55,0x55,
+	0xFF,0xFF,0x0F,0x0F,0xFF,0x77,0xFF,0x5F,0xF5,
+	0xFF,0x55,0x88,0xDD,0xA3,0x88,0x66,0xA4,0x88,
+	0x8B,0x82,0x22,0xA6,0x88,0x11,0x33,0x33,0x11,
+	0xA3,0x88,0xDD,0x88,0x55,0x55,0xFF,0xFF,0xF0,0xF0,0x5F,0x5F,
+	0xF5,0xFF,0x55,0x07,0x07,0xDD,0xA3,0x07,0x66,
+	0x06,0x0B,0xA4,0x07,0xDD,0xA6,0x07,0xB1,0x43,0x43,
+	0xB1,0xA3,0x07,0xDD,0x07,0x07,0x55,0x55,0xA3,0x7F,0xA4,0x55,
+	0xA3,0x00,0x0D,0xA3,0x00,0x55,0xA6,0x00,0xDD,0xA7,0x00,
+	0x44,0x44,0xA4,0x00,0x0D,0xA3,0x00,0x55,0x55,0xFF,0xFF,0xA3,0x55,
+	0xA8,0x00,0x85,0x80,0xA4,0x00,0x80,0x8D,0xA7,0x00,
+	0x44,0x44,0xA9,0x00,0x55,0x55,0xFF,0x55,0x55,0xA0,0x18,0x00,0x08,0x08,
+	0xAA,0x00,0xA3,0x55,0xA0,0x26,0x00,0x55,0xDD,0xA0,0x26,0x00,0xDD,0xDD,
+	0xA0,0x26,0x00,0xDD,0xDD,0xA0,0x26,0x00,0xDD,0x0D,0xA0,0x26,0x00,0x0D,
+	0xA0,0x28,0x00,0xA1,	};
 unsigned char jc_office_rle[]={
 	0x28, /* ysize=40 */
 	0xAB,0xDD,0x99,0xAA,0x11,0x99,0xDD,0xA3,0x1D,0xDD,
diff --git a/gr-sim/tfv/tfv_dialog.h b/gr-sim/tfv/tfv_dialog.h
index 73019f16..e5782e85 100644
--- a/gr-sim/tfv/tfv_dialog.h
+++ b/gr-sim/tfv/tfv_dialog.h
@@ -44,6 +44,11 @@
 #define DIALOG_AGENT_AP		29
 #define DIALOG_FRAU		30
 
+#define DIALOG_MAC		31
+#define DIALOG_AGENT_N		32
+#define DIALOG_STEVE2		33
+#define DIALOG_GRABOWSKI	34
+
 struct dialog_words {
 	char *words;
 	int next;
@@ -259,14 +264,31 @@ struct dialog_type dialog[100]={
 		.statement[1].words="No esta aqui",
 		.statement[1].next=0,
 	},
+	// Patriot Room
+	[DIALOG_MAC]= {
+		.statement[0].words="File not found",
+		.statement[0].next=0,
+		.statement[1].words="Abort, Retry, Fail",
+		.statement[1].next=0,
+		.statement[1].words="Do you like my DOS impression?",
+		.statement[1].next=0,
+	},
+	[DIALOG_AGENT_N]= {
+		.statement[0].words="Starfleet Mission",
+		.statement[0].next=0,
+	},
+	[DIALOG_STEVE2]= {
+		.statement[0].words="How bout them O\'s",
+		.statement[0].next=0,
+		.statement[1].words="Fantasy Baseball",
+		.statement[1].next=0,
+	},
+	[DIALOG_GRABOWSKI]= {
+		.statement[0].words="Ahhh, Mr. Bombem.",
+		.statement[0].next=0,
+	},
+
 #if 0
-	PATRIOT ROOM:
-		AGENT N
-		GRABOWSKI
-		FRESHMAN STEVE
-		FRESHMAN JENNY
-
-
 	OFFICE:
 		ACTING PRINCIPAL ROBOKNEE
 			SINCE WE HAVE NO ELECTRICITY WE HAVE NO LIGHTS
diff --git a/gr-sim/tfv/tfv_mapinfo.h b/gr-sim/tfv/tfv_mapinfo.h
index 0ee2b100..1426c356 100644
--- a/gr-sim/tfv/tfv_mapinfo.h
+++ b/gr-sim/tfv/tfv_mapinfo.h
@@ -801,6 +801,35 @@ struct map_info_type map_info[34] = {
 		.scatter=SCATTER_NONE,
 		.entry_type=ENTRY_CENTER, .entry_x=0, .entry_y=0,
 		.background_image=patriot_room_rle,
+		.num_locations=4,
+		.location[0] = {
+			.name="Macintosh",
+			.x0 = 2, .x1 = 7,
+			.y0 = 22,  .y1 = 30,
+			.destination=DIALOG_MAC,
+			.type=LOCATION_CONVERSATION,
+		},
+		.location[1] = {
+			.name="Agent N",
+			.x0 = 8, .x1 = 14,
+			.y0 = 25, .y1 = 32,
+			.destination=DIALOG_AGENT_N,
+			.type=LOCATION_CONVERSATION,
+		},
+		.location[2] = {
+			.name="Captain Steve",
+			.x0 = 16, .x1 = 20,
+			.y0 = 25, .y1 = 32,
+			.destination=DIALOG_STEVE2,
+			.type=LOCATION_CONVERSATION,
+		},
+		.location[3] = {
+			.name="Grabowski",
+			.x0 = 23, .x1 = 30,
+			.y0 = 24, .y1 = 33,
+			.destination=DIALOG_GRABOWSKI,
+			.type=LOCATION_CONVERSATION,
+		},
 	},
 	[MIRROR_LAKE]={	// 33: MIRROR_LAKE
 		.name="Mirror Lake",
diff --git a/tfv/art/patriot_room.png b/tfv/art/patriot_room.png
index 7c04d1af..4aeadce8 100644
Binary files a/tfv/art/patriot_room.png and b/tfv/art/patriot_room.png differ