Housekeeping for all the new stuff that diverged from the reorganization

82 files changed, 165 insertions, 165 deletions

diff --git a/maps/main_stage/assets/mast/crows_nest.material b/maps/main_stage/assets/mast/crows_nest.material
deleted file mode 100644
index 4437a81..0000000
--- a/maps/main_stage/assets/mast/crows_nest.material
+++ /dev/null
diff --git a/maps/main_stage/assets/mast/ladder.material b/maps/main_stage/assets/mast/ladder.material
deleted file mode 100644
index b3c9cf3..0000000
--- a/maps/main_stage/assets/mast/ladder.material
+++ /dev/null
diff --git a/maps/main_stage/assets/mast/mast.material b/maps/main_stage/assets/mast/mast.material
deleted file mode 100644
index f8c010f..0000000
--- a/maps/main_stage/assets/mast/mast.material
+++ /dev/null
diff --git a/maps/main_stage/assets/ship_control_panel/main_control_panel_mat.material b/maps/main_stage/assets/ship_control_panel/main_control_panel_mat.material
deleted file mode 100644
index 2328405..0000000
--- a/maps/main_stage/assets/ship_control_panel/main_control_panel_mat.material
+++ /dev/null
diff --git a/maps/main_stage/assets/steering_wheel/steering_wheel Base Color.png.import b/maps/main_stage/assets/steering_wheel/steering_wheel Base Color.png.import
deleted file mode 100644
index a1937bc..0000000
--- a/maps/main_stage/assets/steering_wheel/steering_wheel Base Color.png.import
+++ /dev/null
@@ -1,37 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path.s3tc="res://.import/steering_wheel Base Color.png-f763f093f99570d06f1065ea3be6ba8c.s3tc.stex"
-path.etc2="res://.import/steering_wheel Base Color.png-f763f093f99570d06f1065ea3be6ba8c.etc2.stex"
-metadata={
-"imported_formats": [ "s3tc", "etc2" ],
-"vram_texture": true
-}
-
-[deps]
-
-source_file="res://maps/main_stage/assets/steering_wheel/steering_wheel Base Color.png"
-dest_files=[ "res://.import/steering_wheel Base Color.png-f763f093f99570d06f1065ea3be6ba8c.s3tc.stex", "res://.import/steering_wheel Base Color.png-f763f093f99570d06f1065ea3be6ba8c.etc2.stex" ]
-
-[params]
-
-compress/mode=2
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=true
-flags/filter=true
-flags/mipmaps=true
-flags/anisotropic=false
-flags/srgb=1
-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=false
-svg/scale=1.0
diff --git a/maps/main_stage/assets/steering_wheel/steering_wheel.material b/maps/main_stage/assets/steering_wheel/steering_wheel.material
deleted file mode 100644
index 896f4c3..0000000
--- a/maps/main_stage/assets/steering_wheel/steering_wheel.material
+++ /dev/null
diff --git a/maps/main_stage/assets/steering_wheel/steering_wheel_normal.png.import b/maps/main_stage/assets/steering_wheel/steering_wheel_normal.png.import
deleted file mode 100644
index ddc7b0c..0000000
--- a/maps/main_stage/assets/steering_wheel/steering_wheel_normal.png.import
+++ /dev/null
@@ -1,37 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path.s3tc="res://.import/steering_wheel_normal.png-4e9e7b37f2534336ba37a1a661d9991b.s3tc.stex"
-path.etc2="res://.import/steering_wheel_normal.png-4e9e7b37f2534336ba37a1a661d9991b.etc2.stex"
-metadata={
-"imported_formats": [ "s3tc", "etc2" ],
-"vram_texture": true
-}
-
-[deps]
-
-source_file="res://maps/main_stage/assets/steering_wheel/steering_wheel_normal.png"
-dest_files=[ "res://.import/steering_wheel_normal.png-4e9e7b37f2534336ba37a1a661d9991b.s3tc.stex", "res://.import/steering_wheel_normal.png-4e9e7b37f2534336ba37a1a661d9991b.etc2.stex" ]
-
-[params]
-
-compress/mode=2
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=1
-flags/repeat=true
-flags/filter=true
-flags/mipmaps=true
-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=false
-svg/scale=1.0
diff --git a/maps/main_stage/assets/steering_wheel/wheel_base.material b/maps/main_stage/assets/steering_wheel/wheel_base.material
deleted file mode 100644
index 626adf9..0000000
--- a/maps/main_stage/assets/steering_wheel/wheel_base.material
+++ /dev/null
diff --git a/maps/main_stage/assets/water_pump/SCREEN.material b/maps/main_stage/assets/water_pump/SCREEN.material
deleted file mode 100644
index 5417937..0000000
--- a/maps/main_stage/assets/water_pump/SCREEN.material
+++ /dev/null
diff --git a/maps/main_stage/assets/water_pump/pipes.material b/maps/main_stage/assets/water_pump/pipes.material
deleted file mode 100644
index d50374a..0000000
--- a/maps/main_stage/assets/water_pump/pipes.material
+++ /dev/null
diff --git a/maps/main_stage/assets/water_pump/reset_button.material b/maps/main_stage/assets/water_pump/reset_button.material
deleted file mode 100644
index cc56fb3..0000000
--- a/maps/main_stage/assets/water_pump/reset_button.material
+++ /dev/null
diff --git a/maps/main_stage/assets/water_pump/start_button.material b/maps/main_stage/assets/water_pump/start_button.material
deleted file mode 100644
index 7e86fe7..0000000
--- a/maps/main_stage/assets/water_pump/start_button.material
+++ /dev/null
diff --git a/maps/main_stage/assets/water_pump/water_pump.material b/maps/main_stage/assets/water_pump/water_pump.material
deleted file mode 100644
index 10b8a97..0000000
--- a/maps/main_stage/assets/water_pump/water_pump.material
+++ /dev/null
diff --git a/maps/main_stage/assets/light_fixture/light_fixture.blend b/ship/light_fixture/light_fixture.blend
index 33de7a5..33de7a5 100644
--- a/maps/main_stage/assets/light_fixture/light_fixture.blend
+++ b/ship/light_fixture/light_fixture.blend
diff --git a/maps/main_stage/assets/light_fixture/light_fixture.gltf b/ship/light_fixture/light_fixture.gltf
index f1dacb0..f1dacb0 100644
--- a/maps/main_stage/assets/light_fixture/light_fixture.gltf
+++ b/ship/light_fixture/light_fixture.gltf
diff --git a/maps/main_stage/assets/light_fixture/light_fixture.gltf.import b/ship/light_fixture/light_fixture.gltf.import
index e2b8507..94593c2 100644
--- a/maps/main_stage/assets/light_fixture/light_fixture.gltf.import
+++ b/ship/light_fixture/light_fixture.gltf.import
@@ -2,12 +2,12 @@
 
 importer="scene"
 type="PackedScene"
-path="res://.import/light_fixture.gltf-64bebc36f543e64db1586a730c386402.scn"
+path="res://.import/light_fixture.gltf-da47b8efdfc2013042bb37b9b308ff95.scn"
 
 [deps]
 
-source_file="res://maps/main_stage/assets/light_fixture/light_fixture.gltf"
-dest_files=[ "res://.import/light_fixture.gltf-64bebc36f543e64db1586a730c386402.scn" ]
+source_file="res://ship/light_fixture/light_fixture.gltf"
+dest_files=[ "res://.import/light_fixture.gltf-da47b8efdfc2013042bb37b9b308ff95.scn" ]
 
 [params]
 
diff --git a/maps/main_stage/assets/light_fixture/light_fixture.tres b/ship/light_fixture/light_fixture.tres
index bbabd53..bbabd53 100644
--- a/maps/main_stage/assets/light_fixture/light_fixture.tres
+++ b/ship/light_fixture/light_fixture.tres
diff --git a/maps/main_stage/assets/light_fixture/light_fixture.tscn b/ship/light_fixture/light_fixture.tscn
index d340c5a..9f6b3af 100644
--- a/maps/main_stage/assets/light_fixture/light_fixture.tscn
+++ b/ship/light_fixture/light_fixture.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=5 format=2]
 
-[ext_resource path="res://maps/main_stage/assets/light_fixture/light_fixture.gltf" type="PackedScene" id=1]
-[ext_resource path="res://maps/main_stage/assets/light_fixture/light_fixture.tres" type="Material" id=2]
+[ext_resource path="res://ship/light_fixture/light_fixture.gltf" type="PackedScene" id=1]
+[ext_resource path="res://ship/light_fixture/light_fixture.tres" type="Material" id=2]
 
 [sub_resource type="SpatialMaterial" id=23]
 emission_enabled = true
diff --git a/ship/mast/crows_nest.material b/ship/mast/crows_nest.material
new file mode 100644
index 0000000..16d983f
--- /dev/null
+++ b/ship/mast/crows_nest.material
diff --git a/maps/main_stage/assets/mast/crows_nest_albedo.png b/ship/mast/crows_nest_albedo.png
index d522bd3..d522bd3 100644
--- a/maps/main_stage/assets/mast/crows_nest_albedo.png
+++ b/ship/mast/crows_nest_albedo.png
diff --git a/maps/main_stage/assets/mast/crows_nest_albedo.png.import b/ship/mast/crows_nest_albedo.png.import
index afbe284..a06f65a 100644
--- a/maps/main_stage/assets/mast/crows_nest_albedo.png.import
+++ b/ship/mast/crows_nest_albedo.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/crows_nest_albedo.png-e23a282692f6f9374d52cb85e5f94e87.s3tc.stex"
-path.etc2="res://.import/crows_nest_albedo.png-e23a282692f6f9374d52cb85e5f94e87.etc2.stex"
+path.s3tc="res://.import/crows_nest_albedo.png-9940498fe64caab5f78e1c18c517934e.s3tc.stex"
+path.etc2="res://.import/crows_nest_albedo.png-9940498fe64caab5f78e1c18c517934e.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/mast/crows_nest_albedo.png"
-dest_files=[ "res://.import/crows_nest_albedo.png-e23a282692f6f9374d52cb85e5f94e87.s3tc.stex", "res://.import/crows_nest_albedo.png-e23a282692f6f9374d52cb85e5f94e87.etc2.stex" ]
+source_file="res://ship/mast/crows_nest_albedo.png"
+dest_files=[ "res://.import/crows_nest_albedo.png-9940498fe64caab5f78e1c18c517934e.s3tc.stex", "res://.import/crows_nest_albedo.png-9940498fe64caab5f78e1c18c517934e.etc2.stex" ]
 
 [params]
 
diff --git a/maps/main_stage/assets/mast/crows_nest_normal.png b/ship/mast/crows_nest_normal.png
index ad2b161..ad2b161 100644
--- a/maps/main_stage/assets/mast/crows_nest_normal.png
+++ b/ship/mast/crows_nest_normal.png
diff --git a/maps/main_stage/assets/mast/crows_nest_normal.png.import b/ship/mast/crows_nest_normal.png.import
index a35d66f..7f5891f 100644
--- a/maps/main_stage/assets/mast/crows_nest_normal.png.import
+++ b/ship/mast/crows_nest_normal.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/crows_nest_normal.png-8bbf079b49e43e03fe59a107b606fdf6.s3tc.stex"
-path.etc2="res://.import/crows_nest_normal.png-8bbf079b49e43e03fe59a107b606fdf6.etc2.stex"
+path.s3tc="res://.import/crows_nest_normal.png-ba36552aeec42b2174508cc91279b568.s3tc.stex"
+path.etc2="res://.import/crows_nest_normal.png-ba36552aeec42b2174508cc91279b568.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/mast/crows_nest_normal.png"
-dest_files=[ "res://.import/crows_nest_normal.png-8bbf079b49e43e03fe59a107b606fdf6.s3tc.stex", "res://.import/crows_nest_normal.png-8bbf079b49e43e03fe59a107b606fdf6.etc2.stex" ]
+source_file="res://ship/mast/crows_nest_normal.png"
+dest_files=[ "res://.import/crows_nest_normal.png-ba36552aeec42b2174508cc91279b568.s3tc.stex", "res://.import/crows_nest_normal.png-ba36552aeec42b2174508cc91279b568.etc2.stex" ]
 
 [params]
 
diff --git a/maps/main_stage/assets/mast/crows_nest_rough.png b/ship/mast/crows_nest_rough.png
index 095d44e..095d44e 100644
--- a/maps/main_stage/assets/mast/crows_nest_rough.png
+++ b/ship/mast/crows_nest_rough.png
diff --git a/maps/main_stage/assets/mast/crows_nest_rough.png.import b/ship/mast/crows_nest_rough.png.import
index 7c08bcc..3cc7f4f 100644
--- a/maps/main_stage/assets/mast/crows_nest_rough.png.import
+++ b/ship/mast/crows_nest_rough.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/crows_nest_rough.png-0edf07899bdac8ac1a6d93a5e1eaff1a.s3tc.stex"
-path.etc2="res://.import/crows_nest_rough.png-0edf07899bdac8ac1a6d93a5e1eaff1a.etc2.stex"
+path.s3tc="res://.import/crows_nest_rough.png-ec62b3c22438657b891dfc6916a2420d.s3tc.stex"
+path.etc2="res://.import/crows_nest_rough.png-ec62b3c22438657b891dfc6916a2420d.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/mast/crows_nest_rough.png"
-dest_files=[ "res://.import/crows_nest_rough.png-0edf07899bdac8ac1a6d93a5e1eaff1a.s3tc.stex", "res://.import/crows_nest_rough.png-0edf07899bdac8ac1a6d93a5e1eaff1a.etc2.stex" ]
+source_file="res://ship/mast/crows_nest_rough.png"
+dest_files=[ "res://.import/crows_nest_rough.png-ec62b3c22438657b891dfc6916a2420d.s3tc.stex", "res://.import/crows_nest_rough.png-ec62b3c22438657b891dfc6916a2420d.etc2.stex" ]
 
 [params]
 
diff --git a/ship/mast/ladder.material b/ship/mast/ladder.material
new file mode 100644
index 0000000..2e7c6b7
--- /dev/null
+++ b/ship/mast/ladder.material
diff --git a/maps/main_stage/assets/mast/mast.bin b/ship/mast/mast.bin
index de00876..de00876 100644
--- a/maps/main_stage/assets/mast/mast.bin
+++ b/ship/mast/mast.bin
diff --git a/maps/main_stage/assets/mast/mast.blend b/ship/mast/mast.blend
index 99120e6..99120e6 100644
--- a/maps/main_stage/assets/mast/mast.blend
+++ b/ship/mast/mast.blend
diff --git a/maps/main_stage/assets/mast/mast.gltf b/ship/mast/mast.gltf
index 437c7d3..437c7d3 100644
--- a/maps/main_stage/assets/mast/mast.gltf
+++ b/ship/mast/mast.gltf
diff --git a/maps/main_stage/assets/mast/mast.gltf.import b/ship/mast/mast.gltf.import
index 3355b0a..98a5969 100644
--- a/maps/main_stage/assets/mast/mast.gltf.import
+++ b/ship/mast/mast.gltf.import
@@ -2,12 +2,12 @@
 
 importer="scene"
 type="PackedScene"
-path="res://.import/mast.gltf-c26f825e73317fbb8bbea6356fca2387.scn"
+path="res://.import/mast.gltf-9c8558b523bece86d63dc5f0c2812468.scn"
 
 [deps]
 
-source_file="res://maps/main_stage/assets/mast/mast.gltf"
-dest_files=[ "res://.import/mast.gltf-c26f825e73317fbb8bbea6356fca2387.scn" ]
+source_file="res://ship/mast/mast.gltf"
+dest_files=[ "res://.import/mast.gltf-9c8558b523bece86d63dc5f0c2812468.scn" ]
 
 [params]
 
diff --git a/ship/mast/mast.material b/ship/mast/mast.material
new file mode 100644
index 0000000..9cc7c9c
--- /dev/null
+++ b/ship/mast/mast.material
diff --git a/maps/main_stage/assets/mast/mast.tscn b/ship/mast/mast.tscn
index 6e70f4c..0f9e068 100644
--- a/maps/main_stage/assets/mast/mast.tscn
+++ b/ship/mast/mast.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://maps/main_stage/assets/mast/mast.gltf" type="PackedScene" id=1]
+[ext_resource path="res://ship/mast/mast.gltf" type="PackedScene" id=1]
 
 [sub_resource type="BoxShape" id=1]
 extents = Vector3( 0.258624, 13.019, 1.30381 )
diff --git a/maps/main_stage/assets/mast/mast_albedo.png b/ship/mast/mast_albedo.png
index 7ed8933..7ed8933 100644
--- a/maps/main_stage/assets/mast/mast_albedo.png
+++ b/ship/mast/mast_albedo.png
diff --git a/maps/main_stage/assets/mast/mast_albedo.png.import b/ship/mast/mast_albedo.png.import
index e3168e2..4c15c9f 100644
--- a/maps/main_stage/assets/mast/mast_albedo.png.import
+++ b/ship/mast/mast_albedo.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/mast_albedo.png-2624fb67c5a4af586e425f3aa2142f08.s3tc.stex"
-path.etc2="res://.import/mast_albedo.png-2624fb67c5a4af586e425f3aa2142f08.etc2.stex"
+path.s3tc="res://.import/mast_albedo.png-c601fc0cfd8212823891646246eb9f2e.s3tc.stex"
+path.etc2="res://.import/mast_albedo.png-c601fc0cfd8212823891646246eb9f2e.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/mast/mast_albedo.png"
-dest_files=[ "res://.import/mast_albedo.png-2624fb67c5a4af586e425f3aa2142f08.s3tc.stex", "res://.import/mast_albedo.png-2624fb67c5a4af586e425f3aa2142f08.etc2.stex" ]
+source_file="res://ship/mast/mast_albedo.png"
+dest_files=[ "res://.import/mast_albedo.png-c601fc0cfd8212823891646246eb9f2e.s3tc.stex", "res://.import/mast_albedo.png-c601fc0cfd8212823891646246eb9f2e.etc2.stex" ]
 
 [params]
 
diff --git a/maps/main_stage/assets/mast/mast_normal.png b/ship/mast/mast_normal.png
index 020d40b..020d40b 100644
--- a/maps/main_stage/assets/mast/mast_normal.png
+++ b/ship/mast/mast_normal.png
diff --git a/maps/main_stage/assets/mast/mast_normal.png.import b/ship/mast/mast_normal.png.import
index e49c225..4070fa3 100644
--- a/maps/main_stage/assets/mast/mast_normal.png.import
+++ b/ship/mast/mast_normal.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/mast_normal.png-27d947be9654384e38eb333db2c98ec0.s3tc.stex"
-path.etc2="res://.import/mast_normal.png-27d947be9654384e38eb333db2c98ec0.etc2.stex"
+path.s3tc="res://.import/mast_normal.png-fc156e60dc005dd9fe7f508f6a3fefd5.s3tc.stex"
+path.etc2="res://.import/mast_normal.png-fc156e60dc005dd9fe7f508f6a3fefd5.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/mast/mast_normal.png"
-dest_files=[ "res://.import/mast_normal.png-27d947be9654384e38eb333db2c98ec0.s3tc.stex", "res://.import/mast_normal.png-27d947be9654384e38eb333db2c98ec0.etc2.stex" ]
+source_file="res://ship/mast/mast_normal.png"
+dest_files=[ "res://.import/mast_normal.png-fc156e60dc005dd9fe7f508f6a3fefd5.s3tc.stex", "res://.import/mast_normal.png-fc156e60dc005dd9fe7f508f6a3fefd5.etc2.stex" ]
 
 [params]
 
diff --git a/maps/main_stage/assets/mast/mast_rough.png b/ship/mast/mast_rough.png
index 6c5c6fa..6c5c6fa 100644
--- a/maps/main_stage/assets/mast/mast_rough.png
+++ b/ship/mast/mast_rough.png
diff --git a/maps/main_stage/assets/mast/mast_rough.png.import b/ship/mast/mast_rough.png.import
index 1ec888f..ba5ae75 100644
--- a/maps/main_stage/assets/mast/mast_rough.png.import
+++ b/ship/mast/mast_rough.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/mast_rough.png-e5f9d336cc6b192d9ee90a56c7669068.s3tc.stex"
-path.etc2="res://.import/mast_rough.png-e5f9d336cc6b192d9ee90a56c7669068.etc2.stex"
+path.s3tc="res://.import/mast_rough.png-b4d7507a5b94f1197bf6e7f42f4dc2da.s3tc.stex"
+path.etc2="res://.import/mast_rough.png-b4d7507a5b94f1197bf6e7f42f4dc2da.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/mast/mast_rough.png"
-dest_files=[ "res://.import/mast_rough.png-e5f9d336cc6b192d9ee90a56c7669068.s3tc.stex", "res://.import/mast_rough.png-e5f9d336cc6b192d9ee90a56c7669068.etc2.stex" ]
+source_file="res://ship/mast/mast_rough.png"
+dest_files=[ "res://.import/mast_rough.png-b4d7507a5b94f1197bf6e7f42f4dc2da.s3tc.stex", "res://.import/mast_rough.png-b4d7507a5b94f1197bf6e7f42f4dc2da.etc2.stex" ]
 
 [params]
 
diff --git a/ship/ship/ship.tscn b/ship/ship/ship.tscn
index 3ba879b..afeb6b7 100644
--- a/ship/ship/ship.tscn
+++ b/ship/ship/ship.tscn
@@ -16,12 +16,12 @@
 [ext_resource path="res://ship/ship/bridge_windows.material" type="Material" id=14]
 [ext_resource path="res://ship/ship/hull_main.material" type="Material" id=15]
 [ext_resource path="res://ship/ship/bridge.material" type="Material" id=16]
-[ext_resource path="res://maps/main_stage/assets/mast/mast.tscn" type="PackedScene" id=17]
+[ext_resource path="res://ship/mast/mast.tscn" type="PackedScene" id=17]
 [ext_resource path="res://ship/ship/below_deck_walls.material" type="Material" id=18]
-[ext_resource path="res://maps/main_stage/assets/ship_control_panel/main_control_panel_mat.material" type="Material" id=19]
-[ext_resource path="res://maps/main_stage/assets/steering_wheel/steering_wheel.tscn" type="PackedScene" id=20]
-[ext_resource path="res://maps/main_stage/assets/light_fixture/light_fixture.tres" type="Material" id=21]
-[ext_resource path="res://maps/main_stage/assets/water_pump/water_pump.tscn" type="PackedScene" id=22]
+[ext_resource path="res://ship/ship_control_panel/main_control_panel_mat.material" type="Material" id=19]
+[ext_resource path="res://ship/steering_wheel/steering_wheel.tscn" type="PackedScene" id=20]
+[ext_resource path="res://ship/light_fixture/light_fixture.tres" type="Material" id=21]
+[ext_resource path="res://ship/water_pump/water_pump.tscn" type="PackedScene" id=22]
 
 [sub_resource type="ArrayMesh" id=25]
 resource_name = "control_panel_Cube001"
diff --git a/ship/ship_control_panel/main_control_panel_mat.material b/ship/ship_control_panel/main_control_panel_mat.material
index fa67964..12a7616 100644
--- a/ship/ship_control_panel/main_control_panel_mat.material
+++ b/ship/ship_control_panel/main_control_panel_mat.material
diff --git a/ship/staircase_1/staircase.tres b/ship/staircase_1/staircase.tres
index be9383e..66f7596 100644
--- a/ship/staircase_1/staircase.tres
+++ b/ship/staircase_1/staircase.tres
@@ -1,8 +1,8 @@
 [gd_resource type="SpatialMaterial" load_steps=4 format=2]
 
-[ext_resource path="res://maps/main_stage/assets/staircase_1/staircase_roughness.png" type="Texture" id=1]
-[ext_resource path="res://maps/main_stage/assets/staircase_1/staircase_albedo.png" type="Texture" id=2]
-[ext_resource path="res://maps/main_stage/assets/staircase_1/staircase_normal.png" type="Texture" id=3]
+[ext_resource path="res://ship/staircase_1/staircase_roughness.png" type="Texture" id=1]
+[ext_resource path="res://ship/staircase_1/staircase_albedo.png" type="Texture" id=2]
+[ext_resource path="res://ship/staircase_1/staircase_normal.png" type="Texture" id=3]
 
 [resource]
 albedo_texture = ExtResource( 2 )
diff --git a/ship/staircase_1/staircase_1.tscn b/ship/staircase_1/staircase_1.tscn
index 386209d..130df2d 100644
--- a/ship/staircase_1/staircase_1.tscn
+++ b/ship/staircase_1/staircase_1.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://ship/staircase_1/staircase_1.gltf" type="PackedScene" id=1]
-[ext_resource path="res://maps/main_stage/assets/staircase_1/staircase.tres" type="Material" id=2]
+[ext_resource path="res://ship/staircase_1/staircase.tres" type="Material" id=2]
 
 [sub_resource type="ConvexPolygonShape" id=1]
 points = PoolVector3Array( -1.80455, -1.87224, -2.97945, -1.80455, -1.33747, -2.32941, 1.80455, -1.87224, -2.97945, -1.80455, -1.87224, 2.32838, 1.80455, -1.33747, -2.32941, -1.80455, 1.87224, 1.66328, 1.80455, -1.87224, 2.32838, -1.80455, 1.87224, 2.32838, 1.80455, 1.87224, 1.66328, 1.80455, 1.87224, 2.32838 )
diff --git a/ship/staircase_1/staircase_albedo.png.import b/ship/staircase_1/staircase_albedo.png.import
index d950938..64dce04 100644
--- a/ship/staircase_1/staircase_albedo.png.import
+++ b/ship/staircase_1/staircase_albedo.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/staircase_albedo.png-7c7053e32cbd4732946e772bb1938ac5.s3tc.stex"
-path.etc2="res://.import/staircase_albedo.png-7c7053e32cbd4732946e772bb1938ac5.etc2.stex"
+path.s3tc="res://.import/staircase_albedo.png-8f0914b186375d5442df98c6a02e755b.s3tc.stex"
+path.etc2="res://.import/staircase_albedo.png-8f0914b186375d5442df98c6a02e755b.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/staircase_1/staircase_albedo.png"
-dest_files=[ "res://.import/staircase_albedo.png-7c7053e32cbd4732946e772bb1938ac5.s3tc.stex", "res://.import/staircase_albedo.png-7c7053e32cbd4732946e772bb1938ac5.etc2.stex" ]
+source_file="res://ship/staircase_1/staircase_albedo.png"
+dest_files=[ "res://.import/staircase_albedo.png-8f0914b186375d5442df98c6a02e755b.s3tc.stex", "res://.import/staircase_albedo.png-8f0914b186375d5442df98c6a02e755b.etc2.stex" ]
 
 [params]
 
diff --git a/ship/staircase_1/staircase_normal.png.import b/ship/staircase_1/staircase_normal.png.import
index ec0a2e9..1fe6cb0 100644
--- a/ship/staircase_1/staircase_normal.png.import
+++ b/ship/staircase_1/staircase_normal.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/staircase_normal.png-67c5cd8e2538d17f640ec0c2cf1a95ff.s3tc.stex"
-path.etc2="res://.import/staircase_normal.png-67c5cd8e2538d17f640ec0c2cf1a95ff.etc2.stex"
+path.s3tc="res://.import/staircase_normal.png-429a850229a078f6ea8a665906ac9e4d.s3tc.stex"
+path.etc2="res://.import/staircase_normal.png-429a850229a078f6ea8a665906ac9e4d.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/staircase_1/staircase_normal.png"
-dest_files=[ "res://.import/staircase_normal.png-67c5cd8e2538d17f640ec0c2cf1a95ff.s3tc.stex", "res://.import/staircase_normal.png-67c5cd8e2538d17f640ec0c2cf1a95ff.etc2.stex" ]
+source_file="res://ship/staircase_1/staircase_normal.png"
+dest_files=[ "res://.import/staircase_normal.png-429a850229a078f6ea8a665906ac9e4d.s3tc.stex", "res://.import/staircase_normal.png-429a850229a078f6ea8a665906ac9e4d.etc2.stex" ]
 
 [params]
 
diff --git a/ship/staircase_1/staircase_roughness.png.import b/ship/staircase_1/staircase_roughness.png.import
index 2dc493e..5752474 100644
--- a/ship/staircase_1/staircase_roughness.png.import
+++ b/ship/staircase_1/staircase_roughness.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/staircase_roughness.png-035b49256c30cecae3cd55697084c54c.s3tc.stex"
-path.etc2="res://.import/staircase_roughness.png-035b49256c30cecae3cd55697084c54c.etc2.stex"
+path.s3tc="res://.import/staircase_roughness.png-2a5fbf51ccaa454b31c59b441f0ea4ba.s3tc.stex"
+path.etc2="res://.import/staircase_roughness.png-2a5fbf51ccaa454b31c59b441f0ea4ba.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/staircase_1/staircase_roughness.png"
-dest_files=[ "res://.import/staircase_roughness.png-035b49256c30cecae3cd55697084c54c.s3tc.stex", "res://.import/staircase_roughness.png-035b49256c30cecae3cd55697084c54c.etc2.stex" ]
+source_file="res://ship/staircase_1/staircase_roughness.png"
+dest_files=[ "res://.import/staircase_roughness.png-2a5fbf51ccaa454b31c59b441f0ea4ba.s3tc.stex", "res://.import/staircase_roughness.png-2a5fbf51ccaa454b31c59b441f0ea4ba.etc2.stex" ]
 
 [params]
 
diff --git a/maps/main_stage/assets/steering_wheel/steering_wheel Base Color.png b/ship/steering_wheel/steering_wheel Base Color.png
index 44c9ecc..44c9ecc 100644
--- a/maps/main_stage/assets/steering_wheel/steering_wheel Base Color.png
+++ b/ship/steering_wheel/steering_wheel Base Color.png
diff --git a/ship/steering_wheel/steering_wheel Base Color.png.import b/ship/steering_wheel/steering_wheel Base Color.png.import
new file mode 100644
index 0000000..93e7b65
--- /dev/null
+++ b/ship/steering_wheel/steering_wheel Base Color.png.import
@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/steering_wheel Base Color.png-0fad3d10f9d1247b672f49d4a007a2ce.s3tc.stex"
+path.etc2="res://.import/steering_wheel Base Color.png-0fad3d10f9d1247b672f49d4a007a2ce.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://ship/steering_wheel/steering_wheel Base Color.png"
+dest_files=[ "res://.import/steering_wheel Base Color.png-0fad3d10f9d1247b672f49d4a007a2ce.s3tc.stex", "res://.import/steering_wheel Base Color.png-0fad3d10f9d1247b672f49d4a007a2ce.etc2.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=1
+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=false
+svg/scale=1.0
diff --git a/maps/main_stage/assets/steering_wheel/steering_wheel Metallic-steering_wheel Roughness.png b/ship/steering_wheel/steering_wheel Metallic-steering_wheel Roughness.png
index 49fd7e7..49fd7e7 100644
--- a/maps/main_stage/assets/steering_wheel/steering_wheel Metallic-steering_wheel Roughness.png
+++ b/ship/steering_wheel/steering_wheel Metallic-steering_wheel Roughness.png
diff --git a/maps/main_stage/assets/steering_wheel/steering_wheel Metallic-steering_wheel Roughness.png.import b/ship/steering_wheel/steering_wheel Metallic-steering_wheel Roughness.png.import
index 56d470e..7f99b36 100644
--- a/maps/main_stage/assets/steering_wheel/steering_wheel Metallic-steering_wheel Roughness.png.import
+++ b/ship/steering_wheel/steering_wheel Metallic-steering_wheel Roughness.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/steering_wheel Metallic-steering_wheel Roughness.png-fb076a7e5d78a8a6cf8bddf03eb645ba.s3tc.stex"
-path.etc2="res://.import/steering_wheel Metallic-steering_wheel Roughness.png-fb076a7e5d78a8a6cf8bddf03eb645ba.etc2.stex"
+path.s3tc="res://.import/steering_wheel Metallic-steering_wheel Roughness.png-73b4bae8704379e2e577011c4aa5b827.s3tc.stex"
+path.etc2="res://.import/steering_wheel Metallic-steering_wheel Roughness.png-73b4bae8704379e2e577011c4aa5b827.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/steering_wheel/steering_wheel Metallic-steering_wheel Roughness.png"
-dest_files=[ "res://.import/steering_wheel Metallic-steering_wheel Roughness.png-fb076a7e5d78a8a6cf8bddf03eb645ba.s3tc.stex", "res://.import/steering_wheel Metallic-steering_wheel Roughness.png-fb076a7e5d78a8a6cf8bddf03eb645ba.etc2.stex" ]
+source_file="res://ship/steering_wheel/steering_wheel Metallic-steering_wheel Roughness.png"
+dest_files=[ "res://.import/steering_wheel Metallic-steering_wheel Roughness.png-73b4bae8704379e2e577011c4aa5b827.s3tc.stex", "res://.import/steering_wheel Metallic-steering_wheel Roughness.png-73b4bae8704379e2e577011c4aa5b827.etc2.stex" ]
 
 [params]
 
diff --git a/maps/main_stage/assets/steering_wheel/steering_wheel.bin b/ship/steering_wheel/steering_wheel.bin
index f272eb9..f272eb9 100644
--- a/maps/main_stage/assets/steering_wheel/steering_wheel.bin
+++ b/ship/steering_wheel/steering_wheel.bin
diff --git a/maps/main_stage/assets/steering_wheel/steering_wheel.blend b/ship/steering_wheel/steering_wheel.blend
index bce19f4..bce19f4 100644
--- a/maps/main_stage/assets/steering_wheel/steering_wheel.blend
+++ b/ship/steering_wheel/steering_wheel.blend
diff --git a/maps/main_stage/assets/steering_wheel/steering_wheel.gltf b/ship/steering_wheel/steering_wheel.gltf
index 3d10611..3d10611 100644
--- a/maps/main_stage/assets/steering_wheel/steering_wheel.gltf
+++ b/ship/steering_wheel/steering_wheel.gltf
diff --git a/maps/main_stage/assets/steering_wheel/steering_wheel.gltf.import b/ship/steering_wheel/steering_wheel.gltf.import
index d48c4db..2ab9597 100644
--- a/maps/main_stage/assets/steering_wheel/steering_wheel.gltf.import
+++ b/ship/steering_wheel/steering_wheel.gltf.import
@@ -2,12 +2,12 @@
 
 importer="scene"
 type="PackedScene"
-path="res://.import/steering_wheel.gltf-ae6a572489edba296e4f41e4b6ace54c.scn"
+path="res://.import/steering_wheel.gltf-b473a10cd0a382f35f1b44a743f53c9e.scn"
 
 [deps]
 
-source_file="res://maps/main_stage/assets/steering_wheel/steering_wheel.gltf"
-dest_files=[ "res://.import/steering_wheel.gltf-ae6a572489edba296e4f41e4b6ace54c.scn" ]
+source_file="res://ship/steering_wheel/steering_wheel.gltf"
+dest_files=[ "res://.import/steering_wheel.gltf-b473a10cd0a382f35f1b44a743f53c9e.scn" ]
 
 [params]
 
diff --git a/ship/steering_wheel/steering_wheel.material b/ship/steering_wheel/steering_wheel.material
new file mode 100644
index 0000000..c8d8689
--- /dev/null
+++ b/ship/steering_wheel/steering_wheel.material
diff --git a/maps/main_stage/assets/steering_wheel/steering_wheel.tscn b/ship/steering_wheel/steering_wheel.tscn
index 40665f8..3daae1a 100644
--- a/maps/main_stage/assets/steering_wheel/steering_wheel.tscn
+++ b/ship/steering_wheel/steering_wheel.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://maps/main_stage/assets/steering_wheel/steering_wheel.gltf" type="PackedScene" id=1]
+[ext_resource path="res://ship/steering_wheel/steering_wheel.gltf" type="PackedScene" id=1]
 
 [sub_resource type="BoxShape" id=1]
 extents = Vector3( 0.307949, 0.17495, 0.136091 )
diff --git a/maps/main_stage/assets/steering_wheel/steering_wheel_normal.png b/ship/steering_wheel/steering_wheel_normal.png
index 2db7484..2db7484 100644
--- a/maps/main_stage/assets/steering_wheel/steering_wheel_normal.png
+++ b/ship/steering_wheel/steering_wheel_normal.png
diff --git a/ship/steering_wheel/steering_wheel_normal.png.import b/ship/steering_wheel/steering_wheel_normal.png.import
new file mode 100644
index 0000000..26a746a
--- /dev/null
+++ b/ship/steering_wheel/steering_wheel_normal.png.import
@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/steering_wheel_normal.png-1564550bc3a286647caa1954d2ae4a0e.s3tc.stex"
+path.etc2="res://.import/steering_wheel_normal.png-1564550bc3a286647caa1954d2ae4a0e.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://ship/steering_wheel/steering_wheel_normal.png"
+dest_files=[ "res://.import/steering_wheel_normal.png-1564550bc3a286647caa1954d2ae4a0e.s3tc.stex", "res://.import/steering_wheel_normal.png-1564550bc3a286647caa1954d2ae4a0e.etc2.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=1
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+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=false
+svg/scale=1.0
diff --git a/ship/steering_wheel/wheel_base.material b/ship/steering_wheel/wheel_base.material
new file mode 100644
index 0000000..af3f0b8
--- /dev/null
+++ b/ship/steering_wheel/wheel_base.material
diff --git a/maps/main_stage/assets/steering_wheel/wheel_base_normal.png b/ship/steering_wheel/wheel_base_normal.png
index 465fb33..465fb33 100644
--- a/maps/main_stage/assets/steering_wheel/wheel_base_normal.png
+++ b/ship/steering_wheel/wheel_base_normal.png
diff --git a/maps/main_stage/assets/steering_wheel/wheel_base_normal.png.import b/ship/steering_wheel/wheel_base_normal.png.import
index 4b6041a..ca99859 100644
--- a/maps/main_stage/assets/steering_wheel/wheel_base_normal.png.import
+++ b/ship/steering_wheel/wheel_base_normal.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/wheel_base_normal.png-4e62c15f06eebdd4527949e141aa0a5b.s3tc.stex"
-path.etc2="res://.import/wheel_base_normal.png-4e62c15f06eebdd4527949e141aa0a5b.etc2.stex"
+path.s3tc="res://.import/wheel_base_normal.png-5530c68bc870a81d2c3a370264815c7a.s3tc.stex"
+path.etc2="res://.import/wheel_base_normal.png-5530c68bc870a81d2c3a370264815c7a.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/steering_wheel/wheel_base_normal.png"
-dest_files=[ "res://.import/wheel_base_normal.png-4e62c15f06eebdd4527949e141aa0a5b.s3tc.stex", "res://.import/wheel_base_normal.png-4e62c15f06eebdd4527949e141aa0a5b.etc2.stex" ]
+source_file="res://ship/steering_wheel/wheel_base_normal.png"
+dest_files=[ "res://.import/wheel_base_normal.png-5530c68bc870a81d2c3a370264815c7a.s3tc.stex", "res://.import/wheel_base_normal.png-5530c68bc870a81d2c3a370264815c7a.etc2.stex" ]
 
 [params]
 
diff --git a/ship/water_pump/SCREEN.material b/ship/water_pump/SCREEN.material
new file mode 100644
index 0000000..8e53578
--- /dev/null
+++ b/ship/water_pump/SCREEN.material
diff --git a/maps/main_stage/assets/water_pump/idle.png b/ship/water_pump/idle.png
index f873009..f873009 100644
--- a/maps/main_stage/assets/water_pump/idle.png
+++ b/ship/water_pump/idle.png
diff --git a/maps/main_stage/assets/water_pump/idle.png.import b/ship/water_pump/idle.png.import
index 9af5448..c3ba6b6 100644
--- a/maps/main_stage/assets/water_pump/idle.png.import
+++ b/ship/water_pump/idle.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/idle.png-4acfc93a46810b92908c4991cbe8f3ad.stex"
+path="res://.import/idle.png-2c7c0ba21e6eb7ca57b786bfa3adbb49.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://maps/main_stage/assets/water_pump/idle.png"
-dest_files=[ "res://.import/idle.png-4acfc93a46810b92908c4991cbe8f3ad.stex" ]
+source_file="res://ship/water_pump/idle.png"
+dest_files=[ "res://.import/idle.png-2c7c0ba21e6eb7ca57b786bfa3adbb49.stex" ]
 
 [params]
 
diff --git a/ship/water_pump/pipes.material b/ship/water_pump/pipes.material
new file mode 100644
index 0000000..5acd7bb
--- /dev/null
+++ b/ship/water_pump/pipes.material
diff --git a/ship/water_pump/reset_button.material b/ship/water_pump/reset_button.material
new file mode 100644
index 0000000..2140286
--- /dev/null
+++ b/ship/water_pump/reset_button.material
diff --git a/maps/main_stage/assets/water_pump/screen_textures/idle.png b/ship/water_pump/screen_textures/idle.png
index f873009..f873009 100644
--- a/maps/main_stage/assets/water_pump/screen_textures/idle.png
+++ b/ship/water_pump/screen_textures/idle.png
diff --git a/maps/main_stage/assets/water_pump/screen_textures/idle.png.import b/ship/water_pump/screen_textures/idle.png.import
index e234ff7..4abd4ad 100644
--- a/maps/main_stage/assets/water_pump/screen_textures/idle.png.import
+++ b/ship/water_pump/screen_textures/idle.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/idle.png-a3b9aafeb2bb6262f82d105119f751da.s3tc.stex"
-path.etc2="res://.import/idle.png-a3b9aafeb2bb6262f82d105119f751da.etc2.stex"
+path.s3tc="res://.import/idle.png-5094372df41a80d2fbe6a8aa4a1ebff1.s3tc.stex"
+path.etc2="res://.import/idle.png-5094372df41a80d2fbe6a8aa4a1ebff1.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/water_pump/screen_textures/idle.png"
-dest_files=[ "res://.import/idle.png-a3b9aafeb2bb6262f82d105119f751da.s3tc.stex", "res://.import/idle.png-a3b9aafeb2bb6262f82d105119f751da.etc2.stex" ]
+source_file="res://ship/water_pump/screen_textures/idle.png"
+dest_files=[ "res://.import/idle.png-5094372df41a80d2fbe6a8aa4a1ebff1.s3tc.stex", "res://.import/idle.png-5094372df41a80d2fbe6a8aa4a1ebff1.etc2.stex" ]
 
 [params]
 
diff --git a/maps/main_stage/assets/water_pump/screen_textures/jammed.png b/ship/water_pump/screen_textures/jammed.png
index c8f0a87..c8f0a87 100644
--- a/maps/main_stage/assets/water_pump/screen_textures/jammed.png
+++ b/ship/water_pump/screen_textures/jammed.png
diff --git a/maps/main_stage/assets/water_pump/screen_textures/jammed.png.import b/ship/water_pump/screen_textures/jammed.png.import
index 5267828..1a59dff 100644
--- a/maps/main_stage/assets/water_pump/screen_textures/jammed.png.import
+++ b/ship/water_pump/screen_textures/jammed.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/jammed.png-a34fb404b5a2f9eacab1a0acd3dce531.stex"
+path="res://.import/jammed.png-254ba280fae956248aa4d3846ac50a5b.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://maps/main_stage/assets/water_pump/screen_textures/jammed.png"
-dest_files=[ "res://.import/jammed.png-a34fb404b5a2f9eacab1a0acd3dce531.stex" ]
+source_file="res://ship/water_pump/screen_textures/jammed.png"
+dest_files=[ "res://.import/jammed.png-254ba280fae956248aa4d3846ac50a5b.stex" ]
 
 [params]
 
diff --git a/maps/main_stage/assets/water_pump/screen_textures/running.png b/ship/water_pump/screen_textures/running.png
index 415305a..415305a 100644
--- a/maps/main_stage/assets/water_pump/screen_textures/running.png
+++ b/ship/water_pump/screen_textures/running.png
diff --git a/maps/main_stage/assets/water_pump/screen_textures/running.png.import b/ship/water_pump/screen_textures/running.png.import
index 895f920..360b28d 100644
--- a/maps/main_stage/assets/water_pump/screen_textures/running.png.import
+++ b/ship/water_pump/screen_textures/running.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/running.png-2202e6e70142a26849e92c457c5088a8.stex"
+path="res://.import/running.png-9f71973fdab9cb01021adc29f1377fd8.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://maps/main_stage/assets/water_pump/screen_textures/running.png"
-dest_files=[ "res://.import/running.png-2202e6e70142a26849e92c457c5088a8.stex" ]
+source_file="res://ship/water_pump/screen_textures/running.png"
+dest_files=[ "res://.import/running.png-9f71973fdab9cb01021adc29f1377fd8.stex" ]
 
 [params]
 
diff --git a/ship/water_pump/start_button.material b/ship/water_pump/start_button.material
new file mode 100644
index 0000000..ecdcb80
--- /dev/null
+++ b/ship/water_pump/start_button.material
diff --git a/maps/main_stage/assets/water_pump/water_pump Base Color.png b/ship/water_pump/water_pump Base Color.png
index d08a640..d08a640 100644
--- a/maps/main_stage/assets/water_pump/water_pump Base Color.png
+++ b/ship/water_pump/water_pump Base Color.png
diff --git a/maps/main_stage/assets/water_pump/water_pump Base Color.png.import b/ship/water_pump/water_pump Base Color.png.import
index d0ebab6..216048c 100644
--- a/maps/main_stage/assets/water_pump/water_pump Base Color.png.import
+++ b/ship/water_pump/water_pump Base Color.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/water_pump Base Color.png-c11d51b88d8a0ce7e33aa141f60ee54e.s3tc.stex"
-path.etc2="res://.import/water_pump Base Color.png-c11d51b88d8a0ce7e33aa141f60ee54e.etc2.stex"
+path.s3tc="res://.import/water_pump Base Color.png-070505754607b4bd413cfa7e6f14c0c4.s3tc.stex"
+path.etc2="res://.import/water_pump Base Color.png-070505754607b4bd413cfa7e6f14c0c4.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/water_pump/water_pump Base Color.png"
-dest_files=[ "res://.import/water_pump Base Color.png-c11d51b88d8a0ce7e33aa141f60ee54e.s3tc.stex", "res://.import/water_pump Base Color.png-c11d51b88d8a0ce7e33aa141f60ee54e.etc2.stex" ]
+source_file="res://ship/water_pump/water_pump Base Color.png"
+dest_files=[ "res://.import/water_pump Base Color.png-070505754607b4bd413cfa7e6f14c0c4.s3tc.stex", "res://.import/water_pump Base Color.png-070505754607b4bd413cfa7e6f14c0c4.etc2.stex" ]
 
 [params]
 
diff --git a/maps/main_stage/assets/water_pump/water_pump.bin b/ship/water_pump/water_pump.bin
index 1cf26cd..1cf26cd 100644
--- a/maps/main_stage/assets/water_pump/water_pump.bin
+++ b/ship/water_pump/water_pump.bin
diff --git a/maps/main_stage/assets/water_pump/water_pump.blend b/ship/water_pump/water_pump.blend
index 3ee4117..3ee4117 100644
--- a/maps/main_stage/assets/water_pump/water_pump.blend
+++ b/ship/water_pump/water_pump.blend
diff --git a/maps/main_stage/assets/water_pump/water_pump.gltf b/ship/water_pump/water_pump.gltf
index 4a3ef35..4a3ef35 100644
--- a/maps/main_stage/assets/water_pump/water_pump.gltf
+++ b/ship/water_pump/water_pump.gltf
diff --git a/maps/main_stage/assets/water_pump/water_pump.gltf.import b/ship/water_pump/water_pump.gltf.import
index 611590f..c056180 100644
--- a/maps/main_stage/assets/water_pump/water_pump.gltf.import
+++ b/ship/water_pump/water_pump.gltf.import
@@ -2,12 +2,12 @@
 
 importer="scene"
 type="PackedScene"
-path="res://.import/water_pump.gltf-05e6d09e67b15925320fe2ee2b7bae89.scn"
+path="res://.import/water_pump.gltf-4d67b4812f7a204294dc0e4e102ac86e.scn"
 
 [deps]
 
-source_file="res://maps/main_stage/assets/water_pump/water_pump.gltf"
-dest_files=[ "res://.import/water_pump.gltf-05e6d09e67b15925320fe2ee2b7bae89.scn" ]
+source_file="res://ship/water_pump/water_pump.gltf"
+dest_files=[ "res://.import/water_pump.gltf-4d67b4812f7a204294dc0e4e102ac86e.scn" ]
 
 [params]
 
diff --git a/ship/water_pump/water_pump.material b/ship/water_pump/water_pump.material
new file mode 100644
index 0000000..229e9ee
--- /dev/null
+++ b/ship/water_pump/water_pump.material
diff --git a/maps/main_stage/assets/water_pump/water_pump.tscn b/ship/water_pump/water_pump.tscn
index 996564d..28d0e51 100644
--- a/maps/main_stage/assets/water_pump/water_pump.tscn
+++ b/ship/water_pump/water_pump.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=6 format=2]
 
-[ext_resource path="res://maps/main_stage/assets/water_pump/water_pump.gltf" type="PackedScene" id=1]
+[ext_resource path="res://ship/water_pump/water_pump.gltf" type="PackedScene" id=1]
 
 [sub_resource type="BoxShape" id=1]
 extents = Vector3( 1, 0.78139, 1.52624 )
diff --git a/maps/main_stage/assets/water_pump/water_pump_normal.png b/ship/water_pump/water_pump_normal.png
index 92abff9..92abff9 100644
--- a/maps/main_stage/assets/water_pump/water_pump_normal.png
+++ b/ship/water_pump/water_pump_normal.png
diff --git a/maps/main_stage/assets/water_pump/water_pump_normal.png.import b/ship/water_pump/water_pump_normal.png.import
index b311089..fc6b508 100644
--- a/maps/main_stage/assets/water_pump/water_pump_normal.png.import
+++ b/ship/water_pump/water_pump_normal.png.import
@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/water_pump_normal.png-7e5a763b0d38fee6cc7d5fb615666872.s3tc.stex"
-path.etc2="res://.import/water_pump_normal.png-7e5a763b0d38fee6cc7d5fb615666872.etc2.stex"
+path.s3tc="res://.import/water_pump_normal.png-5ebeb118011a35687e8153007f274e04.s3tc.stex"
+path.etc2="res://.import/water_pump_normal.png-5ebeb118011a35687e8153007f274e04.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://maps/main_stage/assets/water_pump/water_pump_normal.png"
-dest_files=[ "res://.import/water_pump_normal.png-7e5a763b0d38fee6cc7d5fb615666872.s3tc.stex", "res://.import/water_pump_normal.png-7e5a763b0d38fee6cc7d5fb615666872.etc2.stex" ]
+source_file="res://ship/water_pump/water_pump_normal.png"
+dest_files=[ "res://.import/water_pump_normal.png-5ebeb118011a35687e8153007f274e04.s3tc.stex", "res://.import/water_pump_normal.png-5ebeb118011a35687e8153007f274e04.etc2.stex" ]
 
 [params]