Merge branch 'master' into upstream-merge-29940

code/modules/shuttle/computer.dm

@@ -10,9 +10,13 @@
 	var/admin_controlled
 	var/no_destination_swap = 0
 
-/obj/machinery/computer/shuttle/Initialize(mapload, obj/item/weapon/circuitboard/computer/shuttle/C)
-	. = ..()
-	if(istype(C))
+/obj/machinery/computer/shuttle/Initialize()
+	..()
+	return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/computer/shuttle/LateInitialize()
+	if(istype(circuit, /obj/item/weapon/circuitboard/computer/shuttle))
+		var/obj/item/weapon/circuitboard/computer/shuttle/C = circuit
 		possible_destinations = C.possible_destinations
 		shuttleId = C.shuttleId
 

code/modules/shuttle/manipulator.dm

@@ -33,14 +33,10 @@
 	add_overlay(hologram_projection)
 	add_overlay(hologram_ship)
 
-/obj/machinery/shuttle_manipulator/ui_interact(mob/user, ui_key = "main", \
-	datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, \
-	datum/ui_state/state = GLOB.admin_state)
-
+/obj/machinery/shuttle_manipulator/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.admin_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "shuttle_manipulator", name, 800, 600, \
-			master_ui, state)
+		ui = new(user, src, ui_key, "shuttle_manipulator", name, 800, 600, master_ui, state)
 		ui.open()
 
 /proc/shuttlemode2str(mode)
@@ -62,7 +58,7 @@
 		if(SHUTTLE_ENDGAME)
 			. = "endgame"
 	if(!.)
-		throw EXCEPTION("shuttlemode2str(): invalid mode [mode]")
+		CRASH("shuttlemode2str(): invalid mode [mode]")
 
 
 /obj/machinery/shuttle_manipulator/ui_data(mob/user)

code/modules/shuttle/ripple.dm

@@ -8,7 +8,7 @@
 	anchored = TRUE
 	density = FALSE
 	layer = RIPPLE_LAYER
-	mouse_opacity = 1
+	mouse_opacity = MOUSE_OPACITY_ICON
 	alpha = 0
 
 	duration = 3 * SHUTTLE_RIPPLE_TIME

code/modules/shuttle/special.dm

@@ -10,9 +10,9 @@
 	icon = 'icons/obj/machines/magic_emitter.dmi'
 	icon_state = "wabbajack_statue"
 	icon_state_on = "wabbajack_statue_on"
+	active = FALSE
 	var/list/active_tables = list()
 	var/tables_required = 2
-	active = FALSE
 
 /obj/machinery/power/emitter/energycannon/magical/Initialize()
 	. = ..()

code/modules/shuttle/syndicate.dm

@@ -25,20 +25,6 @@
 		board.moved = TRUE
 	..()
 
-/obj/item/weapon/circuitboard/computer/syndicate_shuttle
-	name = "Syndicate Shuttle (Computer Board)"
-	build_path = /obj/machinery/computer/shuttle/syndicate
-	var/challenge = FALSE
-	var/moved = FALSE
-
-/obj/item/weapon/circuitboard/computer/syndicate_shuttle/Initialize()
-	. = ..()
-	GLOB.syndicate_shuttle_boards += src
-
-/obj/item/weapon/circuitboard/computer/syndicate_shuttle/Destroy()
-	GLOB.syndicate_shuttle_boards -= src
-	return ..()
-
 /obj/machinery/computer/shuttle/syndicate/drop_pod
 	name = "syndicate assault pod control"
 	icon = 'icons/obj/terminals.dmi'