From 283da7778ccbcc58ba544743bd71d3bc3864968e Mon Sep 17 00:00:00 2001
From: pubby <pubby8@gmail.com>
Date: Mon, 4 Sep 2017 09:00:07 -0500
Subject: [PATCH] Fix monastery shuttle + Pods (#30375)

---
 _maps/map_files/PubbyStation/PubbyStation.dmm |  2 +-
 .../machinery/computer/monastery_shuttle.dm   |  2 +-
 .../circuitboards/computer_circuitboards.dm   | 20 ++-----------------
 code/modules/shuttle/computer.dm              | 11 ----------
 4 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index bad4fcd3130..04802d0eb84 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -43442,7 +43442,7 @@
 	dir = 2;
 	network = list("SS13")
 	},
-/obj/item/circuitboard/computer/shuttle/monastery_shuttle,
+/obj/item/circuitboard/computer/monastery_shuttle,
 /turf/open/floor/plasteel/darkgreen,
 /area/storage/tech)
 "bQx" = (
diff --git a/code/game/machinery/computer/monastery_shuttle.dm b/code/game/machinery/computer/monastery_shuttle.dm
index ee87c8b487f..04c6dd336b0 100644
--- a/code/game/machinery/computer/monastery_shuttle.dm
+++ b/code/game/machinery/computer/monastery_shuttle.dm
@@ -1,7 +1,7 @@
 /obj/machinery/computer/shuttle/monastery_shuttle
 	name = "monastery shuttle console"
 	desc = "Used to control the monastery shuttle."
-	circuit = /obj/item/circuitboard/computer/shuttle/monastery_shuttle
+	circuit = /obj/item/circuitboard/computer/monastery_shuttle
 	shuttleId = "pod1"
 	possible_destinations = "monastery_shuttle_asteroid;monastery_shuttle_station"
 	no_destination_swap = TRUE
diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm
index c25e1885291..949dd5ea91c 100644
--- a/code/game/objects/items/circuitboards/computer_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm
@@ -257,22 +257,6 @@
 	build_path = /obj/machinery/computer/telecomms/server
 	origin_tech = "programming=3;magnets=3;bluespace=2"
 
-/obj/item/circuitboard/computer/shuttle
-	name = "Shuttle (Computer Board)"
-	build_path = /obj/machinery/computer/shuttle
-	var/shuttleId
-	var/possible_destinations = ""
-
-/obj/item/circuitboard/computer/shuttle/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/device/multitool))
-		var/chosen_id = round(input(usr, "Choose an ID number (-1 for reset):", "Input an Integer", null) as num|null)
-		if(chosen_id >= 0)
-			shuttleId = chosen_id
-		else
-			shuttleId = initial(shuttleId)
-	else
-		return ..()
-
 /obj/item/circuitboard/computer/labor_shuttle
 	name = "Labor Shuttle (Computer Board)"
 	build_path = /obj/machinery/computer/shuttle/labor
@@ -339,7 +323,7 @@
 	build_path = /obj/machinery/computer/apc_control
 	origin_tech = "programming=3;engineering=3;powerstorage=2"
 
-/obj/item/circuitboard/computer/shuttle/monastery_shuttle
+/obj/item/circuitboard/computer/monastery_shuttle
 	name = "Monastery Shuttle (Computer Board)"
 	build_path = /obj/machinery/computer/shuttle/monastery_shuttle
 
@@ -365,4 +349,4 @@
 /obj/item/circuitboard/computer/sat_control
 	name = "Satellite Network Control (Computer Board)"
 	build_path = /obj/machinery/computer/sat_control
-	origin_tech = "engineering=3"
\ No newline at end of file
+	origin_tech = "engineering=3"
diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm
index a3ebba05a1a..8384e978e5c 100644
--- a/code/modules/shuttle/computer.dm
+++ b/code/modules/shuttle/computer.dm
@@ -4,22 +4,11 @@
 	icon_keyboard = "tech_key"
 	light_color = LIGHT_COLOR_CYAN
 	req_access = list( )
-	circuit = /obj/item/circuitboard/computer/shuttle
 	var/shuttleId
 	var/possible_destinations = ""
 	var/admin_controlled
 	var/no_destination_swap = 0
 
-/obj/machinery/computer/shuttle/Initialize()
-	..()
-	return INITIALIZE_HINT_LATELOAD
-
-/obj/machinery/computer/shuttle/LateInitialize()
-	if(istype(circuit, /obj/item/circuitboard/computer/shuttle))
-		var/obj/item/circuitboard/computer/shuttle/C = circuit
-		possible_destinations = C.possible_destinations
-		shuttleId = C.shuttleId
-
 /obj/machinery/computer/shuttle/attack_hand(mob/user)
 	if(..(user))
 		return