1 files changed, 2 insertions, 1 deletions
diff --git a/entity.lua b/entity.lua
index 2758071..e383b4f 100644
--- a/entity.lua
+++ b/entity.lua
@@ -151,6 +151,7 @@ _equipped_item_distance = 6
 function Entity:equip(that, dist)
     dist = dist or _equipped_item_distance
     self.equipped[that.id] = { entity = that, distance = dist }
+    that:transition_to(States.Equipped)
 end
 
 function Entity:equipped_from(parent, dist)
@@ -210,7 +211,7 @@ end
 function EntityBuilder:b_add_state(name, state)
     if self.states == nil then self.states = {} end
     self.states[name] = state
-    if self.state == nil then self.state = name end
+    if self.state == nil then self:b_state(name) end
     return self
 end
 function EntityBuilder:b_state(name)