From 2bfb03cd29fdaceb723cd9bcc6be2c1d6f71ebe1 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Sat, 30 Mar 2019 23:20:50 +0100
Subject: [PATCH] Update submodule, unfuck scripts, clean up solution file.

---
 BuildChecker/BuildChecker.csproj      |   3 +
 Content.Client/Content.Client.csproj  |   4 +-
 Content.Server/Content.Server.csproj  |   4 +-
 RobustToolbox                         |   2 +-
 SpaceStation14Content.sln             | 150 --------------------------
 SpaceStation14Content.sln.DotSettings |   1 +
 Tools/package_release_build.py        |  20 ++--
 7 files changed, 19 insertions(+), 165 deletions(-)

diff --git a/BuildChecker/BuildChecker.csproj b/BuildChecker/BuildChecker.csproj
index 49d17dca77..a015814807 100644
--- a/BuildChecker/BuildChecker.csproj
+++ b/BuildChecker/BuildChecker.csproj
@@ -25,6 +25,9 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild
   <PropertyGroup>
     <StartupObject />
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+  </PropertyGroup>
   <Target Name="Build">
     <Exec Command="$(Python) git_helper.py" CustomErrorRegularExpression="^Error" />
   </Target>
diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj
index 161f306900..e7a8cd5092 100644
--- a/Content.Client/Content.Client.csproj
+++ b/Content.Client/Content.Client.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>Content.Client</AssemblyName>
     <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ContentAssemblyTarget>..\engine\bin\Client\Resources\Assemblies\</ContentAssemblyTarget>
+    <ContentAssemblyTarget>..\RobustToolbox\bin\Client\Resources\Assemblies\</ContentAssemblyTarget>
     <LangVersion>7.2</LangVersion>
     <!--
     This copies all dependencies,
@@ -154,4 +154,4 @@
     <Compile Include="Construction\ConstructionPlacementHijack.cs" />
     <Compile Include="GameObjects\Components\IconSmoothing\IconSmoothComponent.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj
index 0b7810e117..ab04ae7978 100644
--- a/Content.Server/Content.Server.csproj
+++ b/Content.Server/Content.Server.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>Content.Server</AssemblyName>
     <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <ContentAssemblyTarget>..\engine\bin\Server\Resources\Assemblies\</ContentAssemblyTarget>
+    <ContentAssemblyTarget>..\RobustToolbox\bin\Server\Resources\Assemblies\</ContentAssemblyTarget>
     <OutputPath>..\bin\Content.Server\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <LangVersion>7.2</LangVersion>
@@ -188,4 +188,4 @@
     <Compile Include="GameObjects\Components\Construction\ConstructionComponent.cs" />
   </ItemGroup>
   <ItemGroup />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/RobustToolbox b/RobustToolbox
index e758c114bd..b5635201c2 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit e758c114bd2a58440d04f0d76d2910c50df8abf7
+Subproject commit b5635201c2447f1d72339eb88beaeb1847ca42cb
diff --git a/SpaceStation14Content.sln b/SpaceStation14Content.sln
index 3b95df21f4..e105851657 100644
--- a/SpaceStation14Content.sln
+++ b/SpaceStation14Content.sln
@@ -73,306 +73,156 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|NoGodotx64 = Debug|NoGodotx64
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|NoGodotx64 = Release|NoGodotx64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
-		Tools|Any CPU = Tools|Any CPU
-		Tools|NoGodotx64 = Tools|NoGodotx64
-		Tools|x64 = Tools|x64
-		Tools|x86 = Tools|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|NoGodotx64.ActiveCfg = Debug|Any CPU
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|NoGodotx64.Build.0 = Debug|Any CPU
 		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x64.ActiveCfg = Debug|x64
 		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x64.Build.0 = Debug|x64
 		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x86.ActiveCfg = Debug|x86
 		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|x86.Build.0 = Debug|x86
 		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|NoGodotx64.ActiveCfg = Release|Any CPU
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|NoGodotx64.Build.0 = Release|Any CPU
 		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x64.ActiveCfg = Release|x64
 		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x64.Build.0 = Release|x64
 		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x86.ActiveCfg = Release|x86
 		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|x86.Build.0 = Release|x86
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Tools|Any CPU.ActiveCfg = Debug|Any CPU
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Tools|Any CPU.Build.0 = Debug|Any CPU
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Tools|NoGodotx64.ActiveCfg = Release|Any CPU
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Tools|NoGodotx64.Build.0 = Release|Any CPU
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Tools|x64.ActiveCfg = Debug|x64
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Tools|x64.Build.0 = Debug|x64
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Tools|x86.ActiveCfg = Debug|x86
-		{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Tools|x86.Build.0 = Debug|x86
 		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|NoGodotx64.ActiveCfg = Debug|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|NoGodotx64.Build.0 = Debug|Any CPU
 		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x64.ActiveCfg = Debug|x64
 		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x64.Build.0 = Debug|x64
 		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x86.ActiveCfg = Debug|x86
 		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|x86.Build.0 = Debug|x86
 		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|NoGodotx64.ActiveCfg = Release|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|NoGodotx64.Build.0 = Release|Any CPU
 		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x64.ActiveCfg = Release|x64
 		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x64.Build.0 = Release|x64
 		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x86.ActiveCfg = Release|x86
 		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|x86.Build.0 = Release|x86
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Tools|Any CPU.ActiveCfg = Debug|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Tools|Any CPU.Build.0 = Debug|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Tools|NoGodotx64.ActiveCfg = Release|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Tools|NoGodotx64.Build.0 = Release|Any CPU
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Tools|x64.ActiveCfg = Debug|x64
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Tools|x64.Build.0 = Debug|x64
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Tools|x86.ActiveCfg = Debug|x86
-		{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Tools|x86.Build.0 = Debug|x86
 		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|NoGodotx64.ActiveCfg = Debug|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|NoGodotx64.Build.0 = Debug|Any CPU
 		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x64.ActiveCfg = Debug|x64
 		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x64.Build.0 = Debug|x64
 		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x86.ActiveCfg = Debug|x86
 		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|x86.Build.0 = Debug|x86
 		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|NoGodotx64.ActiveCfg = Release|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|NoGodotx64.Build.0 = Release|Any CPU
 		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x64.ActiveCfg = Release|x64
 		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x64.Build.0 = Release|x64
 		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x86.ActiveCfg = Release|x86
 		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|x86.Build.0 = Release|x86
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Tools|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Tools|Any CPU.Build.0 = Debug|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Tools|NoGodotx64.ActiveCfg = Release|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Tools|NoGodotx64.Build.0 = Release|Any CPU
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Tools|x64.ActiveCfg = Debug|x64
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Tools|x64.Build.0 = Debug|x64
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Tools|x86.ActiveCfg = Debug|x86
-		{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Tools|x86.Build.0 = Debug|x86
 		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|NoGodotx64.ActiveCfg = Debug|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|NoGodotx64.Build.0 = Debug|Any CPU
 		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|x86.Build.0 = Debug|Any CPU
 		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|NoGodotx64.ActiveCfg = Debug|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|NoGodotx64.Build.0 = Debug|Any CPU
 		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x64.ActiveCfg = Debug|Any CPU
 		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x64.Build.0 = Debug|Any CPU
 		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x86.ActiveCfg = Debug|Any CPU
 		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|x86.Build.0 = Debug|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Tools|Any CPU.ActiveCfg = Debug|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Tools|Any CPU.Build.0 = Debug|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Tools|NoGodotx64.ActiveCfg = Debug|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Tools|NoGodotx64.Build.0 = Debug|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Tools|x64.ActiveCfg = Debug|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Tools|x64.Build.0 = Debug|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Tools|x86.ActiveCfg = Debug|Any CPU
-		{C899FCA4-7037-4E49-ABC2-44DE72487110}.Tools|x86.Build.0 = Debug|Any CPU
 		{8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|NoGodotx64.ActiveCfg = Debug|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|NoGodotx64.Build.0 = Debug|Any CPU
 		{8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x64.ActiveCfg = Debug|x64
 		{8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x64.Build.0 = Debug|x64
 		{8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x86.ActiveCfg = Debug|x86
 		{8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x86.Build.0 = Debug|x86
 		{8EDF4429-251A-416D-BB68-93F227191BCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8EDF4429-251A-416D-BB68-93F227191BCF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Release|NoGodotx64.ActiveCfg = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Release|NoGodotx64.Build.0 = Release|Any CPU
 		{8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x64.ActiveCfg = Release|x64
 		{8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x64.Build.0 = Release|x64
 		{8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x86.ActiveCfg = Release|x86
 		{8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x86.Build.0 = Release|x86
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Tools|Any CPU.ActiveCfg = Debug|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Tools|Any CPU.Build.0 = Debug|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Tools|NoGodotx64.ActiveCfg = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Tools|NoGodotx64.Build.0 = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Tools|x64.ActiveCfg = Debug|x64
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Tools|x64.Build.0 = Debug|x64
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Tools|x86.ActiveCfg = Debug|x86
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Tools|x86.Build.0 = Debug|x86
 		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Debug|NoGodotx64.ActiveCfg = Debug|Any CPU
-		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Debug|NoGodotx64.Build.0 = Debug|Any CPU
 		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Debug|x64.ActiveCfg = Debug|x64
 		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Debug|x64.Build.0 = Debug|x64
 		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Debug|x86.ActiveCfg = Debug|x86
 		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Debug|x86.Build.0 = Debug|x86
 		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Release|NoGodotx64.ActiveCfg = Release|Any CPU
-		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Release|NoGodotx64.Build.0 = Release|Any CPU
 		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Release|x64.ActiveCfg = Release|x64
 		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Release|x64.Build.0 = Release|x64
 		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Release|x86.ActiveCfg = Release|x86
 		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Release|x86.Build.0 = Release|x86
-		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Tools|Any CPU.ActiveCfg = Release|Any CPU
-		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Tools|Any CPU.Build.0 = Release|Any CPU
-		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Tools|NoGodotx64.ActiveCfg = Release|Any CPU
-		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Tools|NoGodotx64.Build.0 = Release|Any CPU
-		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Tools|x64.ActiveCfg = Release|x64
-		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Tools|x64.Build.0 = Release|x64
-		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Tools|x86.ActiveCfg = Release|x86
-		{3F8AA5A7-7198-49D5-B460-4A83A8F1528A}.Tools|x86.Build.0 = Release|x86
 		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Debug|NoGodotx64.ActiveCfg = Debug|Any CPU
-		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Debug|NoGodotx64.Build.0 = Debug|Any CPU
 		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Debug|x64.Build.0 = Debug|Any CPU
 		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Debug|x86.Build.0 = Debug|Any CPU
 		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Release|NoGodotx64.ActiveCfg = Release|Any CPU
-		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Release|NoGodotx64.Build.0 = Release|Any CPU
 		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Release|x64.ActiveCfg = Release|Any CPU
 		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Release|x64.Build.0 = Release|Any CPU
 		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Release|x86.ActiveCfg = Release|Any CPU
 		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Release|x86.Build.0 = Release|Any CPU
-		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
-		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Tools|Any CPU.Build.0 = Tools|Any CPU
-		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Tools|NoGodotx64.ActiveCfg = Tools|Any CPU
-		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Tools|NoGodotx64.Build.0 = Tools|Any CPU
-		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Tools|x64.ActiveCfg = Tools|Any CPU
-		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Tools|x64.Build.0 = Tools|Any CPU
-		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Tools|x86.ActiveCfg = Tools|Any CPU
-		{CDD8AD7E-C24E-49C8-97E6-10DB96A9786F}.Tools|x86.Build.0 = Tools|Any CPU
 		{916C5BF0-74BF-485D-A233-C1AC30007119}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{916C5BF0-74BF-485D-A233-C1AC30007119}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{916C5BF0-74BF-485D-A233-C1AC30007119}.Debug|NoGodotx64.ActiveCfg = Debug|Any CPU
-		{916C5BF0-74BF-485D-A233-C1AC30007119}.Debug|NoGodotx64.Build.0 = Debug|Any CPU
 		{916C5BF0-74BF-485D-A233-C1AC30007119}.Debug|x64.ActiveCfg = Debug|x64
 		{916C5BF0-74BF-485D-A233-C1AC30007119}.Debug|x64.Build.0 = Debug|x64
 		{916C5BF0-74BF-485D-A233-C1AC30007119}.Debug|x86.ActiveCfg = Debug|x86
 		{916C5BF0-74BF-485D-A233-C1AC30007119}.Debug|x86.Build.0 = Debug|x86
 		{916C5BF0-74BF-485D-A233-C1AC30007119}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{916C5BF0-74BF-485D-A233-C1AC30007119}.Release|Any CPU.Build.0 = Release|Any CPU
-		{916C5BF0-74BF-485D-A233-C1AC30007119}.Release|NoGodotx64.ActiveCfg = Release|Any CPU
-		{916C5BF0-74BF-485D-A233-C1AC30007119}.Release|NoGodotx64.Build.0 = Release|Any CPU
 		{916C5BF0-74BF-485D-A233-C1AC30007119}.Release|x64.ActiveCfg = Release|x64
 		{916C5BF0-74BF-485D-A233-C1AC30007119}.Release|x64.Build.0 = Release|x64
 		{916C5BF0-74BF-485D-A233-C1AC30007119}.Release|x86.ActiveCfg = Release|x86
 		{916C5BF0-74BF-485D-A233-C1AC30007119}.Release|x86.Build.0 = Release|x86
-		{916C5BF0-74BF-485D-A233-C1AC30007119}.Tools|Any CPU.ActiveCfg = Release|Any CPU
-		{916C5BF0-74BF-485D-A233-C1AC30007119}.Tools|Any CPU.Build.0 = Release|Any CPU
-		{916C5BF0-74BF-485D-A233-C1AC30007119}.Tools|NoGodotx64.ActiveCfg = Release|Any CPU
-		{916C5BF0-74BF-485D-A233-C1AC30007119}.Tools|NoGodotx64.Build.0 = Release|Any CPU
-		{916C5BF0-74BF-485D-A233-C1AC30007119}.Tools|x64.ActiveCfg = Release|x64
-		{916C5BF0-74BF-485D-A233-C1AC30007119}.Tools|x64.Build.0 = Release|x64
-		{916C5BF0-74BF-485D-A233-C1AC30007119}.Tools|x86.ActiveCfg = Release|x86
-		{916C5BF0-74BF-485D-A233-C1AC30007119}.Tools|x86.Build.0 = Release|x86
 		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Debug|NoGodotx64.ActiveCfg = Debug|Any CPU
-		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Debug|NoGodotx64.Build.0 = Debug|Any CPU
 		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Debug|x64.ActiveCfg = Debug|x64
 		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Debug|x64.Build.0 = Debug|x64
 		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Debug|x86.ActiveCfg = Debug|x86
 		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Debug|x86.Build.0 = Debug|x86
 		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Release|NoGodotx64.ActiveCfg = Release|Any CPU
-		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Release|NoGodotx64.Build.0 = Release|Any CPU
 		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Release|x64.ActiveCfg = Release|x64
 		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Release|x64.Build.0 = Release|x64
 		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Release|x86.ActiveCfg = Release|x86
 		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Release|x86.Build.0 = Release|x86
-		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Tools|Any CPU.ActiveCfg = Release|Any CPU
-		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Tools|Any CPU.Build.0 = Release|Any CPU
-		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Tools|NoGodotx64.ActiveCfg = Release|Any CPU
-		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Tools|NoGodotx64.Build.0 = Release|Any CPU
-		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Tools|x64.ActiveCfg = Release|x64
-		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Tools|x64.Build.0 = Release|x64
-		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Tools|x86.ActiveCfg = Release|x86
-		{5F161008-6C48-4596-A2DE-5E7B0CEB2AA1}.Tools|x86.Build.0 = Release|x86
 		{7DC961F2-A45B-4193-BE7F-77622A231943}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7DC961F2-A45B-4193-BE7F-77622A231943}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7DC961F2-A45B-4193-BE7F-77622A231943}.Debug|NoGodotx64.ActiveCfg = Debug|Any CPU
-		{7DC961F2-A45B-4193-BE7F-77622A231943}.Debug|NoGodotx64.Build.0 = Debug|Any CPU
 		{7DC961F2-A45B-4193-BE7F-77622A231943}.Debug|x64.ActiveCfg = Debug|x64
 		{7DC961F2-A45B-4193-BE7F-77622A231943}.Debug|x64.Build.0 = Debug|x64
 		{7DC961F2-A45B-4193-BE7F-77622A231943}.Debug|x86.ActiveCfg = Debug|x86
 		{7DC961F2-A45B-4193-BE7F-77622A231943}.Debug|x86.Build.0 = Debug|x86
 		{7DC961F2-A45B-4193-BE7F-77622A231943}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7DC961F2-A45B-4193-BE7F-77622A231943}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7DC961F2-A45B-4193-BE7F-77622A231943}.Release|NoGodotx64.ActiveCfg = Release|Any CPU
-		{7DC961F2-A45B-4193-BE7F-77622A231943}.Release|NoGodotx64.Build.0 = Release|Any CPU
 		{7DC961F2-A45B-4193-BE7F-77622A231943}.Release|x64.ActiveCfg = Release|x64
 		{7DC961F2-A45B-4193-BE7F-77622A231943}.Release|x64.Build.0 = Release|x64
 		{7DC961F2-A45B-4193-BE7F-77622A231943}.Release|x86.ActiveCfg = Release|x86
 		{7DC961F2-A45B-4193-BE7F-77622A231943}.Release|x86.Build.0 = Release|x86
-		{7DC961F2-A45B-4193-BE7F-77622A231943}.Tools|Any CPU.ActiveCfg = Release|Any CPU
-		{7DC961F2-A45B-4193-BE7F-77622A231943}.Tools|Any CPU.Build.0 = Release|Any CPU
-		{7DC961F2-A45B-4193-BE7F-77622A231943}.Tools|NoGodotx64.ActiveCfg = Release|Any CPU
-		{7DC961F2-A45B-4193-BE7F-77622A231943}.Tools|NoGodotx64.Build.0 = Release|Any CPU
-		{7DC961F2-A45B-4193-BE7F-77622A231943}.Tools|x64.ActiveCfg = Release|x64
-		{7DC961F2-A45B-4193-BE7F-77622A231943}.Tools|x64.Build.0 = Release|x64
-		{7DC961F2-A45B-4193-BE7F-77622A231943}.Tools|x86.ActiveCfg = Release|x86
-		{7DC961F2-A45B-4193-BE7F-77622A231943}.Tools|x86.Build.0 = Release|x86
 		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Debug|NoGodotx64.ActiveCfg = Debug|NoGodotx64
-		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Debug|NoGodotx64.Build.0 = Debug|NoGodotx64
 		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Debug|x64.ActiveCfg = Debug|x64
 		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Debug|x64.Build.0 = Debug|x64
 		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Debug|x86.ActiveCfg = Debug|x86
 		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Debug|x86.Build.0 = Debug|x86
 		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Release|NoGodotx64.ActiveCfg = Debug|NoGodotx64
-		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Release|NoGodotx64.Build.0 = Debug|NoGodotx64
 		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Release|x64.ActiveCfg = Debug|x64
 		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Release|x64.Build.0 = Debug|x64
 		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Release|x86.ActiveCfg = Debug|x86
 		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Release|x86.Build.0 = Debug|x86
-		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Tools|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Tools|Any CPU.Build.0 = Debug|Any CPU
-		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Tools|NoGodotx64.ActiveCfg = Debug|NoGodotx64
-		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Tools|NoGodotx64.Build.0 = Debug|NoGodotx64
-		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Tools|x64.ActiveCfg = Debug|x64
-		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Tools|x64.Build.0 = Debug|x64
-		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Tools|x86.ActiveCfg = Debug|x86
-		{FF197E54-2EAE-4A6A-BE19-7BE701F5588A}.Tools|x86.Build.0 = Debug|x86
 		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Debug|NoGodotx64.ActiveCfg = Debug|Any CPU
-		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Debug|NoGodotx64.Build.0 = Debug|Any CPU
 		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Debug|x64.ActiveCfg = Debug|x64
 		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Debug|x64.Build.0 = Debug|x64
 		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Debug|x86.ActiveCfg = Debug|x86
 		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Debug|x86.Build.0 = Debug|x86
 		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Release|NoGodotx64.ActiveCfg = Release|Any CPU
-		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Release|NoGodotx64.Build.0 = Release|Any CPU
 		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Release|x64.ActiveCfg = Release|x64
 		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Release|x64.Build.0 = Release|x64
 		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Release|x86.ActiveCfg = Release|x86
 		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Release|x86.Build.0 = Release|x86
-		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Tools|Any CPU.ActiveCfg = Release|Any CPU
-		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Tools|Any CPU.Build.0 = Release|Any CPU
-		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Tools|NoGodotx64.ActiveCfg = Release|Any CPU
-		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Tools|NoGodotx64.Build.0 = Release|Any CPU
-		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Tools|x64.ActiveCfg = Release|x64
-		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Tools|x64.Build.0 = Release|x64
-		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Tools|x86.ActiveCfg = Release|x86
-		{D63D377C-242B-4FC5-8337-35CB87E6C537}.Tools|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/SpaceStation14Content.sln.DotSettings b/SpaceStation14Content.sln.DotSettings
index b02a09b307..22b6980c06 100644
--- a/SpaceStation14Content.sln.DotSettings
+++ b/SpaceStation14Content.sln.DotSettings
@@ -10,4 +10,5 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UV/@EntryIndexedValue">UV</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=BYOND/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Noto/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=preemptively/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=swsl/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Tools/package_release_build.py b/Tools/package_release_build.py
index e18eeac853..7a4885032f 100755
--- a/Tools/package_release_build.py
+++ b/Tools/package_release_build.py
@@ -85,8 +85,8 @@ def main():
 def wipe_bin():
     print(Fore.BLUE + Style.DIM +
           "Clearing old build artifacts (if any)..." + Style.RESET_ALL)
-    if os.path.exists(p("engine", "bin")):
-        shutil.rmtree(p("engine", "bin"))
+    if os.path.exists(p("RobustToolbox", "bin")):
+        shutil.rmtree(p("RobustToolbox", "bin"))
 
     if os.path.exists("bin"):
         shutil.rmtree("bin")
@@ -112,7 +112,7 @@ def build_windows():
         p("release", "SS14.Client_Windows_x64.zip"), "w",
         compression=zipfile.ZIP_DEFLATED)
 
-    copy_dir_into_zip(p("engine", "bin", "Client"), "", client_zip)
+    copy_dir_into_zip(p("RobustToolbox", "bin", "Client"), "", client_zip)
     copy_resources("Resources", client_zip, server=False)
     copy_content_assemblies(p("Resources", "Assemblies"), client_zip, server=False)
     # Cool we're done.
@@ -121,7 +121,7 @@ def build_windows():
     print(Fore.GREEN + "Packaging Windows x64 server..." + Style.RESET_ALL)
     server_zip = zipfile.ZipFile(p("release", "SS14.Server_Windows_x64.zip"), "w",
                                  compression=zipfile.ZIP_DEFLATED)
-    copy_dir_into_zip(p("engine", "bin", "Server"), "", server_zip)
+    copy_dir_into_zip(p("RobustToolbox", "bin", "Server"), "", server_zip)
     copy_resources(p("Resources"), server_zip, server=True)
     copy_content_assemblies(p("Resources", "Assemblies"), server_zip, server=True)
     server_zip.close()
@@ -147,7 +147,7 @@ def build_macos():
 
     contents = p("Space Station 14.app", "Contents", "Resources")
     copy_dir_into_zip(p("BuildFiles", "Mac", "Space Station 14.app"), "Space Station 14.app", client_zip)
-    copy_dir_into_zip(p("engine", "bin", "Client"), contents, client_zip)
+    copy_dir_into_zip(p("RobustToolbox", "bin", "Client"), contents, client_zip)
 
     copy_resources(p(contents, "Resources"), client_zip, server=False)
     copy_content_assemblies(p(contents, "Resources", "Assemblies"), client_zip, server=False)
@@ -156,7 +156,7 @@ def build_macos():
     print(Fore.GREEN + "Packaging macOS x64 server..." + Style.RESET_ALL)
     server_zip = zipfile.ZipFile(p("release", "SS14.Server_macOS_x64.zip"), "w",
                                  compression=zipfile.ZIP_DEFLATED)
-    copy_dir_into_zip(p("engine", "bin", "Server"), "", server_zip)
+    copy_dir_into_zip(p("RobustToolbox", "bin", "Server"), "", server_zip)
     copy_resources(p("Resources"), server_zip, server=True)
     copy_content_assemblies(p("Resources", "Assemblies"), server_zip, server=True)
     server_zip.close()
@@ -182,7 +182,7 @@ def build_linux():
         p("release", "SS14.Client_Linux_x64.zip"), "w",
         compression=zipfile.ZIP_DEFLATED)
 
-    copy_dir_into_zip(p("engine", "bin", "Client"), "", client_zip)
+    copy_dir_into_zip(p("RobustToolbox", "bin", "Client"), "", client_zip)
     copy_resources("Resources", client_zip, server=False)
     copy_content_assemblies(p("Resources", "Assemblies"), client_zip, server=False)
     # Cool we're done.
@@ -191,7 +191,7 @@ def build_linux():
     print(Fore.GREEN + "Packaging Linux x64 server..." + Style.RESET_ALL)
     server_zip = zipfile.ZipFile(p("release", "SS14.Server_Linux_x64.zip"), "w",
                                  compression=zipfile.ZIP_DEFLATED)
-    copy_dir_into_zip(p("engine", "bin", "Server"), "", server_zip)
+    copy_dir_into_zip(p("RobustToolbox", "bin", "Server"), "", server_zip)
     copy_resources(p("Resources"), server_zip, server=True)
     copy_content_assemblies(p("Resources", "Assemblies"), server_zip, server=True)
     server_zip.close()
@@ -200,7 +200,7 @@ def build_linux():
 def copy_resources(target, zipf, server):
     # Content repo goes FIRST so that it won't override engine files as that's forbidden.
     do_resource_copy(target, "Resources", zipf, server)
-    do_resource_copy(target, p("engine", "Resources"), zipf, server)
+    do_resource_copy(target, p("RobustToolbox", "Resources"), zipf, server)
 
 
 def do_resource_copy(target, source, zipf, server):
@@ -273,7 +273,7 @@ def copy_content_assemblies(target, zipf, server):
 
 
 def copy_godot_scenes():
-    target_dir = p("engine", "SS14.Client.Godot", "Scenes")
+    target_dir = p("RobustToolbox", "SS14.Client.Godot", "Scenes")
     from_dir = p("Resources", "Scenes")
     for path in os.listdir(from_dir):
         if path.startswith("."):