--- a/gamelib/scenes/bridge.py	Sat Aug 28 14:00:38 2010 +0200
+++ b/gamelib/scenes/bridge.py	Sat Aug 28 14:01:17 2010 +0200
@@ -113,10 +113,10 @@
         return "The main bridge computer screen."
 
 
-class MassageChair(Thing):
+class MassageChairBase(Thing):
     "The captain's massage chair, contains superconductor"
 
-    NAME = 'bridge.massagechair'
+    NAME = 'bridge.massagechair_base'
 
     INTERACTS = {
         'chair': InteractNoImage(127, 518, 69, 64),
@@ -137,14 +137,11 @@
                    "It's massaging a skeleton."
         return "The chair won't work any more, it has no power."
 
-    def is_interactive(self):
-        return False
 
-
-class MassageChairBase(Thing):
+class MassageChair(Thing):
     "The captain's massage chair, contains superconductor"
 
-    NAME = 'bridge.massagechair_base'
+    NAME = 'bridge.massagechair'
 
     INTERACTS = {
         'chair': InteractRectUnion((
@@ -161,9 +158,13 @@
     INITIAL = 'chair'
 
     def get_description(self):
-        return self.state.current_scene.things['bridge.massagechair'] \
+        return self.state.current_scene.things['bridge.massagechair_base'] \
                    .get_description()
 
+    def is_interactive(self):
+        return False
+
+
 class Stethoscope(Item):
     "Used for cracking safes. Found on the doctor on the chair"
 
@@ -214,7 +215,7 @@
 
     def interact_without(self):
         self.state.add_inventory_item('superconductor')
-        self.state.current_scene.things['bridge.massagechair'] \
+        self.state.current_scene.things['bridge.massagechair_base'] \
                           .set_data('contains_superconductor', False)
         self.scene.remove_thing(self)
         return Result("The superconductor module unclips easily.")