diff --git a/gymkhana/items/inventory/bombona.tscn b/gymkhana/items/inventory/bombona.tscn
deleted file mode 100644
index 7a087f45..00000000
--- a/gymkhana/items/inventory/bombona.tscn
+++ /dev/null
@@ -1,21 +0,0 @@
-[gd_scene load_steps=3 format=2]
-
-[ext_resource path="res://gymkhana/items/inventory/assets/bombona.png" type="Texture" id=1]
-[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3]
-
-[node name="bombona" type="Area2D"]
-pause_mode = 1
-position = Vector2( 0, -1 )
-
-[node name="Sprite" type="Sprite" parent="."]
-scale = Vector2( 0.65625, 0.65625 )
-texture = ExtResource( 1 )
-
-[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
-position = Vector2( -6, -4 )
-scale = Vector2( 0.67384, 0.67384 )
-polygon = PoolVector2Array( -22, -30, -23, -3, -23, 59, 9, 64, 34, 61, 41, 58, 41, -3, 42, -23, 37, -30, 35, -39, 26, -42, 26, -31, 20, -38, 13, -36, 11, -49, 7, -49, 4, -36, -7, -36, -11, -44, -19, -39, -17, -30 )
-
-[node name="ESCLocation" type="Position2D" parent="."]
-position = Vector2( -65, 57 )
-script = ExtResource( 3 )
diff --git a/gymkhana/items/inventory/bombona2.esc b/gymkhana/items/inventory/bombona2.esc
deleted file mode 100644
index cac6e253..00000000
--- a/gymkhana/items/inventory/bombona2.esc
+++ /dev/null
@@ -1,12 +0,0 @@
-:action1
-say player "Es naranja"
-
-:action2
-set_active bombona2 false
-inventory_add bombona2
-
-:action3
-say player "Es el segundo bolsillo más grande que he visto nunca"
-
-:action4
-say player "¡¡Al meterla en mi bolsillo se ha convertido en un dibujo animado!!"
diff --git a/gymkhana/items/inventory/caja_herramientas.esc b/gymkhana/items/inventory/caja_herramientas.esc
deleted file mode 100644
index da38e656..00000000
--- a/gymkhana/items/inventory/caja_herramientas.esc
+++ /dev/null
@@ -1,16 +0,0 @@
-:action1
-say current_player "Parece una caja de herramientas"
-
-:action2
-say current_player "Podria ser util!!"
-set_active caja_herramientas false
-inventory_add caja_herramientas
-
-:action3 wrench
-say current_player "Parece buen sitio para guardarla"
-inventory_remove wrench
-set_global caja_herramientas_with_wrench true
-
-:action3
-say current_player "Hay de too!" [caja_herramientas_with_wrench]
-say current_player "Está vacía" [!caja_herramientas_with_wrench]
diff --git a/gymkhana/items/inventory/caja_herramientas.tscn b/gymkhana/items/inventory/caja_herramientas.tscn
deleted file mode 100644
index 9bba7686..00000000
--- a/gymkhana/items/inventory/caja_herramientas.tscn
+++ /dev/null
@@ -1,41 +0,0 @@
-[gd_scene load_steps=5 format=2]
-
-[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
-[ext_resource path="res://gymkhana/items/inventory/assets/caja-herramientas.png" type="Texture" id=2]
-[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3]
-
-[sub_resource type="RectangleShape2D" id=1]
-extents = Vector2( 22.5, 12.5 )
-
-[node name="caja_herramientas" type="Area2D"]
-pause_mode = 1
-script = ExtResource( 1 )
-global_id = "caja_herramientas"
-esc_script = "res://gymkhana/items/inventory/caja_herramientas.esc"
-combine_when_selected_action_is_in = [ "action4" ]
-inventory_texture = ExtResource( 2 )
-dialog_color = Color( 1, 1, 1, 1 )
-tooltips = {
-    "action1": "¿Que es esto?",
-    "action2": "Coger",
-    "action3": "Mirar dentro",
-    "action4": "Usar"
-}
-action3_target_texts = {
-"wrench": "Guardarla en la caja"
-}
-target_when_selected_action_is_in = [ "action3" ]
-animations = null
-
-[node name="Sprite" type="Sprite" parent="."]
-position = Vector2( -2, 0 )
-scale = Vector2( 0.5, 0.5 )
-texture = ExtResource( 2 )
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-position = Vector2( -1.5, -0.5 )
-shape = SubResource( 1 )
-
-[node name="ESCLocation" type="Position2D" parent="."]
-position = Vector2( -51, 69 )
-script = ExtResource( 3 )
diff --git a/project.godot b/project.godot
index f91ef62b..74b8f856 100644
--- a/project.godot
+++ b/project.godot
@@ -204,7 +204,7 @@ _global_script_classes=[ {
 "language": "GDScript",
 "path": "res://addons/escoria-core/game/scenes/dialogs/esc_dialog_options_chooser.gd"
 }, {
-"base": "Node",
+"base": "StateMachine",
 "class": "ESCDialogPlayer",
 "language": "GDScript",
 "path": "res://addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd"