--- a/components/__init__.py	Wed Sep 21 15:05:12 2011 +0200
+++ b/components/__init__.py	Wed Sep 21 15:25:32 2011 +0200
@@ -7,4 +7,5 @@
 from fifeagent import FifeAgent
 from lockable import Lockable
 from usable import Usable
-from change_map import ChangeMap
\ No newline at end of file
+from change_map import ChangeMap
+from equipable import Equipable
\ No newline at end of file

--- a/components/equip.py	Wed Sep 21 15:05:12 2011 +0200
+++ b/components/equip.py	Wed Sep 21 15:25:32 2011 +0200
@@ -19,4 +19,4 @@
     """
     
     def __init__(self):
-        Component.__init__(self, head=str, body=str, leg=str, feet=str, l_arm=str, r_arm=str)
\ No newline at end of file
+        Component.__init__(self, head=object, body=object, leg=object, feet=object, l_arm=object, r_arm=object)
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/equipable.py	Wed Sep 21 15:25:32 2011 +0200
@@ -0,0 +1,22 @@
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#   
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#   
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from bGrease.component import Component
+
+class Equipable(Component):
+    """
+    Component that stores the data for an entity that can be equipped.
+    """
+    
+    def __init__(self):
+        Component.__init__(self, possible_slots=list, container=object, in_slot=str)
\ No newline at end of file

--- a/world.py	Wed Sep 21 15:05:12 2011 +0200
+++ b/world.py	Wed Sep 21 15:25:32 2011 +0200
@@ -21,6 +21,7 @@
         self.components.lockable = components.Lockable()
         self.components.usable = components.Usable()
         self.components.change_map = components.ChangeMap()
+        self.components.equipable = components.Equipable()
     
     def pump(self, dt):
         for component in self.components: