diff --git a/Content.Client/EntryPoint.cs b/Content.Client/EntryPoint.cs
index d53b802528..6e96ce1976 100644
--- a/Content.Client/EntryPoint.cs
+++ b/Content.Client/EntryPoint.cs
@@ -6,6 +6,7 @@ using Content.Client.GameObjects.Components.Storage;
 using Content.Client.Input;
 using Content.Client.Interfaces.GameObjects;
 using SS14.Client.Interfaces.Input;
+using SS14.Client.Utility;
 using SS14.Shared.ContentPack;
 using SS14.Shared.Interfaces.GameObjects;
 using SS14.Shared.IoC;
@@ -17,6 +18,9 @@ namespace Content.Client
     {
         public override void Init()
         {
+#if DEBUG
+            GodotResourceCopy.DoDirCopy("../../Resources", "Content");
+#endif
             var factory = IoCManager.Resolve<IComponentFactory>();
             var prototypes = IoCManager.Resolve<IPrototypeManager>();
 
diff --git a/Resources/.gitignore b/Resources/.gitignore
new file mode 100644
index 0000000000..ca05cddaaa
--- /dev/null
+++ b/Resources/.gitignore
@@ -0,0 +1,7 @@
+# .import files are made by Godot because the assets are exposed if using symlinks.
+# IF you need to persist a .import file because of something used Godot-side (GUI-side),
+# you can do a negation with !.
+*.import
+# Negation would be like this:
+#!/Textures/UserInterface/handsbox.png.import
+/I_MADE_THE_SYMLINK
diff --git a/Resources/Scenes/Inventory/StorageSlot.tscn b/Resources/Scenes/Inventory/StorageSlot.tscn
index 5b7d64704f..5a93ec12a4 100644
--- a/Resources/Scenes/Inventory/StorageSlot.tscn
+++ b/Resources/Scenes/Inventory/StorageSlot.tscn
@@ -1,8 +1,9 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://Scenes/Inventory/StorageSlot.tres" type="StyleBox" id=1]
+[ext_resource path="res://Content/Scenes/Inventory/StorageSlot.tres" type="StyleBox" id=1]
 [ext_resource path="res://Scenes/SpriteMirror/SpriteView.tscn" type="PackedScene" id=2]
 
+
 [node name="PanelContainer" type="PanelContainer"]
 anchor_left = 0.0
 anchor_top = 0.0
diff --git a/engine b/engine
index a1f3c5fdbb..6e95476156 160000
--- a/engine
+++ b/engine
@@ -1 +1 @@
-Subproject commit a1f3c5fdbb87961610cad0f9e4e954f6683218ca
+Subproject commit 6e9547615621333214c05675a47ec678e6fadb88