diff --git a/scorn/misc/HospitalityRoom b/scorn/misc/HospitalityRoom
index 647ca6759..72bcc3869 100644
--- a/scorn/misc/HospitalityRoom
+++ b/scorn/misc/HospitalityRoom
@@ -10,7 +10,7 @@ enter_x 1
 enter_y 7
 msg
 Created:  2000-06-16
-Modified: 2008-09-28 Rick Tanner
+Modified: 2010-05-05 Cavesomething
 endmsg
 end
 arch woodfloor2
@@ -439,11 +439,15 @@ arch woodfloor2
 x 3
 y 4
 end
-arch check_inv
-slaying Noble Rank Knight
+arch check_floor
+hp 1
 x 3
 y 4
-connected 1
+arch event_trigger
+name scorn/Aristocracy 10 1
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch woodfloor2
 x 3
@@ -467,11 +471,15 @@ arch woodfloor2
 x 3
 y 6
 end
-arch check_inv
-slaying Noble Rank Knight
+arch check_floor
+hp 1
 x 3
 y 6
-connected 1
+arch event_trigger
+name scorn/Aristocracy 10 1
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch woodfloor2
 x 3
@@ -492,11 +500,15 @@ arch woodfloor2
 x 3
 y 9
 end
-arch check_inv
-slaying Noble Rank Baronet
+arch check_floor
+hp 1
 x 3
 y 9
-connected 10
+arch event_trigger
+name scorn/Aristocracy 20 10
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch woodfloor2
 x 3
@@ -522,11 +534,15 @@ arch woodfloor2
 x 3
 y 11
 end
-arch check_inv
-slaying Noble Rank Baronet
+arch check_floor
+hp 1
 x 3
 y 11
-connected 10
+arch event_trigger
+name scorn/Aristocracy 20 10
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch woodfloor2
 x 3
@@ -1277,11 +1293,15 @@ arch woodfloor2
 x 9
 y 4
 end
-arch check_inv
-slaying Noble Rank Baron
+arch check_floor
+hp 1
 x 9
 y 4
-connected 20
+arch event_trigger
+name scorn/Aristocracy 30 20
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch woodfloor2
 x 9
@@ -1305,11 +1325,15 @@ arch woodfloor2
 x 9
 y 6
 end
-arch check_inv
-slaying Noble Rank Baron
+arch check_floor
+hp 1
 x 9
 y 6
-connected 20
+arch event_trigger
+name scorn/Aristocracy 30 20
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch woodfloor2
 x 9
@@ -1330,11 +1354,15 @@ arch woodfloor2
 x 9
 y 9
 end
-arch check_inv
-slaying Noble Rank Marquis
+arch check_floor
+hp 1
 x 9
 y 9
-connected 30
+arch event_trigger
+name scorn/Aristocracy 40 30
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch woodfloor2
 x 9
@@ -1360,11 +1388,15 @@ arch woodfloor2
 x 9
 y 11
 end
-arch check_inv
-slaying Noble Rank Marquis
+arch check_floor
+hp 1
 x 9
 y 11
-connected 30
+arch event_trigger
+name scorn/Aristocracy 40 30
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch woodfloor2
 x 9
@@ -2121,11 +2153,15 @@ arch woodfloor2
 x 15
 y 4
 end
-arch check_inv
-slaying Noble Rank Earl
+arch check_floor
+hp 1
 x 15
 y 4
-connected 40
+arch event_trigger
+name scorn/Aristocracy 50 40
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch woodfloor2
 x 15
@@ -2149,11 +2185,15 @@ arch woodfloor2
 x 15
 y 6
 end
-arch check_inv
-slaying Noble Rank Earl
+arch check_floor
+hp 1
 x 15
 y 6
-connected 40
+arch event_trigger
+name scorn/Aristocracy 50 40
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch woodfloor2
 x 15
@@ -2174,11 +2214,15 @@ arch woodfloor2
 x 15
 y 9
 end
-arch check_inv
-slaying Noble Rank Count
+arch check_floor
+hp 1
 x 15
 y 9
-connected 50
+arch event_trigger
+name scorn/Aristocracy 60 50
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch woodfloor2
 x 15
@@ -2204,11 +2248,15 @@ arch woodfloor2
 x 15
 y 11
 end
-arch check_inv
-slaying Noble Rank Count
+arch check_floor
+hp 1
 x 15
 y 11
-connected 50
+arch event_trigger
+name scorn/Aristocracy 60 50
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch woodfloor2
 x 15
@@ -3095,11 +3143,15 @@ arch woodfloor2
 x 22
 y 4
 end
-arch check_inv
-slaying Noble Rank Duke
+arch check_floor
+hp 1
 x 22
 y 4
-connected 60
+arch event_trigger
+name scorn/Aristocracy 70 60
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch woodfloor2
 x 22
@@ -3123,11 +3175,15 @@ arch woodfloor2
 x 22
 y 6
 end
-arch check_inv
-slaying Noble Rank Duke
+arch check_floor
+hp 1
 x 22
 y 6
-connected 60
+arch event_trigger
+name scorn/Aristocracy 70 60
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch woodfloor2
 x 22
@@ -3148,11 +3204,15 @@ arch woodfloor2
 x 22
 y 9
 end
-arch check_inv
-slaying Noble Rank Archduke
+arch check_floor
+hp 1
 x 22
 y 9
-connected 70
+arch event_trigger
+name scorn/Aristocracy 80 70
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch woodfloor2
 x 22
@@ -3178,11 +3238,15 @@ arch woodfloor2
 x 22
 y 11
 end
-arch check_inv
-slaying Noble Rank Archduke
+arch check_floor
+hp 1
 x 22
 y 11
-connected 70
+arch event_trigger
+name scorn/Aristocracy 80 70
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch woodfloor2
 x 22
@@ -3555,11 +3619,15 @@ arch woodfloor2
 x 25
 y 7
 end
-arch check_inv
-slaying Noble Rank Prince
+arch check_floor
+hp 1
 x 25
 y 7
-connected 80
+arch event_trigger
+name scorn/Aristocracy 90 80
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch magic_mouth
 msg
@@ -3572,11 +3640,15 @@ arch woodfloor2
 x 25
 y 8
 end
-arch check_inv
-slaying Noble Rank Prince
+arch check_floor
+hp 1
 x 25
 y 8
-connected 80
+arch event_trigger
+name scorn/Aristocracy 90 80
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch woodfloor2
 x 25
@@ -3883,11 +3955,15 @@ arch woodfloor2
 x 27
 y 7
 end
-arch check_inv
-slaying Noble Rank Prince
+arch check_floor
+hp 1
 x 27
 y 7
-connected 80
+arch event_trigger
+name scorn/Aristocracy 90 80
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch magic_mouth
 msg
@@ -3902,11 +3978,15 @@ arch woodfloor2
 x 27
 y 8
 end
-arch check_inv
-slaying Noble Rank Prince
+arch check_floor
+hp 1
 x 27
 y 8
-connected 80
+arch event_trigger
+name scorn/Aristocracy 90 80
+title Python
+slaying python/quests/QuestTriggerConnect.py
+end
 end
 arch woodfloor2
 x 27