diff --git a/_module/are/ifm_pc_rooms.are.json b/_module/are/ifm_pc_rooms.are.json
index b011f8e9..c6c65fd3 100644
--- a/_module/are/ifm_pc_rooms.are.json
+++ b/_module/are/ifm_pc_rooms.are.json
@@ -100,7 +100,7 @@
   },
   "OnExit": {
     "type": "resref",
-    "value": ""
+    "value": "pc_room_onexit"
   },
   "OnHeartbeat": {
     "type": "resref",
@@ -124,7 +124,7 @@
   },
   "SkyBox": {
     "type": "byte",
-    "value": 0
+    "value": 6
   },
   "SunAmbientColor": {
     "type": "dword",
@@ -333,7 +333,7 @@
   },
   "Version": {
     "type": "dword",
-    "value": 10
+    "value": 11
   },
   "Width": {
     "type": "int",
diff --git a/_module/gic/ifm_pc_rooms.gic.json b/_module/gic/ifm_pc_rooms.gic.json
index bbdc1ede..99a163c7 100644
--- a/_module/gic/ifm_pc_rooms.gic.json
+++ b/_module/gic/ifm_pc_rooms.gic.json
@@ -83,6 +83,13 @@
           "value": "Charlie's Oriental Placables v1.0 by Charlie\r\n"
         }
       },
+      {
+        "__struct_id": 9,
+        "Comment": {
+          "type": "cexostring",
+          "value": ""
+        }
+      },
       {
         "__struct_id": 9,
         "Comment": {
diff --git a/_module/git/ifm_pc_rooms.git.json b/_module/git/ifm_pc_rooms.git.json
index ac145f3d..606e8168 100644
--- a/_module/git/ifm_pc_rooms.git.json
+++ b/_module/git/ifm_pc_rooms.git.json
@@ -2320,6 +2320,231 @@
           "type": "float",
           "value": 0.0
         }
+      },
+      {
+        "__struct_id": 9,
+        "AnimationState": {
+          "type": "byte",
+          "value": 0
+        },
+        "Appearance": {
+          "type": "dword",
+          "value": 2565
+        },
+        "AutoRemoveKey": {
+          "type": "byte",
+          "value": 0
+        },
+        "Bearing": {
+          "type": "float",
+          "value": 0.0
+        },
+        "BodyBag": {
+          "type": "byte",
+          "value": 0
+        },
+        "CloseLockDC": {
+          "type": "byte",
+          "value": 0
+        },
+        "Conversation": {
+          "type": "resref",
+          "value": ""
+        },
+        "CurrentHP": {
+          "type": "short",
+          "value": 10
+        },
+        "Description": {
+          "id": 16810853,
+          "type": "cexolocstring",
+          "value": {}
+        },
+        "DisarmDC": {
+          "type": "byte",
+          "value": 0
+        },
+        "Faction": {
+          "type": "dword",
+          "value": 1
+        },
+        "Fort": {
+          "type": "byte",
+          "value": 5
+        },
+        "Hardness": {
+          "type": "byte",
+          "value": 5
+        },
+        "HasInventory": {
+          "type": "byte",
+          "value": 0
+        },
+        "HP": {
+          "type": "short",
+          "value": 10
+        },
+        "Interruptable": {
+          "type": "byte",
+          "value": 1
+        },
+        "KeyName": {
+          "type": "cexostring",
+          "value": ""
+        },
+        "KeyRequired": {
+          "type": "byte",
+          "value": 0
+        },
+        "Lockable": {
+          "type": "byte",
+          "value": 1
+        },
+        "Locked": {
+          "type": "byte",
+          "value": 0
+        },
+        "LocName": {
+          "id": 16811458,
+          "type": "cexolocstring",
+          "value": {}
+        },
+        "OnClick": {
+          "type": "resref",
+          "value": ""
+        },
+        "OnClosed": {
+          "type": "resref",
+          "value": ""
+        },
+        "OnDamaged": {
+          "type": "resref",
+          "value": ""
+        },
+        "OnDeath": {
+          "type": "resref",
+          "value": ""
+        },
+        "OnDisarm": {
+          "type": "resref",
+          "value": ""
+        },
+        "OnHeartbeat": {
+          "type": "resref",
+          "value": ""
+        },
+        "OnInvDisturbed": {
+          "type": "resref",
+          "value": ""
+        },
+        "OnLock": {
+          "type": "resref",
+          "value": ""
+        },
+        "OnMeleeAttacked": {
+          "type": "resref",
+          "value": ""
+        },
+        "OnOpen": {
+          "type": "resref",
+          "value": ""
+        },
+        "OnSpellCastAt": {
+          "type": "resref",
+          "value": ""
+        },
+        "OnTrapTriggered": {
+          "type": "resref",
+          "value": ""
+        },
+        "OnUnlock": {
+          "type": "resref",
+          "value": ""
+        },
+        "OnUsed": {
+          "type": "resref",
+          "value": ""
+        },
+        "OnUserDefined": {
+          "type": "resref",
+          "value": ""
+        },
+        "OpenLockDC": {
+          "type": "byte",
+          "value": 0
+        },
+        "Plot": {
+          "type": "byte",
+          "value": 0
+        },
+        "PortraitId": {
+          "type": "word",
+          "value": 510
+        },
+        "Ref": {
+          "type": "byte",
+          "value": 0
+        },
+        "Static": {
+          "type": "byte",
+          "value": 1
+        },
+        "Tag": {
+          "type": "cexostring",
+          "value": "ZEP_CITYINTRIORF"
+        },
+        "TemplateResRef": {
+          "type": "resref",
+          "value": "zep_cityintriorf"
+        },
+        "TrapDetectable": {
+          "type": "byte",
+          "value": 1
+        },
+        "TrapDetectDC": {
+          "type": "byte",
+          "value": 0
+        },
+        "TrapDisarmable": {
+          "type": "byte",
+          "value": 1
+        },
+        "TrapFlag": {
+          "type": "byte",
+          "value": 0
+        },
+        "TrapOneShot": {
+          "type": "byte",
+          "value": 1
+        },
+        "TrapType": {
+          "type": "byte",
+          "value": 0
+        },
+        "Type": {
+          "type": "byte",
+          "value": 0
+        },
+        "Useable": {
+          "type": "byte",
+          "value": 0
+        },
+        "Will": {
+          "type": "byte",
+          "value": 0
+        },
+        "X": {
+          "type": "float",
+          "value": 14.61999988555908
+        },
+        "Y": {
+          "type": "float",
+          "value": 14.60000038146973
+        },
+        "Z": {
+          "type": "float",
+          "value": 0.009999999776482582
+        }
       }
     ]
   },
diff --git a/_module/ncs/inc_perchest.ncs b/_module/ncs/inc_perchest.ncs
deleted file mode 100644
index ecb1c72d..00000000
Binary files a/_module/ncs/inc_perchest.ncs and /dev/null differ
diff --git a/_module/ncs/pc_room_onexit.ncs b/_module/ncs/pc_room_onexit.ncs
new file mode 100644
index 00000000..26adf172
Binary files /dev/null and b/_module/ncs/pc_room_onexit.ncs differ
diff --git a/_module/nss/pc_room_onexit.nss b/_module/nss/pc_room_onexit.nss
new file mode 100644
index 00000000..ab2c1799
--- /dev/null
+++ b/_module/nss/pc_room_onexit.nss
@@ -0,0 +1,17 @@
+#include "inc_perchest"
+
+void main()
+{
+    object oPlayer = GetExitingObject();
+
+    int nToken = NuiFindWindow(oPlayer, PC_NUI_WINDOW_ID);
+
+//:: Murder the poor window
+
+    NuiDestroy(oPlayer, nToken);
+
+    nToken = NuiFindWindow(oPlayer, PC_NUI_GOLD_WINDOW_ID);
+        if (nToken)
+            NuiDestroy(oPlayer, nToken);
+
+}
diff --git a/_module/ra_tdog.mod b/_module/ra_tdog.mod
index 97f513b4..c50efff3 100644
Binary files a/_module/ra_tdog.mod and b/_module/ra_tdog.mod differ