diff --git a/CameraFollow.gd b/CameraFollow.gd
new file mode 100644
index 0000000..c0dd85d
--- /dev/null
+++ b/CameraFollow.gd
@@ -0,0 +1,17 @@
+extends Camera2D
+
+
+# Declare member variables here. Examples:
+# var a = 2
+# var b = "text"
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	pass # Replace with function body.
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+onready var target = get_node("/root/MainScene/Player")
+func _process (delta):
+	position = target.position
diff --git a/MainScene.tscn b/MainScene.tscn
index de89920..f09138e 100644
--- a/MainScene.tscn
+++ b/MainScene.tscn
@@ -1,16 +1,37 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://Player.tscn" type="PackedScene" id=1]
+[ext_resource path="res://UI.tscn" type="PackedScene" id=2]
 [ext_resource path="res://lodge.tres" type="TileSet" id=14]
 
-[node name="MainScene" type="Node2D"]
+[node name="LivingRoom" type="Node2D"]
 
-[node name="TileMap" type="TileMap" parent="."]
+[node name="CanvasLayer" type="CanvasLayer" parent="."]
+
+[node name="UI" parent="CanvasLayer" instance=ExtResource( 2 )]
+
+[node name="Lodge" type="TileMap" parent="."]
 tile_set = ExtResource( 14 )
 cell_size = Vector2( 60, 60 )
 cell_quadrant_size = 15
 format = 1
-tile_data = PoolIntArray( 65540, 15, 0, 65541, 16, 0, 65543, 16, 0, 65545, 17, 0, 65546, 1, 0, 65547, 4, 0, 65549, 4, 0, 65551, 5, 0, 131076, 18, 0, 131077, 19, 0, 131079, 19, 0, 131081, 20, 0, 131082, 1, 0, 131083, 4, 0, 131085, 4, 0, 131087, 5, 0, 196612, 21, 0, 196613, 22, 0, 196615, 22, 0, 196617, 23, 0, 196618, 6, 0, 196619, 7, 0, 196621, 7, 0, 196623, 8, 0, 262148, 24, 0, 262149, 25, 0, 262151, 25, 0, 262153, 25, 0, 262155, 10, 0, 262157, 10, 0, 262159, 11, 0, 327684, 24, 0, 327685, 25, 0, 327687, 10, 0, 327689, 10, 0, 327691, 10, 0, 327693, 10, 0, 327695, 11, 0, 393220, 24, 0, 393221, 25, 0, 393223, 10, 0, 393225, 10, 0, 393227, 10, 0, 393229, 10, 0, 393231, 11, 0, 458756, 24, 0, 458757, 25, 0, 458759, 25, 0, 458761, 25, 0, 458763, 10, 0, 458765, 10, 0, 458767, 11, 0, 524292, 9, 0, 524293, 10, 0, 524295, 10, 0, 524297, 10, 0, 524299, 10, 0, 524301, 10, 0, 524303, 11, 0, 589828, 12, 0, 589829, 13, 0, 589831, 13, 0, 589833, 13, 0, 589835, 13, 0, 589837, 13, 0, 589839, 14, 0 )
+tile_data = PoolIntArray( 1, 15, 0, 2, 16, 0, 4, 16, 0, 6, 17, 0, 7, 31, 0, 8, 5, 0, 9, 5, 0, 10, 5, 0, 11, 5, 0, 12, 5, 0, 13, 5, 0, 14, 5, 0, 65537, 18, 0, 65538, 19, 0, 65540, 19, 0, 65542, 20, 0, 65543, 31, 0, 65544, 5, 0, 65545, 5, 0, 65546, 5, 0, 65547, 5, 0, 65548, 5, 0, 65549, 5, 0, 65550, 5, 0, 131073, 21, 0, 131074, 22, 0, 131076, 22, 0, 131078, 23, 0, 131079, 6, 0, 131080, 7, 0, 131082, 7, 0, 131084, 7, 0, 131086, 8, 0, 196609, 24, 0, 196610, 25, 0, 196612, 25, 0, 196614, 25, 0, 196616, 25, 0, 196618, 25, 0, 196620, 10, 0, 196622, 11, 0, 262145, 24, 0, 262146, 25, 0, 262148, 25, 0, 262150, 25, 0, 262152, 25, 0, 262154, 25, 0, 262156, 10, 0, 262158, 11, 0, 327681, 24, 0, 327682, 25, 0, 327684, 25, 0, 327686, 25, 0, 327688, 25, 0, 327690, 25, 0, 327692, 10, 0, 327694, 11, 0, 393217, 24, 0, 393218, 25, 0, 393220, 25, 0, 393222, 25, 0, 393224, 25, 0, 393226, 25, 0, 393228, 10, 0, 393230, 11, 0, 458753, 27, 0, 458754, 28, 0, 458756, 28, 0, 458758, 28, 0, 458760, 13, 0, 458762, 13, 0, 458764, 13, 0, 458766, 14, 0 )
+
+[node name="Carpet" type="TileMap" parent="."]
+tile_set = ExtResource( 14 )
+cell_size = Vector2( 60, 60 )
+format = 1
+tile_data = PoolIntArray( 262146, 36, 0, 262147, 37, 0, 262148, 37, 0, 262149, 37, 0, 262150, 38, 0, 327682, 39, 0, 327683, 40, 0, 327684, 40, 0, 327685, 40, 0, 327686, 41, 0, 393218, 42, 0, 393219, 43, 0, 393220, 43, 0, 393221, 43, 0, 393222, 44, 0 )
+
+[node name="YSort" type="YSort" parent="."]
+
+[node name="Player" parent="YSort" instance=ExtResource( 1 )]
+position = Vector2( 437, 314 )
 
-[node name="Player" parent="." instance=ExtResource( 1 )]
-position = Vector2( 493, 347 )
+[node name="Furniture" type="TileMap" parent="YSort"]
+position = Vector2( -1, 0 )
+tile_set = ExtResource( 14 )
+cell_size = Vector2( 30, 30 )
+cell_y_sort = true
+format = 1
+tile_data = PoolIntArray( 131088, 45, 0, 458761, 47, 0, 524300, 48, 0, 524305, 35, 0, 524307, 35, 0, 524309, 35, 0, 524311, 35, 0, 524313, 35, 0, 589840, 32, 0, 655369, 46, 0, 720914, 34, 0, 720916, 34, 0, 720918, 34, 0, 720920, 34, 0, 720922, 34, 0 )
diff --git a/Player.tscn b/Player.tscn
index bc8165e..1ef4b06 100644
--- a/Player.tscn
+++ b/Player.tscn
@@ -21,11 +21,6 @@ animations = [ {
 "name": "MoveDown",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 3 ), ExtResource( 10 ), ExtResource( 3 ), ExtResource( 12 ) ],
-"loop": true,
-"name": "MoveRight",
-"speed": 5.0
-}, {
 "frames": [ ExtResource( 4 ), ExtResource( 13 ), ExtResource( 4 ), ExtResource( 8 ) ],
 "loop": true,
 "name": "MoveLeft",
@@ -36,6 +31,11 @@ animations = [ {
 "name": "MoveUp",
 "speed": 5.0
 }, {
+"frames": [ ExtResource( 3 ), ExtResource( 10 ), ExtResource( 3 ), ExtResource( 12 ) ],
+"loop": true,
+"name": "MoveRight",
+"speed": 5.0
+}, {
 "frames": [ ExtResource( 4 ) ],
 "loop": true,
 "name": "IdleLeft",
@@ -58,7 +58,7 @@ animations = [ {
 } ]
 
 [sub_resource type="RectangleShape2D" id=1]
-extents = Vector2( 21, 43.5 )
+extents = Vector2( 22, 4.5 )
 
 [node name="Player" type="KinematicBody2D"]
 position = Vector2( 4, 4 )
@@ -70,7 +70,7 @@ animation = "IdleDown"
 playing = true
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-position = Vector2( 0, -1.5 )
+position = Vector2( 0, 31.5 )
 shape = SubResource( 1 )
 
 [node name="RayCast2D" type="RayCast2D" parent="."]
diff --git a/Tiles/Furniture/carpet-patterned.png b/Tiles/Furniture/carpet-patterned.png
new file mode 100644
index 0000000..d883bfa
Binary files /dev/null and b/Tiles/Furniture/carpet-patterned.png differ
diff --git a/Tiles/Furniture/carpet-patterned.png.import b/Tiles/Furniture/carpet-patterned.png.import
new file mode 100644
index 0000000..fb0afa7
--- /dev/null
+++ b/Tiles/Furniture/carpet-patterned.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/carpet-patterned.png-c4ea28d5d420cd3862957766151db53e.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Tiles/Furniture/carpet-patterned.png"
+dest_files=[ "res://.import/carpet-patterned.png-c4ea28d5d420cd3862957766151db53e.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Tiles/Furniture/carpet.png b/Tiles/Furniture/carpet.png
new file mode 100644
index 0000000..781bf93
Binary files /dev/null and b/Tiles/Furniture/carpet.png differ
diff --git a/Tiles/Furniture/carpet.png.import b/Tiles/Furniture/carpet.png.import
new file mode 100644
index 0000000..4f5471d
--- /dev/null
+++ b/Tiles/Furniture/carpet.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/carpet.png-dd8f7ac1d07ad2a554bc55101e4e9d2e.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Tiles/Furniture/carpet.png"
+dest_files=[ "res://.import/carpet.png-dd8f7ac1d07ad2a554bc55101e4e9d2e.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Tiles/Furniture/chair-back.png b/Tiles/Furniture/chair-back.png
new file mode 100644
index 0000000..5478b7d
Binary files /dev/null and b/Tiles/Furniture/chair-back.png differ
diff --git a/Tiles/Furniture/chair-back.png.import b/Tiles/Furniture/chair-back.png.import
new file mode 100644
index 0000000..25c41e2
--- /dev/null
+++ b/Tiles/Furniture/chair-back.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/chair-back.png-b074a439fe1fad0f02b45d225d880ed9.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Tiles/Furniture/chair-back.png"
+dest_files=[ "res://.import/chair-back.png-b074a439fe1fad0f02b45d225d880ed9.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Tiles/Furniture/chair-front.png b/Tiles/Furniture/chair-front.png
new file mode 100644
index 0000000..4631b0a
Binary files /dev/null and b/Tiles/Furniture/chair-front.png differ
diff --git a/Tiles/Furniture/chair-front.png.import b/Tiles/Furniture/chair-front.png.import
new file mode 100644
index 0000000..caf12a7
--- /dev/null
+++ b/Tiles/Furniture/chair-front.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/chair-front.png-af29f0309acb177069cbab17470a2cae.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Tiles/Furniture/chair-front.png"
+dest_files=[ "res://.import/chair-front.png-af29f0309acb177069cbab17470a2cae.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Tiles/Furniture/dining-table.png b/Tiles/Furniture/dining-table.png
new file mode 100644
index 0000000..ae4b1f4
Binary files /dev/null and b/Tiles/Furniture/dining-table.png differ
diff --git a/Tiles/Furniture/dining-table.png.import b/Tiles/Furniture/dining-table.png.import
new file mode 100644
index 0000000..915da6f
--- /dev/null
+++ b/Tiles/Furniture/dining-table.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/dining-table.png-c4fc7913fd226aae26ec515efab3eab9.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Tiles/Furniture/dining-table.png"
+dest_files=[ "res://.import/dining-table.png-c4fc7913fd226aae26ec515efab3eab9.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Tiles/Furniture/kettle.png b/Tiles/Furniture/kettle.png
new file mode 100644
index 0000000..239a8e3
Binary files /dev/null and b/Tiles/Furniture/kettle.png differ
diff --git a/Tiles/Furniture/kettle.png.import b/Tiles/Furniture/kettle.png.import
new file mode 100644
index 0000000..e206890
--- /dev/null
+++ b/Tiles/Furniture/kettle.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/kettle.png-ef869f09ff4d83ccdf0f8cab6cf4799c.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Tiles/Furniture/kettle.png"
+dest_files=[ "res://.import/kettle.png-ef869f09ff4d83ccdf0f8cab6cf4799c.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Tiles/Furniture/kitchen-bottom.png b/Tiles/Furniture/kitchen-bottom.png
new file mode 100644
index 0000000..a8f04c1
Binary files /dev/null and b/Tiles/Furniture/kitchen-bottom.png differ
diff --git a/Tiles/Furniture/kitchen-bottom.png.import b/Tiles/Furniture/kitchen-bottom.png.import
new file mode 100644
index 0000000..c27ac40
--- /dev/null
+++ b/Tiles/Furniture/kitchen-bottom.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/kitchen-bottom.png-17aa0d7e8dfd8c1edc3add21dd5fbdcf.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Tiles/Furniture/kitchen-bottom.png"
+dest_files=[ "res://.import/kitchen-bottom.png-17aa0d7e8dfd8c1edc3add21dd5fbdcf.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Tiles/Furniture/sofa-chair-back.png b/Tiles/Furniture/sofa-chair-back.png
new file mode 100644
index 0000000..c87b1f4
Binary files /dev/null and b/Tiles/Furniture/sofa-chair-back.png differ
diff --git a/Tiles/Furniture/sofa-chair-back.png.import b/Tiles/Furniture/sofa-chair-back.png.import
new file mode 100644
index 0000000..e3f5819
--- /dev/null
+++ b/Tiles/Furniture/sofa-chair-back.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/sofa-chair-back.png-830194ffc1e54a778bcd233700386416.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Tiles/Furniture/sofa-chair-back.png"
+dest_files=[ "res://.import/sofa-chair-back.png-830194ffc1e54a778bcd233700386416.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Tiles/Furniture/sofa-chair-front.png b/Tiles/Furniture/sofa-chair-front.png
new file mode 100644
index 0000000..1458591
Binary files /dev/null and b/Tiles/Furniture/sofa-chair-front.png differ
diff --git a/Tiles/Furniture/sofa-chair-front.png.import b/Tiles/Furniture/sofa-chair-front.png.import
new file mode 100644
index 0000000..d2b089f
--- /dev/null
+++ b/Tiles/Furniture/sofa-chair-front.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/sofa-chair-front.png-fbcd73f313a52f21ab81a06198ef1f53.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Tiles/Furniture/sofa-chair-front.png"
+dest_files=[ "res://.import/sofa-chair-front.png-fbcd73f313a52f21ab81a06198ef1f53.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Tiles/Furniture/sofa.png b/Tiles/Furniture/sofa.png
index 549053e..5af41eb 100644
Binary files a/Tiles/Furniture/sofa.png and b/Tiles/Furniture/sofa.png differ
diff --git a/Tiles/backroom-backup.png b/Tiles/backroom-backup.png
index 363394e..58dcaff 100644
Binary files a/Tiles/backroom-backup.png and b/Tiles/backroom-backup.png differ
diff --git a/Tiles/backroom-glow.png b/Tiles/backroom-glow.png
new file mode 100644
index 0000000..9bebf21
Binary files /dev/null and b/Tiles/backroom-glow.png differ
diff --git a/Tiles/backroom-glow.png.import b/Tiles/backroom-glow.png.import
new file mode 100644
index 0000000..2e86462
--- /dev/null
+++ b/Tiles/backroom-glow.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/backroom-glow.png-57a2e640e141237eecd6d2c83911660f.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Tiles/backroom-glow.png"
+dest_files=[ "res://.import/backroom-glow.png-57a2e640e141237eecd6d2c83911660f.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Tiles/backroom.png b/Tiles/backroom.png
index 03f5d38..9bebf21 100644
Binary files a/Tiles/backroom.png and b/Tiles/backroom.png differ
diff --git a/Tiles/living-room-purple.png b/Tiles/living-room-purple.png
new file mode 100644
index 0000000..2bf5277
Binary files /dev/null and b/Tiles/living-room-purple.png differ
diff --git a/Tiles/living-room-purple.png.import b/Tiles/living-room-purple.png.import
new file mode 100644
index 0000000..93eb933
--- /dev/null
+++ b/Tiles/living-room-purple.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/living-room-purple.png-d2e7bbeaf8ca1f9ce8dc15b4b8517a1c.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Tiles/living-room-purple.png"
+dest_files=[ "res://.import/living-room-purple.png-d2e7bbeaf8ca1f9ce8dc15b4b8517a1c.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Tiles/living-room.png b/Tiles/living-room.png
index 2bf5277..167453a 100644
Binary files a/Tiles/living-room.png and b/Tiles/living-room.png differ
diff --git a/Tiles/tree.png b/Tiles/tree.png
new file mode 100644
index 0000000..efc0c58
Binary files /dev/null and b/Tiles/tree.png differ
diff --git a/Tiles/tree.png.import b/Tiles/tree.png.import
new file mode 100644
index 0000000..ec96ddf
--- /dev/null
+++ b/Tiles/tree.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/tree.png-8269745ec965fadee078eee47c19e573.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Tiles/tree.png"
+dest_files=[ "res://.import/tree.png-8269745ec965fadee078eee47c19e573.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/UI.tscn b/UI.tscn
new file mode 100644
index 0000000..e3034f0
--- /dev/null
+++ b/UI.tscn
@@ -0,0 +1,8 @@
+[gd_scene format=2]
+
+[node name="UI" type="Control"]
+margin_right = 40.0
+margin_bottom = 40.0
+__meta__ = {
+"_edit_use_anchors_": false
+}
diff --git a/export_presets.cfg b/export_presets.cfg
new file mode 100644
index 0000000..41e55c3
--- /dev/null
+++ b/export_presets.cfg
@@ -0,0 +1,24 @@
+[preset.0]
+
+name="Linux/X11"
+platform="Linux/X11"
+runnable=true
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path="./game.x86_64"
+script_export_mode=1
+script_encryption_key=""
+
+[preset.0.options]
+
+custom_template/debug=""
+custom_template/release=""
+binary_format/64_bits=true
+binary_format/embed_pck=false
+texture_format/bptc=false
+texture_format/s3tc=true
+texture_format/etc=false
+texture_format/etc2=false
+texture_format/no_bptc_fallbacks=true
diff --git a/game.pck b/game.pck
new file mode 100644
index 0000000..c709cc4
Binary files /dev/null and b/game.pck differ
diff --git a/game.x86_64 b/game.x86_64
new file mode 100755
index 0000000..be71c1b
Binary files /dev/null and b/game.x86_64 differ
diff --git a/limbo.tres b/limbo.tres
new file mode 100644
index 0000000..ccd68fb
--- /dev/null
+++ b/limbo.tres
@@ -0,0 +1,187 @@
+[gd_resource type="TileSet" load_steps=9 format=2]
+
+[ext_resource path="res://Tiles/backroom.png" type="Texture" id=1]
+
+[sub_resource type="ConvexPolygonShape2D" id=1]
+points = PoolVector2Array( 0, 0, 60, 0, 60, 180, 0, 180 )
+
+[sub_resource type="ConvexPolygonShape2D" id=2]
+points = PoolVector2Array( 120, 180, 0, 180, 0, 0, 120, 0 )
+
+[sub_resource type="ConvexPolygonShape2D" id=3]
+points = PoolVector2Array( 120, 180, 0, 180, 0, 0, 120, 0 )
+
+[sub_resource type="ConvexPolygonShape2D" id=4]
+points = PoolVector2Array( 60, 180, 0, 180, 0, 0, 60, 0 )
+
+[sub_resource type="ConvexPolygonShape2D" id=5]
+points = PoolVector2Array( 60, 180, 0, 180, 0, 0, 60, 0 )
+
+[sub_resource type="ConvexPolygonShape2D" id=6]
+points = PoolVector2Array( 60, 180, 0, 180, 0, 0, 60, 0 )
+
+[sub_resource type="ConvexPolygonShape2D" id=7]
+points = PoolVector2Array( 60, 180, 0, 180, 0, 0, 60, 0 )
+
+[resource]
+0/name = "backroom.png 0"
+0/texture = ExtResource( 1 )
+0/tex_offset = Vector2( 0, 0 )
+0/modulate = Color( 1, 1, 1, 1 )
+0/region = Rect2( 0, 0, 60, 300 )
+0/tile_mode = 0
+0/occluder_offset = Vector2( 0, 0 )
+0/navigation_offset = Vector2( 0, 0 )
+0/shape_offset = Vector2( 0, 0 )
+0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+0/shape = SubResource( 1 )
+0/shape_one_way = false
+0/shape_one_way_margin = 1.0
+0/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 1 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+0/z_index = 0
+1/name = "backroom.png 1"
+1/texture = ExtResource( 1 )
+1/tex_offset = Vector2( 0, 0 )
+1/modulate = Color( 1, 1, 1, 1 )
+1/region = Rect2( 60, 0, 120, 300 )
+1/tile_mode = 0
+1/occluder_offset = Vector2( 0, 0 )
+1/navigation_offset = Vector2( 0, 0 )
+1/shape_offset = Vector2( 0, 0 )
+1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+1/shape = SubResource( 2 )
+1/shape_one_way = false
+1/shape_one_way_margin = 1.0
+1/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 2 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+1/z_index = 0
+2/name = "backroom.png 2"
+2/texture = ExtResource( 1 )
+2/tex_offset = Vector2( 0, 0 )
+2/modulate = Color( 1, 1, 1, 1 )
+2/region = Rect2( 180, 0, 120, 300 )
+2/tile_mode = 0
+2/occluder_offset = Vector2( 0, 0 )
+2/navigation_offset = Vector2( 0, 0 )
+2/shape_offset = Vector2( 0, 0 )
+2/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+2/shape = SubResource( 3 )
+2/shape_one_way = false
+2/shape_one_way_margin = 1.0
+2/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 3 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+2/z_index = 0
+3/name = "backroom.png 3"
+3/texture = ExtResource( 1 )
+3/tex_offset = Vector2( 0, 0 )
+3/modulate = Color( 1, 1, 1, 1 )
+3/region = Rect2( 300, 0, 60, 180 )
+3/tile_mode = 0
+3/occluder_offset = Vector2( 0, 0 )
+3/navigation_offset = Vector2( 0, 0 )
+3/shape_offset = Vector2( 0, 0 )
+3/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+3/shape = SubResource( 4 )
+3/shape_one_way = false
+3/shape_one_way_margin = 1.0
+3/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 4 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+3/z_index = 0
+4/name = "backroom.png 4"
+4/texture = ExtResource( 1 )
+4/tex_offset = Vector2( 0, 0 )
+4/modulate = Color( 1, 1, 1, 1 )
+4/region = Rect2( 360, 0, 60, 180 )
+4/tile_mode = 0
+4/occluder_offset = Vector2( 0, 0 )
+4/navigation_offset = Vector2( 0, 0 )
+4/shape_offset = Vector2( 0, 0 )
+4/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+4/shape = SubResource( 5 )
+4/shape_one_way = false
+4/shape_one_way_margin = 1.0
+4/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 5 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+4/z_index = 0
+5/name = "backroom.png 5"
+5/texture = ExtResource( 1 )
+5/tex_offset = Vector2( 0, 0 )
+5/modulate = Color( 1, 1, 1, 1 )
+5/region = Rect2( 420, 0, 60, 180 )
+5/tile_mode = 0
+5/occluder_offset = Vector2( 0, 0 )
+5/navigation_offset = Vector2( 0, 0 )
+5/shape_offset = Vector2( 0, 0 )
+5/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+5/shape = SubResource( 6 )
+5/shape_one_way = false
+5/shape_one_way_margin = 1.0
+5/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 6 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+5/z_index = 0
+6/name = "backroom.png 6"
+6/texture = ExtResource( 1 )
+6/tex_offset = Vector2( 0, 0 )
+6/modulate = Color( 1, 1, 1, 1 )
+6/region = Rect2( 480, 0, 60, 300 )
+6/tile_mode = 0
+6/occluder_offset = Vector2( 0, 0 )
+6/navigation_offset = Vector2( 0, 0 )
+6/shape_offset = Vector2( 0, 0 )
+6/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+6/shape = SubResource( 7 )
+6/shape_one_way = false
+6/shape_one_way_margin = 1.0
+6/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 7 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+6/z_index = 0
+7/name = "backroom.png 7"
+7/texture = ExtResource( 1 )
+7/tex_offset = Vector2( 0, 0 )
+7/modulate = Color( 1, 1, 1, 1 )
+7/region = Rect2( 180, 180, 60, 120 )
+7/tile_mode = 0
+7/occluder_offset = Vector2( 0, 0 )
+7/navigation_offset = Vector2( 0, 0 )
+7/shape_offset = Vector2( 0, 0 )
+7/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+7/shape_one_way = false
+7/shape_one_way_margin = 0.0
+7/shapes = [  ]
+7/z_index = 0
diff --git a/limbo.tscn b/limbo.tscn
new file mode 100644
index 0000000..6669ca1
--- /dev/null
+++ b/limbo.tscn
@@ -0,0 +1,11 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://limbo.tres" type="TileSet" id=1]
+
+[node name="Node2D" type="Node2D"]
+
+[node name="TileMap" type="TileMap" parent="."]
+tile_set = ExtResource( 1 )
+cell_size = Vector2( 60, 60 )
+format = 1
+tile_data = PoolIntArray( 0, 5, 0, 1, 1, 0, 3, 2, 0, 5, 3, 0, 6, 4, 0, 7, 4, 0, 8, 5, 0, 9, 1, 0, 11, 2, 0, 13, 3, 0, 14, 4, 0, 15, 5, 0, 196608, 7, 0, 196613, 7, 0, 196614, 7, 0, 196615, 7, 0, 196616, 7, 0, 196621, 7, 0, 196622, 7, 0, 196623, 7, 0 )
diff --git a/lodge.tres b/lodge.tres
index f88f023..6f29828 100644
--- a/lodge.tres
+++ b/lodge.tres
@@ -1,23 +1,107 @@
-[gd_resource type="TileSet" load_steps=4 format=2]
+[gd_resource type="TileSet" load_steps=35 format=2]
 
 [ext_resource path="res://Tiles/bedroom.png" type="Texture" id=1]
 [ext_resource path="res://Tiles/living-room.png" type="Texture" id=2]
 [ext_resource path="res://Tiles/corridor.png" type="Texture" id=3]
+[ext_resource path="res://Tiles/Furniture/dining-table.png" type="Texture" id=4]
+[ext_resource path="res://Tiles/Furniture/kitchen-bottom.png" type="Texture" id=5]
+[ext_resource path="res://Tiles/Furniture/chair-front.png" type="Texture" id=6]
+[ext_resource path="res://Tiles/Furniture/chair-back.png" type="Texture" id=7]
+[ext_resource path="res://Tiles/Furniture/carpet.png" type="Texture" id=8]
+[ext_resource path="res://Tiles/Furniture/sofa-chair-back.png" type="Texture" id=9]
+[ext_resource path="res://Tiles/Furniture/sofa-chair-front.png" type="Texture" id=10]
+[ext_resource path="res://Tiles/Furniture/sofa.png" type="Texture" id=11]
+
+[sub_resource type="ConvexPolygonShape2D" id=10]
+points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 )
+
+[sub_resource type="ConvexPolygonShape2D" id=1]
+points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 )
+
+[sub_resource type="ConvexPolygonShape2D" id=2]
+points = PoolVector2Array( 120, 60, 0, 60, 0, 0, 120, 0 )
+
+[sub_resource type="ConvexPolygonShape2D" id=3]
+points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 )
+
+[sub_resource type="ConvexPolygonShape2D" id=4]
+points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 )
+
+[sub_resource type="ConvexPolygonShape2D" id=5]
+points = PoolVector2Array( 120, 60, 0, 60, 0, 0, 120, 0 )
+
+[sub_resource type="ConvexPolygonShape2D" id=6]
+points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 )
+
+[sub_resource type="ConvexPolygonShape2D" id=7]
+points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 )
+
+[sub_resource type="ConvexPolygonShape2D" id=8]
+points = PoolVector2Array( 120, 60, 0, 60, 0, 0, 120, 0 )
+
+[sub_resource type="ConvexPolygonShape2D" id=9]
+points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 )
+
+[sub_resource type="ConvexPolygonShape2D" id=11]
+points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 )
+
+[sub_resource type="ConvexPolygonShape2D" id=25]
+points = PoolVector2Array( 7.25, 30.25, 351.25, 30.25, 351.25, 107.25, 7.25, 107.25 )
+
+[sub_resource type="ConvexPolygonShape2D" id=19]
+points = PoolVector2Array( 36, 30, 0, 30, 0, 60, 36, 60 )
+
+[sub_resource type="ConvexPolygonShape2D" id=20]
+points = PoolVector2Array( 30, 60, 0, 60, 0, 60, 30, 60 )
+
+[sub_resource type="ConvexPolygonShape2D" id=12]
+points = PoolVector2Array( 120, 60, 60, 60, 60, 0, 120, 0 )
+
+[sub_resource type="ConvexPolygonShape2D" id=21]
+points = PoolVector2Array( 0, 0, 420, 0, 420, 180, 330, 180, 330, 150, 0, 150 )
+
+[sub_resource type="ConvexPolygonShape2D" id=22]
+points = PoolVector2Array( 15, 30, 75, 30, 75, 90, 15, 90 )
+
+[sub_resource type="ConvexPolygonShape2D" id=23]
+points = PoolVector2Array( 75, 90, 15, 90, 15, 30, 75, 30 )
+
+[sub_resource type="ConvexPolygonShape2D" id=24]
+points = PoolVector2Array( 0, 45, 60, 45, 60, 150, 0, 150 )
+
+[sub_resource type="ConvexPolygonShape2D" id=13]
+points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 )
+
+[sub_resource type="ConvexPolygonShape2D" id=14]
+points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 )
+
+[sub_resource type="ConvexPolygonShape2D" id=15]
+points = PoolVector2Array( 120, 60, 0, 60, 0, 0, 120, 0 )
+
+[sub_resource type="ConvexPolygonShape2D" id=16]
+points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 )
 
 [resource]
 1/name = "Corridor"
 1/texture = ExtResource( 3 )
 1/tex_offset = Vector2( 0, 0 )
 1/modulate = Color( 1, 1, 1, 1 )
-1/region = Rect2( 0, 0, 60, 60 )
+1/region = Rect2( 60, 0, 60, 60 )
 1/tile_mode = 0
 1/occluder_offset = Vector2( 120, 120 )
 1/navigation_offset = Vector2( 120, 120 )
 1/shape_offset = Vector2( 0, 0 )
 1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+1/shape = SubResource( 10 )
 1/shape_one_way = false
-1/shape_one_way_margin = 0.0
-1/shapes = [  ]
+1/shape_one_way_margin = 1.0
+1/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 10 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
 1/z_index = 0
 2/name = "Bedroom"
 2/texture = ExtResource( 1 )
@@ -43,9 +127,16 @@
 4/navigation_offset = Vector2( 0, 0 )
 4/shape_offset = Vector2( 0, 0 )
 4/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+4/shape = SubResource( 12 )
 4/shape_one_way = false
-4/shape_one_way_margin = 0.0
-4/shapes = [  ]
+4/shape_one_way_margin = 1.0
+4/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 12 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
 4/z_index = 0
 5/name = "corridor.png 5"
 5/texture = ExtResource( 3 )
@@ -57,9 +148,16 @@
 5/navigation_offset = Vector2( 0, 0 )
 5/shape_offset = Vector2( 0, 0 )
 5/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+5/shape = SubResource( 13 )
 5/shape_one_way = false
-5/shape_one_way_margin = 0.0
-5/shapes = [  ]
+5/shape_one_way_margin = 1.0
+5/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 13 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
 5/z_index = 0
 6/name = "corridor.png 6"
 6/texture = ExtResource( 3 )
@@ -71,9 +169,16 @@
 6/navigation_offset = Vector2( 0, 0 )
 6/shape_offset = Vector2( 0, 0 )
 6/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+6/shape = SubResource( 14 )
 6/shape_one_way = false
-6/shape_one_way_margin = 0.0
-6/shapes = [  ]
+6/shape_one_way_margin = 1.0
+6/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 14 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
 6/z_index = 0
 7/name = "corridor.png 7"
 7/texture = ExtResource( 3 )
@@ -85,9 +190,16 @@
 7/navigation_offset = Vector2( 0, 0 )
 7/shape_offset = Vector2( 0, 0 )
 7/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+7/shape = SubResource( 15 )
 7/shape_one_way = false
-7/shape_one_way_margin = 0.0
-7/shapes = [  ]
+7/shape_one_way_margin = 1.0
+7/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 15 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
 7/z_index = 0
 8/name = "corridor.png 8"
 8/texture = ExtResource( 3 )
@@ -99,9 +211,16 @@
 8/navigation_offset = Vector2( 0, 0 )
 8/shape_offset = Vector2( 0, 0 )
 8/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+8/shape = SubResource( 16 )
 8/shape_one_way = false
-8/shape_one_way_margin = 0.0
-8/shapes = [  ]
+8/shape_one_way_margin = 1.0
+8/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 16 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
 8/z_index = 0
 9/name = "corridor.png 9"
 9/texture = ExtResource( 3 )
@@ -197,9 +316,16 @@
 15/navigation_offset = Vector2( 0, 0 )
 15/shape_offset = Vector2( 0, 0 )
 15/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+15/shape = SubResource( 1 )
 15/shape_one_way = false
-15/shape_one_way_margin = 0.0
-15/shapes = [  ]
+15/shape_one_way_margin = 1.0
+15/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 1 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
 15/z_index = 0
 16/name = "living-room.png 16"
 16/texture = ExtResource( 2 )
@@ -211,9 +337,16 @@
 16/navigation_offset = Vector2( 0, 0 )
 16/shape_offset = Vector2( 0, 0 )
 16/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+16/shape = SubResource( 2 )
 16/shape_one_way = false
-16/shape_one_way_margin = 0.0
-16/shapes = [  ]
+16/shape_one_way_margin = 1.0
+16/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 2 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
 16/z_index = 0
 17/name = "living-room.png 17"
 17/texture = ExtResource( 2 )
@@ -225,9 +358,16 @@
 17/navigation_offset = Vector2( 0, 0 )
 17/shape_offset = Vector2( 0, 0 )
 17/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+17/shape = SubResource( 3 )
 17/shape_one_way = false
-17/shape_one_way_margin = 0.0
-17/shapes = [  ]
+17/shape_one_way_margin = 1.0
+17/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 3 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
 17/z_index = 0
 18/name = "living-room.png 18"
 18/texture = ExtResource( 2 )
@@ -239,9 +379,16 @@
 18/navigation_offset = Vector2( 0, 0 )
 18/shape_offset = Vector2( 0, 0 )
 18/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+18/shape = SubResource( 4 )
 18/shape_one_way = false
-18/shape_one_way_margin = 0.0
-18/shapes = [  ]
+18/shape_one_way_margin = 1.0
+18/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 4 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
 18/z_index = 0
 19/name = "living-room.png 19"
 19/texture = ExtResource( 2 )
@@ -253,9 +400,16 @@
 19/navigation_offset = Vector2( 0, 0 )
 19/shape_offset = Vector2( 0, 0 )
 19/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+19/shape = SubResource( 5 )
 19/shape_one_way = false
-19/shape_one_way_margin = 0.0
-19/shapes = [  ]
+19/shape_one_way_margin = 1.0
+19/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 5 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
 19/z_index = 0
 20/name = "living-room.png 20"
 20/texture = ExtResource( 2 )
@@ -267,9 +421,16 @@
 20/navigation_offset = Vector2( 0, 0 )
 20/shape_offset = Vector2( 0, 0 )
 20/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+20/shape = SubResource( 6 )
 20/shape_one_way = false
-20/shape_one_way_margin = 0.0
-20/shapes = [  ]
+20/shape_one_way_margin = 1.0
+20/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 6 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
 20/z_index = 0
 21/name = "living-room.png 21"
 21/texture = ExtResource( 2 )
@@ -281,9 +442,16 @@
 21/navigation_offset = Vector2( 0, 0 )
 21/shape_offset = Vector2( 0, 0 )
 21/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+21/shape = SubResource( 7 )
 21/shape_one_way = false
-21/shape_one_way_margin = 0.0
-21/shapes = [  ]
+21/shape_one_way_margin = 1.0
+21/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 7 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
 21/z_index = 0
 22/name = "living-room.png 22"
 22/texture = ExtResource( 2 )
@@ -295,9 +463,16 @@
 22/navigation_offset = Vector2( 0, 0 )
 22/shape_offset = Vector2( 0, 0 )
 22/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+22/shape = SubResource( 8 )
 22/shape_one_way = false
-22/shape_one_way_margin = 0.0
-22/shapes = [  ]
+22/shape_one_way_margin = 1.0
+22/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 8 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
 22/z_index = 0
 23/name = "living-room.png 23"
 23/texture = ExtResource( 2 )
@@ -309,9 +484,16 @@
 23/navigation_offset = Vector2( 0, 0 )
 23/shape_offset = Vector2( 0, 0 )
 23/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+23/shape = SubResource( 9 )
 23/shape_one_way = false
-23/shape_one_way_margin = 0.0
-23/shapes = [  ]
+23/shape_one_way_margin = 1.0
+23/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 9 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
 23/z_index = 0
 24/name = "living-room.png 24"
 24/texture = ExtResource( 2 )
@@ -397,3 +579,311 @@
 29/shape_one_way_margin = 0.0
 29/shapes = [  ]
 29/z_index = 0
+30/name = "Living-room"
+30/texture = ExtResource( 2 )
+30/tex_offset = Vector2( 0, 0 )
+30/modulate = Color( 1, 1, 1, 1 )
+30/region = Rect2( 0, 0, 240, 300 )
+30/tile_mode = 0
+30/occluder_offset = Vector2( 120, 150 )
+30/navigation_offset = Vector2( 120, 150 )
+30/shape_offset = Vector2( 0, 0 )
+30/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+30/shape_one_way = false
+30/shape_one_way_margin = 0.0
+30/shapes = [  ]
+30/z_index = 0
+31/name = "corridor.png 31"
+31/texture = ExtResource( 3 )
+31/tex_offset = Vector2( 0, 0 )
+31/modulate = Color( 1, 1, 1, 1 )
+31/region = Rect2( 0, 0, 60, 60 )
+31/tile_mode = 0
+31/occluder_offset = Vector2( 0, 0 )
+31/navigation_offset = Vector2( 0, 0 )
+31/shape_offset = Vector2( 0, 0 )
+31/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+31/shape = SubResource( 11 )
+31/shape_one_way = false
+31/shape_one_way_margin = 1.0
+31/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 11 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+31/z_index = 0
+32/name = "dining-table.png 32"
+32/texture = ExtResource( 4 )
+32/tex_offset = Vector2( 0, 0 )
+32/modulate = Color( 1, 1, 1, 1 )
+32/region = Rect2( 0, 0, 360, 120 )
+32/tile_mode = 0
+32/occluder_offset = Vector2( 0, 0 )
+32/navigation_offset = Vector2( 0, 0 )
+32/shape_offset = Vector2( 0, 0 )
+32/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+32/shape = SubResource( 25 )
+32/shape_one_way = false
+32/shape_one_way_margin = 1.0
+32/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 25 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+32/z_index = 0
+34/name = "chair-back.png 34"
+34/texture = ExtResource( 7 )
+34/tex_offset = Vector2( 0, 0 )
+34/modulate = Color( 1, 1, 1, 1 )
+34/region = Rect2( 0, 0, 36, 60 )
+34/tile_mode = 0
+34/occluder_offset = Vector2( 0, 0 )
+34/navigation_offset = Vector2( 0, 0 )
+34/shape_offset = Vector2( 0, 0 )
+34/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+34/shape = SubResource( 19 )
+34/shape_one_way = false
+34/shape_one_way_margin = 1.0
+34/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 19 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+34/z_index = 0
+35/name = "chair-front.png 35"
+35/texture = ExtResource( 6 )
+35/tex_offset = Vector2( 0, 0 )
+35/modulate = Color( 1, 1, 1, 1 )
+35/region = Rect2( 0, 0, 36, 60 )
+35/tile_mode = 0
+35/occluder_offset = Vector2( 0, 0 )
+35/navigation_offset = Vector2( 0, 0 )
+35/shape_offset = Vector2( 0, 0 )
+35/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+35/shape = SubResource( 20 )
+35/shape_one_way = false
+35/shape_one_way_margin = 1.0
+35/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 20 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+35/z_index = 0
+36/name = "carpet.png 36"
+36/texture = ExtResource( 8 )
+36/tex_offset = Vector2( 0, 0 )
+36/modulate = Color( 1, 1, 1, 1 )
+36/region = Rect2( 0, 0, 60, 60 )
+36/tile_mode = 0
+36/occluder_offset = Vector2( 0, 0 )
+36/navigation_offset = Vector2( 0, 0 )
+36/shape_offset = Vector2( 0, 0 )
+36/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+36/shape_one_way = false
+36/shape_one_way_margin = 0.0
+36/shapes = [  ]
+36/z_index = 0
+37/name = "carpet.png 37"
+37/texture = ExtResource( 8 )
+37/tex_offset = Vector2( 0, 0 )
+37/modulate = Color( 1, 1, 1, 1 )
+37/region = Rect2( 60, 0, 60, 60 )
+37/tile_mode = 0
+37/occluder_offset = Vector2( 0, 0 )
+37/navigation_offset = Vector2( 0, 0 )
+37/shape_offset = Vector2( 0, 0 )
+37/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+37/shape_one_way = false
+37/shape_one_way_margin = 0.0
+37/shapes = [  ]
+37/z_index = 0
+38/name = "carpet.png 38"
+38/texture = ExtResource( 8 )
+38/tex_offset = Vector2( 0, 0 )
+38/modulate = Color( 1, 1, 1, 1 )
+38/region = Rect2( 120, 0, 60, 60 )
+38/tile_mode = 0
+38/occluder_offset = Vector2( 0, 0 )
+38/navigation_offset = Vector2( 0, 0 )
+38/shape_offset = Vector2( 0, 0 )
+38/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+38/shape_one_way = false
+38/shape_one_way_margin = 0.0
+38/shapes = [  ]
+38/z_index = 0
+39/name = "carpet.png 39"
+39/texture = ExtResource( 8 )
+39/tex_offset = Vector2( 0, 0 )
+39/modulate = Color( 1, 1, 1, 1 )
+39/region = Rect2( 0, 60, 60, 60 )
+39/tile_mode = 0
+39/occluder_offset = Vector2( 0, 0 )
+39/navigation_offset = Vector2( 0, 0 )
+39/shape_offset = Vector2( 0, 0 )
+39/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+39/shape_one_way = false
+39/shape_one_way_margin = 0.0
+39/shapes = [  ]
+39/z_index = 0
+40/name = "carpet.png 40"
+40/texture = ExtResource( 8 )
+40/tex_offset = Vector2( 0, 0 )
+40/modulate = Color( 1, 1, 1, 1 )
+40/region = Rect2( 60, 60, 60, 60 )
+40/tile_mode = 0
+40/occluder_offset = Vector2( 0, 0 )
+40/navigation_offset = Vector2( 0, 0 )
+40/shape_offset = Vector2( 0, 0 )
+40/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+40/shape_one_way = false
+40/shape_one_way_margin = 0.0
+40/shapes = [  ]
+40/z_index = 0
+41/name = "carpet.png 41"
+41/texture = ExtResource( 8 )
+41/tex_offset = Vector2( 0, 0 )
+41/modulate = Color( 1, 1, 1, 1 )
+41/region = Rect2( 120, 60, 60, 60 )
+41/tile_mode = 0
+41/occluder_offset = Vector2( 0, 0 )
+41/navigation_offset = Vector2( 0, 0 )
+41/shape_offset = Vector2( 0, 0 )
+41/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+41/shape_one_way = false
+41/shape_one_way_margin = 0.0
+41/shapes = [  ]
+41/z_index = 0
+42/name = "carpet.png 42"
+42/texture = ExtResource( 8 )
+42/tex_offset = Vector2( 0, 0 )
+42/modulate = Color( 1, 1, 1, 1 )
+42/region = Rect2( 0, 120, 60, 60 )
+42/tile_mode = 0
+42/occluder_offset = Vector2( 0, 0 )
+42/navigation_offset = Vector2( 0, 0 )
+42/shape_offset = Vector2( 0, 0 )
+42/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+42/shape_one_way = false
+42/shape_one_way_margin = 0.0
+42/shapes = [  ]
+42/z_index = 0
+43/name = "carpet.png 43"
+43/texture = ExtResource( 8 )
+43/tex_offset = Vector2( 0, 0 )
+43/modulate = Color( 1, 1, 1, 1 )
+43/region = Rect2( 60, 120, 60, 60 )
+43/tile_mode = 0
+43/occluder_offset = Vector2( 0, 0 )
+43/navigation_offset = Vector2( 0, 0 )
+43/shape_offset = Vector2( 0, 0 )
+43/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+43/shape_one_way = false
+43/shape_one_way_margin = 0.0
+43/shapes = [  ]
+43/z_index = 0
+44/name = "carpet.png 44"
+44/texture = ExtResource( 8 )
+44/tex_offset = Vector2( 0, 0 )
+44/modulate = Color( 1, 1, 1, 1 )
+44/region = Rect2( 120, 120, 60, 60 )
+44/tile_mode = 0
+44/occluder_offset = Vector2( 0, 0 )
+44/navigation_offset = Vector2( 0, 0 )
+44/shape_offset = Vector2( 0, 0 )
+44/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+44/shape_one_way = false
+44/shape_one_way_margin = 0.0
+44/shapes = [  ]
+44/z_index = 0
+45/name = "kitchen-bottom.png 45"
+45/texture = ExtResource( 5 )
+45/tex_offset = Vector2( 0, 0 )
+45/modulate = Color( 1, 1, 1, 1 )
+45/region = Rect2( 0, 0, 420, 180 )
+45/tile_mode = 0
+45/occluder_offset = Vector2( 0, 0 )
+45/navigation_offset = Vector2( 0, 0 )
+45/shape_offset = Vector2( 0, 0 )
+45/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+45/shape = SubResource( 21 )
+45/shape_one_way = false
+45/shape_one_way_margin = 1.0
+45/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 21 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+45/z_index = 0
+46/name = "sofa-chair-back.png 46"
+46/texture = ExtResource( 9 )
+46/tex_offset = Vector2( 0, 0 )
+46/modulate = Color( 1, 1, 1, 1 )
+46/region = Rect2( 0, 0, 90, 90 )
+46/tile_mode = 0
+46/occluder_offset = Vector2( 0, 0 )
+46/navigation_offset = Vector2( 0, 0 )
+46/shape_offset = Vector2( 0, 0 )
+46/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+46/shape = SubResource( 22 )
+46/shape_one_way = false
+46/shape_one_way_margin = 1.0
+46/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 22 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+46/z_index = 0
+47/name = "sofa-chair-front.png 47"
+47/texture = ExtResource( 10 )
+47/tex_offset = Vector2( 0, 0 )
+47/modulate = Color( 1, 1, 1, 1 )
+47/region = Rect2( 0, 0, 90, 90 )
+47/tile_mode = 0
+47/occluder_offset = Vector2( 0, 0 )
+47/navigation_offset = Vector2( 0, 0 )
+47/shape_offset = Vector2( 0, 0 )
+47/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+47/shape = SubResource( 23 )
+47/shape_one_way = false
+47/shape_one_way_margin = 1.0
+47/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 23 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+47/z_index = 0
+48/name = "sofa.png 48"
+48/texture = ExtResource( 11 )
+48/tex_offset = Vector2( 0, 0 )
+48/modulate = Color( 1, 1, 1, 1 )
+48/region = Rect2( 15, 0, 60, 150 )
+48/tile_mode = 0
+48/occluder_offset = Vector2( 0, 0 )
+48/navigation_offset = Vector2( 0, 0 )
+48/shape_offset = Vector2( 0, 0 )
+48/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+48/shape = SubResource( 24 )
+48/shape_one_way = false
+48/shape_one_way_margin = 1.0
+48/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 24 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+48/z_index = 0