From ac2d857da0a0bc468347e2b82f3e0e66d66bc2e4 Mon Sep 17 00:00:00 2001
From: Tad Hardesty <tad@platymuus.com>
Date: Sat, 25 Aug 2018 04:42:24 -0700
Subject: [PATCH] Fix Build Your Own Shuttle crashing the server (#39886)

---
 _maps/shuttles/emergency_airless.dmm |  8 ++------
 code/modules/admin/fun_balloon.dm    | 13 -------------
 code/modules/shuttle/emergency.dm    |  4 ++++
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/_maps/shuttles/emergency_airless.dmm b/_maps/shuttles/emergency_airless.dmm
index d58c5e76040..b69a11ee7b3 100644
--- a/_maps/shuttles/emergency_airless.dmm
+++ b/_maps/shuttles/emergency_airless.dmm
@@ -31,7 +31,7 @@
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
 "g" = (
-/obj/docking_port/mobile/emergency{
+/obj/docking_port/mobile/emergency/shuttle_build{
 	dwidth = 11;
 	height = 18;
 	name = "Shuttle Under Construction";
@@ -41,10 +41,6 @@
 	},
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
-"h" = (
-/obj/effect/shuttle_build,
-/turf/open/floor/plating/airless,
-/area/shuttle/escape)
 
 (1,1,1) = {"
 a
@@ -341,7 +337,7 @@ f
 f
 f
 f
-h
+f
 f
 f
 f
diff --git a/code/modules/admin/fun_balloon.dm b/code/modules/admin/fun_balloon.dm
index 0258ce88eff..da811a1974b 100644
--- a/code/modules/admin/fun_balloon.dm
+++ b/code/modules/admin/fun_balloon.dm
@@ -102,19 +102,6 @@
 	qdel(src)
 
 
-//Shuttle Build
-
-/obj/effect/shuttle_build
-	name = "shuttle_build"
-	desc = "Some assembly required."
-	icon = 'icons/obj/items_and_weapons.dmi'
-	icon_state = "syndballoon"
-	anchored = TRUE
-
-/obj/effect/shuttle_build/New()
-	SSshuttle.emergency.initiate_docking(SSshuttle.getDock("emergency_home"))
-	qdel(src)
-
 //Arena
 
 /obj/effect/forcefield/arena_shuttle
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index 4ace3a4acb2..20606de6bfd 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -571,6 +571,10 @@
 	SSshuttle.emergency = current_emergency
 	SSshuttle.backup_shuttle = src
 
+/obj/docking_port/mobile/emergency/shuttle_build/register()
+	. = ..()
+	initiate_docking(SSshuttle.getDock("emergency_home"))
+
 #undef TIME_LEFT
 #undef ENGINES_START_TIME
 #undef ENGINES_STARTED